diff --git a/hooks/before_build/generateActivity.js b/hooks/before_build/generateActivity.js index de5f0dc..d43d251 100644 --- a/hooks/before_build/generateActivity.js +++ b/hooks/before_build/generateActivity.js @@ -166,7 +166,7 @@ var updateConfig = function() { var contentResAndroidPlugin = fs.readdirSync(pathResAndroidPlugin); for (var i = contentResAndroidPlugin.length - 1; i >= 0; i--) { var nameDirDrawable = contentResAndroidPlugin[i]; - if (nameDirDrawable.match(/^drawable-.*$/) || nameDirDrawable.match(/^values-?.*$/)) { + if (nameDirDrawable.match(/^drawable-?.*$/) || nameDirDrawable.match(/^values-?.*$/)) { var contentDrawableDir = fs.readdirSync(pathResAndroidPlugin+nameDirDrawable); for (var j = contentDrawableDir.length - 1; j >= 0; j--) { var nameFileInDrawable = contentDrawableDir[j]; diff --git a/src/android/customCamera/res/drawable-hdpi/capture.png b/src/android/customCamera/res/drawable-hdpi/capture.png index 814864c..f79bed6 100644 Binary files a/src/android/customCamera/res/drawable-hdpi/capture.png and b/src/android/customCamera/res/drawable-hdpi/capture.png differ diff --git a/src/android/customCamera/res/drawable-hdpi/capture2.png b/src/android/customCamera/res/drawable-hdpi/capture2.png deleted file mode 100644 index f79bed6..0000000 Binary files a/src/android/customCamera/res/drawable-hdpi/capture2.png and /dev/null differ diff --git a/src/android/customCamera/res/drawable-hdpi/round_button.xml b/src/android/customCamera/res/drawable-hdpi/round_button.xml deleted file mode 100644 index 78ecfb2..0000000 --- a/src/android/customCamera/res/drawable-hdpi/round_button.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/android/customCamera/res/drawable-ldpi/capture.png b/src/android/customCamera/res/drawable-ldpi/capture.png new file mode 100644 index 0000000..f489d86 Binary files /dev/null and b/src/android/customCamera/res/drawable-ldpi/capture.png differ diff --git a/src/android/customCamera/res/drawable-ldpi/custom_opacity_bar.xml b/src/android/customCamera/res/drawable-ldpi/custom_opacity_bar.xml deleted file mode 100644 index 6a987fc..0000000 --- a/src/android/customCamera/res/drawable-ldpi/custom_opacity_bar.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/android/customCamera/res/drawable-ldpi/round_button.xml b/src/android/customCamera/res/drawable-ldpi/round_button.xml deleted file mode 100644 index 78ecfb2..0000000 --- a/src/android/customCamera/res/drawable-ldpi/round_button.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/android/customCamera/res/drawable-mdpi/capture.png b/src/android/customCamera/res/drawable-mdpi/capture.png new file mode 100644 index 0000000..5e16088 Binary files /dev/null and b/src/android/customCamera/res/drawable-mdpi/capture.png differ diff --git a/src/android/customCamera/res/drawable-mdpi/custom_opacity_bar.xml b/src/android/customCamera/res/drawable-mdpi/custom_opacity_bar.xml deleted file mode 100644 index 4a86a09..0000000 --- a/src/android/customCamera/res/drawable-mdpi/custom_opacity_bar.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/android/customCamera/res/drawable-mdpi/thumb.xml b/src/android/customCamera/res/drawable-mdpi/thumb.xml deleted file mode 100644 index 5c01649..0000000 --- a/src/android/customCamera/res/drawable-mdpi/thumb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/android/customCamera/res/drawable-xhdpi/capture.png b/src/android/customCamera/res/drawable-xhdpi/capture.png new file mode 100644 index 0000000..8af281c Binary files /dev/null and b/src/android/customCamera/res/drawable-xhdpi/capture.png differ diff --git a/src/android/customCamera/res/drawable-xhdpi/custom_opacity_bar.xml b/src/android/customCamera/res/drawable-xhdpi/custom_opacity_bar.xml deleted file mode 100644 index 4a86a09..0000000 --- a/src/android/customCamera/res/drawable-xhdpi/custom_opacity_bar.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/android/customCamera/res/drawable-xhdpi/round_button.xml b/src/android/customCamera/res/drawable-xhdpi/round_button.xml deleted file mode 100644 index 78ecfb2..0000000 --- a/src/android/customCamera/res/drawable-xhdpi/round_button.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/android/customCamera/res/drawable-xhdpi/thumb.xml b/src/android/customCamera/res/drawable-xhdpi/thumb.xml deleted file mode 100644 index 5c01649..0000000 --- a/src/android/customCamera/res/drawable-xhdpi/thumb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/android/customCamera/res/drawable-xxhdpi/capture.png b/src/android/customCamera/res/drawable-xxhdpi/capture.png new file mode 100644 index 0000000..7bf527d Binary files /dev/null and b/src/android/customCamera/res/drawable-xxhdpi/capture.png differ diff --git a/src/android/customCamera/res/drawable-xxhdpi/custom_opacity_bar.xml b/src/android/customCamera/res/drawable-xxhdpi/custom_opacity_bar.xml deleted file mode 100644 index 4a86a09..0000000 --- a/src/android/customCamera/res/drawable-xxhdpi/custom_opacity_bar.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/android/customCamera/res/drawable-xxhdpi/round_button.xml b/src/android/customCamera/res/drawable-xxhdpi/round_button.xml deleted file mode 100644 index 78ecfb2..0000000 --- a/src/android/customCamera/res/drawable-xxhdpi/round_button.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/android/customCamera/res/drawable-xxhdpi/thumb.xml b/src/android/customCamera/res/drawable-xxhdpi/thumb.xml deleted file mode 100644 index 5c01649..0000000 --- a/src/android/customCamera/res/drawable-xxhdpi/thumb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/android/customCamera/res/drawable-xxxhdpi/capture.png b/src/android/customCamera/res/drawable-xxxhdpi/capture.png new file mode 100644 index 0000000..23cff10 Binary files /dev/null and b/src/android/customCamera/res/drawable-xxxhdpi/capture.png differ diff --git a/src/android/customCamera/res/drawable-xxxhdpi/custom_opacity_bar.xml b/src/android/customCamera/res/drawable-xxxhdpi/custom_opacity_bar.xml deleted file mode 100644 index 4a86a09..0000000 --- a/src/android/customCamera/res/drawable-xxxhdpi/custom_opacity_bar.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/android/customCamera/res/drawable-xxxhdpi/round_button.xml b/src/android/customCamera/res/drawable-xxxhdpi/round_button.xml deleted file mode 100644 index 78ecfb2..0000000 --- a/src/android/customCamera/res/drawable-xxxhdpi/round_button.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/android/customCamera/res/drawable-xxxhdpi/thumb.xml b/src/android/customCamera/res/drawable-xxxhdpi/thumb.xml deleted file mode 100644 index 5c01649..0000000 --- a/src/android/customCamera/res/drawable-xxxhdpi/thumb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/android/customCamera/res/drawable-hdpi/custom_opacity_bar.xml b/src/android/customCamera/res/drawable/custom_opacity_bar.xml similarity index 100% rename from src/android/customCamera/res/drawable-hdpi/custom_opacity_bar.xml rename to src/android/customCamera/res/drawable/custom_opacity_bar.xml diff --git a/src/android/customCamera/res/drawable-mdpi/round_button.xml b/src/android/customCamera/res/drawable/round_button.xml similarity index 70% rename from src/android/customCamera/res/drawable-mdpi/round_button.xml rename to src/android/customCamera/res/drawable/round_button.xml index 78ecfb2..7b02ec2 100644 --- a/src/android/customCamera/res/drawable-mdpi/round_button.xml +++ b/src/android/customCamera/res/drawable/round_button.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/src/android/customCamera/res/drawable-hdpi/thumb.xml b/src/android/customCamera/res/drawable/thumb.xml similarity index 100% rename from src/android/customCamera/res/drawable-hdpi/thumb.xml rename to src/android/customCamera/res/drawable/thumb.xml diff --git a/src/android/customCamera/res/layout/activity_camera_view.xml b/src/android/customCamera/res/layout/activity_camera_view.xml index 63a50ee..b0b9605 100644 --- a/src/android/customCamera/res/layout/activity_camera_view.xml +++ b/src/android/customCamera/res/layout/activity_camera_view.xml @@ -44,7 +44,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/round_button" - android:src="@drawable/capture2" /> + android:src="@drawable/capture" />