diff --git a/lib/src/main/java/com/soundcloud/android/crop/Crop.java b/lib/src/main/java/com/soundcloud/android/crop/Crop.java
index b857e0d..e1a49d6 100644
--- a/lib/src/main/java/com/soundcloud/android/crop/Crop.java
+++ b/lib/src/main/java/com/soundcloud/android/crop/Crop.java
@@ -138,7 +138,7 @@ public class Crop {
try {
activity.startActivityForResult(intent, REQUEST_PICK);
} catch (ActivityNotFoundException e) {
- Toast.makeText(activity, R.string.error_pick_image, Toast.LENGTH_SHORT).show();
+ Toast.makeText(activity, R.string.crop__pick_error, Toast.LENGTH_SHORT).show();
}
}
diff --git a/lib/src/main/java/com/soundcloud/android/crop/CropImageActivity.java b/lib/src/main/java/com/soundcloud/android/crop/CropImageActivity.java
index ebbbde6..3e2831f 100644
--- a/lib/src/main/java/com/soundcloud/android/crop/CropImageActivity.java
+++ b/lib/src/main/java/com/soundcloud/android/crop/CropImageActivity.java
@@ -70,7 +70,7 @@ public class CropImageActivity extends MonitoredActivity {
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
requestWindowFeature(Window.FEATURE_NO_TITLE);
- setContentView(R.layout.activity_crop);
+ setContentView(R.layout.crop__activity_crop);
initViews();
setupFromIntent();
@@ -143,7 +143,7 @@ public class CropImageActivity extends MonitoredActivity {
return;
}
mImageView.setImageRotateBitmapResetBase(mRotateBitmap, true);
- Util.startBackgroundJob(this, null, getResources().getString(R.string.wait),
+ Util.startBackgroundJob(this, null, getResources().getString(R.string.crop__wait),
new Runnable() {
public void run() {
final CountDownLatch latch = new CountDownLatch(1);
@@ -285,7 +285,7 @@ public class CropImageActivity extends MonitoredActivity {
private void saveImage(Bitmap croppedImage) {
if (croppedImage != null) {
final Bitmap b = croppedImage;
- Util.startBackgroundJob(this, null, getResources().getString(R.string.saving),
+ Util.startBackgroundJob(this, null, getResources().getString(R.string.crop__saving),
new Runnable() {
public void run() {
saveOutput(b);
diff --git a/lib/src/main/java/com/soundcloud/android/crop/HighlightView.java b/lib/src/main/java/com/soundcloud/android/crop/HighlightView.java
index 16a85d1..cf72bc0 100644
--- a/lib/src/main/java/com/soundcloud/android/crop/HighlightView.java
+++ b/lib/src/main/java/com/soundcloud/android/crop/HighlightView.java
@@ -90,8 +90,8 @@ class HighlightView {
private void initResources() {
android.content.res.Resources resources = mContext.getResources();
- mResizeDrawableWidth = resources.getDrawable(R.drawable.crop_width);
- mResizeDrawableHeight = resources.getDrawable(R.drawable.crop_height);
+ mResizeDrawableWidth = resources.getDrawable(R.drawable.crop__handle_width);
+ mResizeDrawableHeight = resources.getDrawable(R.drawable.crop__handle_height);
}
protected void draw(Canvas canvas) {
diff --git a/lib/src/main/res/drawable-hdpi/divider.9.png b/lib/src/main/res/drawable-hdpi/crop__divider.9.png
similarity index 100%
rename from lib/src/main/res/drawable-hdpi/divider.9.png
rename to lib/src/main/res/drawable-hdpi/crop__divider.9.png
diff --git a/lib/src/main/res/drawable-hdpi/crop_height.png b/lib/src/main/res/drawable-hdpi/crop__handle_height.png
similarity index 100%
rename from lib/src/main/res/drawable-hdpi/crop_height.png
rename to lib/src/main/res/drawable-hdpi/crop__handle_height.png
diff --git a/lib/src/main/res/drawable-hdpi/crop_width.png b/lib/src/main/res/drawable-hdpi/crop__handle_width.png
similarity index 100%
rename from lib/src/main/res/drawable-hdpi/crop_width.png
rename to lib/src/main/res/drawable-hdpi/crop__handle_width.png
diff --git a/lib/src/main/res/drawable-hdpi/ic_action_cancel.png b/lib/src/main/res/drawable-hdpi/crop__ic_cancel.png
similarity index 100%
rename from lib/src/main/res/drawable-hdpi/ic_action_cancel.png
rename to lib/src/main/res/drawable-hdpi/crop__ic_cancel.png
diff --git a/lib/src/main/res/drawable-hdpi/ic_action_done.png b/lib/src/main/res/drawable-hdpi/crop__ic_done.png
similarity index 100%
rename from lib/src/main/res/drawable-hdpi/ic_action_done.png
rename to lib/src/main/res/drawable-hdpi/crop__ic_done.png
diff --git a/lib/src/main/res/drawable-mdpi/divider.9.png b/lib/src/main/res/drawable-mdpi/crop__divider.9.png
similarity index 100%
rename from lib/src/main/res/drawable-mdpi/divider.9.png
rename to lib/src/main/res/drawable-mdpi/crop__divider.9.png
diff --git a/lib/src/main/res/drawable-mdpi/ic_action_cancel.png b/lib/src/main/res/drawable-mdpi/crop__ic_cancel.png
similarity index 100%
rename from lib/src/main/res/drawable-mdpi/ic_action_cancel.png
rename to lib/src/main/res/drawable-mdpi/crop__ic_cancel.png
diff --git a/lib/src/main/res/drawable-mdpi/ic_action_done.png b/lib/src/main/res/drawable-mdpi/crop__ic_done.png
similarity index 100%
rename from lib/src/main/res/drawable-mdpi/ic_action_done.png
rename to lib/src/main/res/drawable-mdpi/crop__ic_done.png
diff --git a/lib/src/main/res/drawable-xhdpi/divider.9.png b/lib/src/main/res/drawable-xhdpi/crop__divider.9.png
similarity index 100%
rename from lib/src/main/res/drawable-xhdpi/divider.9.png
rename to lib/src/main/res/drawable-xhdpi/crop__divider.9.png
diff --git a/lib/src/main/res/drawable-xhdpi/ic_action_cancel.png b/lib/src/main/res/drawable-xhdpi/crop__ic_cancel.png
similarity index 100%
rename from lib/src/main/res/drawable-xhdpi/ic_action_cancel.png
rename to lib/src/main/res/drawable-xhdpi/crop__ic_cancel.png
diff --git a/lib/src/main/res/drawable-xhdpi/ic_action_done.png b/lib/src/main/res/drawable-xhdpi/crop__ic_done.png
similarity index 100%
rename from lib/src/main/res/drawable-xhdpi/ic_action_done.png
rename to lib/src/main/res/drawable-xhdpi/crop__ic_done.png
diff --git a/lib/src/main/res/drawable-xhdpi/tile.png b/lib/src/main/res/drawable-xhdpi/crop__tile.png
similarity index 100%
rename from lib/src/main/res/drawable-xhdpi/tile.png
rename to lib/src/main/res/drawable-xhdpi/crop__tile.png
diff --git a/lib/src/main/res/drawable/selectable_background.xml b/lib/src/main/res/drawable/crop__selectable_background.xml
similarity index 73%
rename from lib/src/main/res/drawable/selectable_background.xml
rename to lib/src/main/res/drawable/crop__selectable_background.xml
index 2e2293d..83c4a7d 100644
--- a/lib/src/main/res/drawable/selectable_background.xml
+++ b/lib/src/main/res/drawable/crop__selectable_background.xml
@@ -5,13 +5,13 @@
-
-
+
-
-
+
diff --git a/lib/src/main/res/drawable/texture.xml b/lib/src/main/res/drawable/crop__texture.xml
similarity index 60%
rename from lib/src/main/res/drawable/texture.xml
rename to lib/src/main/res/drawable/crop__texture.xml
index 0a3d55d..23ec469 100644
--- a/lib/src/main/res/drawable/texture.xml
+++ b/lib/src/main/res/drawable/crop__texture.xml
@@ -1,5 +1,5 @@
\ No newline at end of file
diff --git a/lib/src/main/res/layout/activity_crop.xml b/lib/src/main/res/layout/crop__activity_crop.xml
similarity index 79%
rename from lib/src/main/res/layout/activity_crop.xml
rename to lib/src/main/res/layout/crop__activity_crop.xml
index aea557f..b42483d 100644
--- a/lib/src/main/res/layout/activity_crop.xml
+++ b/lib/src/main/res/layout/crop__activity_crop.xml
@@ -7,13 +7,13 @@
+ layout="@layout/crop__layout_done_cancel" />
\ No newline at end of file
diff --git a/lib/src/main/res/layout/layout_done_cancel.xml b/lib/src/main/res/layout/crop__layout_done_cancel.xml
similarity index 100%
rename from lib/src/main/res/layout/layout_done_cancel.xml
rename to lib/src/main/res/layout/crop__layout_done_cancel.xml
diff --git a/lib/src/main/res/values-land/dimens.xml b/lib/src/main/res/values-land/dimens.xml
index 01bc0b1..b8488bb 100644
--- a/lib/src/main/res/values-land/dimens.xml
+++ b/lib/src/main/res/values-land/dimens.xml
@@ -1,5 +1,5 @@
- 40dp
+ 40dp
\ No newline at end of file
diff --git a/lib/src/main/res/values-large-land/dimens.xml b/lib/src/main/res/values-large-land/dimens.xml
index 2141906..9051a35 100644
--- a/lib/src/main/res/values-large-land/dimens.xml
+++ b/lib/src/main/res/values-large-land/dimens.xml
@@ -1,5 +1,5 @@
- 56dp
+ 56dp
\ No newline at end of file
diff --git a/lib/src/main/res/values-large/dimens.xml b/lib/src/main/res/values-large/dimens.xml
index 2141906..9051a35 100644
--- a/lib/src/main/res/values-large/dimens.xml
+++ b/lib/src/main/res/values-large/dimens.xml
@@ -1,5 +1,5 @@
- 56dp
+ 56dp
\ No newline at end of file
diff --git a/lib/src/main/res/values/colors.xml b/lib/src/main/res/values/colors.xml
index 5f81e9b..455f448 100644
--- a/lib/src/main/res/values/colors.xml
+++ b/lib/src/main/res/values/colors.xml
@@ -1,8 +1,8 @@
- #f3f3f3
- #666666
- #1a000000
- #77000000
+ #f3f3f3
+ #666666
+ #1a000000
+ #77000000
\ No newline at end of file
diff --git a/lib/src/main/res/values/dimens.xml b/lib/src/main/res/values/dimens.xml
index 476fc50..13b5b9f 100644
--- a/lib/src/main/res/values/dimens.xml
+++ b/lib/src/main/res/values/dimens.xml
@@ -1,5 +1,5 @@
- 48dp
+ 48dp
\ No newline at end of file
diff --git a/lib/src/main/res/values/strings.xml b/lib/src/main/res/values/strings.xml
index da227bf..cc310bb 100644
--- a/lib/src/main/res/values/strings.xml
+++ b/lib/src/main/res/values/strings.xml
@@ -1,10 +1,10 @@
- Saving picture…
- Please wait…
- No image sources available
+ Saving picture…
+ Please wait…
+ No image sources available
- DONE
- CANCEL
+ DONE
+ CANCEL
diff --git a/lib/src/main/res/values/styles.xml b/lib/src/main/res/values/styles.xml
index d7e102b..a0e6b80 100644
--- a/lib/src/main/res/values/styles.xml
+++ b/lib/src/main/res/values/styles.xml
@@ -2,19 +2,19 @@
\ No newline at end of file