diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
index f1cdf9e8..8be88c20 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
@@ -199,7 +199,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener {
checkImageCaptureIntent()
mPreview?.setIsImageCaptureIntent(isImageCaptureIntent())
- val imageDrawable = if (config.lastUsedCamera == mCameraImpl.getBackCameraId().toString()) R.drawable.ic_camera_front else R.drawable.ic_camera_rear
+ val imageDrawable = if (config.lastUsedCamera == mCameraImpl.getBackCameraId().toString()) R.drawable.ic_camera_front_vector else R.drawable.ic_camera_rear_vector
toggle_camera.setImageResource(imageDrawable)
mFocusCircleView = FocusCircleView(applicationContext)
@@ -246,15 +246,15 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener {
fun updateFlashlightState(state: Int) {
config.flashlightState = state
val flashDrawable = when (state) {
- FLASH_OFF -> R.drawable.ic_flash_off
- FLASH_ON -> R.drawable.ic_flash_on
- else -> R.drawable.ic_flash_auto
+ FLASH_OFF -> R.drawable.ic_flash_off_vector
+ FLASH_ON -> R.drawable.ic_flash_on_vector
+ else -> R.drawable.ic_flash_auto_vector
}
toggle_flash.setImageResource(flashDrawable)
}
fun updateCameraIcon(isUsingFrontCamera: Boolean) {
- toggle_camera.setImageResource(if (isUsingFrontCamera) R.drawable.ic_camera_rear else R.drawable.ic_camera_front)
+ toggle_camera.setImageResource(if (isUsingFrontCamera) R.drawable.ic_camera_rear_vector else R.drawable.ic_camera_front_vector)
}
private fun shutterPressed() {
@@ -334,8 +334,8 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener {
}
private fun initPhotoMode() {
- toggle_photo_video.setImageResource(R.drawable.ic_video)
- shutter.setImageResource(R.drawable.ic_shutter)
+ toggle_photo_video.setImageResource(R.drawable.ic_video_vector)
+ shutter.setImageResource(R.drawable.ic_shutter_vector)
mPreview?.initPhotoMode()
setupPreviewImage(true)
}
@@ -499,7 +499,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener {
toggle_flash.beVisible()
} else {
toggle_flash.beInvisible()
- toggle_flash.setImageResource(R.drawable.ic_flash_off)
+ toggle_flash.setImageResource(R.drawable.ic_flash_off_vector)
mPreview?.setFlashlightState(FLASH_OFF)
}
}
diff --git a/app/src/main/res/drawable-hdpi/ic_camera_front.png b/app/src/main/res/drawable-hdpi/ic_camera_front.png
deleted file mode 100644
index f36dcd49..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_camera_front.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_camera_rear.png b/app/src/main/res/drawable-hdpi/ic_camera_rear.png
deleted file mode 100644
index 4a5494f2..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_camera_rear.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_flash_auto.png b/app/src/main/res/drawable-hdpi/ic_flash_auto.png
deleted file mode 100644
index 3eb32b26..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_flash_auto.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_flash_off.png b/app/src/main/res/drawable-hdpi/ic_flash_off.png
deleted file mode 100644
index 948446b3..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_flash_off.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_flash_on.png b/app/src/main/res/drawable-hdpi/ic_flash_on.png
deleted file mode 100644
index 4747a110..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_flash_on.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_resolution.png b/app/src/main/res/drawable-hdpi/ic_resolution.png
deleted file mode 100644
index 719ebf72..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_resolution.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_shutter.png b/app/src/main/res/drawable-hdpi/ic_shutter.png
deleted file mode 100644
index 0fe586ad..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_shutter.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_video.png b/app/src/main/res/drawable-hdpi/ic_video.png
deleted file mode 100644
index d83e0d50..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_video.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_camera_front.png b/app/src/main/res/drawable-xhdpi/ic_camera_front.png
deleted file mode 100644
index a80ccde5..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_camera_front.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_camera_rear.png b/app/src/main/res/drawable-xhdpi/ic_camera_rear.png
deleted file mode 100644
index b0768e30..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_camera_rear.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_flash_auto.png b/app/src/main/res/drawable-xhdpi/ic_flash_auto.png
deleted file mode 100644
index 185fa401..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_flash_auto.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_flash_off.png b/app/src/main/res/drawable-xhdpi/ic_flash_off.png
deleted file mode 100644
index 23c854e9..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_flash_off.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_flash_on.png b/app/src/main/res/drawable-xhdpi/ic_flash_on.png
deleted file mode 100644
index bedc4eb8..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_flash_on.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_resolution.png b/app/src/main/res/drawable-xhdpi/ic_resolution.png
deleted file mode 100644
index 4577f75b..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_resolution.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_shutter.png b/app/src/main/res/drawable-xhdpi/ic_shutter.png
deleted file mode 100644
index d3716553..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_shutter.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_video.png b/app/src/main/res/drawable-xhdpi/ic_video.png
deleted file mode 100644
index 1b2583d3..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_video.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_camera_front.png b/app/src/main/res/drawable-xxhdpi/ic_camera_front.png
deleted file mode 100644
index 3eb24d1f..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_camera_front.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_camera_rear.png b/app/src/main/res/drawable-xxhdpi/ic_camera_rear.png
deleted file mode 100644
index 8392b2a8..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_camera_rear.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_flash_auto.png b/app/src/main/res/drawable-xxhdpi/ic_flash_auto.png
deleted file mode 100644
index 087aa592..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_flash_auto.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_flash_off.png b/app/src/main/res/drawable-xxhdpi/ic_flash_off.png
deleted file mode 100644
index 3cf30f3e..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_flash_off.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_flash_on.png b/app/src/main/res/drawable-xxhdpi/ic_flash_on.png
deleted file mode 100644
index 4e116af4..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_flash_on.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_resolution.png b/app/src/main/res/drawable-xxhdpi/ic_resolution.png
deleted file mode 100644
index 2f6ca2c7..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_resolution.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_shutter.png b/app/src/main/res/drawable-xxhdpi/ic_shutter.png
deleted file mode 100644
index acee078b..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_shutter.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_video.png b/app/src/main/res/drawable-xxhdpi/ic_video.png
deleted file mode 100644
index 44c28e2f..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_video.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_camera_front.png b/app/src/main/res/drawable-xxxhdpi/ic_camera_front.png
deleted file mode 100644
index 951bc12c..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_camera_front.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_camera_rear.png b/app/src/main/res/drawable-xxxhdpi/ic_camera_rear.png
deleted file mode 100644
index 8b2415ba..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_camera_rear.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_flash_auto.png b/app/src/main/res/drawable-xxxhdpi/ic_flash_auto.png
deleted file mode 100644
index 899276f6..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_flash_auto.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_flash_off.png b/app/src/main/res/drawable-xxxhdpi/ic_flash_off.png
deleted file mode 100644
index 1d774f24..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_flash_off.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_flash_on.png b/app/src/main/res/drawable-xxxhdpi/ic_flash_on.png
deleted file mode 100644
index cb606113..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_flash_on.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_resolution.png b/app/src/main/res/drawable-xxxhdpi/ic_resolution.png
deleted file mode 100644
index f6ba9d07..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_resolution.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_shutter.png b/app/src/main/res/drawable-xxxhdpi/ic_shutter.png
deleted file mode 100644
index 1d69c89f..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_shutter.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_video.png b/app/src/main/res/drawable-xxxhdpi/ic_video.png
deleted file mode 100644
index ed20c070..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_video.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_camera_front_vector.xml b/app/src/main/res/drawable/ic_camera_front_vector.xml
new file mode 100644
index 00000000..27c0736a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_camera_front_vector.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_camera_rear_vector.xml b/app/src/main/res/drawable/ic_camera_rear_vector.xml
new file mode 100644
index 00000000..e55822a5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_camera_rear_vector.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_flash_auto_vector.xml b/app/src/main/res/drawable/ic_flash_auto_vector.xml
new file mode 100644
index 00000000..308f724c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_flash_auto_vector.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_flash_off_vector.xml b/app/src/main/res/drawable/ic_flash_off_vector.xml
new file mode 100644
index 00000000..9d4b374c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_flash_off_vector.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_flash_on_vector.xml b/app/src/main/res/drawable/ic_flash_on_vector.xml
new file mode 100644
index 00000000..57cd3a63
--- /dev/null
+++ b/app/src/main/res/drawable/ic_flash_on_vector.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_resolution_vector.xml b/app/src/main/res/drawable/ic_resolution_vector.xml
new file mode 100644
index 00000000..51f87b2d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_resolution_vector.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_shutter_vector.xml b/app/src/main/res/drawable/ic_shutter_vector.xml
new file mode 100644
index 00000000..465884e0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shutter_vector.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_video_vector.xml b/app/src/main/res/drawable/ic_video_vector.xml
new file mode 100644
index 00000000..7f1b16c3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_video_vector.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 245f504e..efbe1107 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -26,7 +26,7 @@
android:layout_below="@+id/settings"
android:layout_alignParentRight="true"
android:padding="@dimen/normal_margin"
- android:src="@drawable/ic_video"/>
+ android:src="@drawable/ic_video_vector"/>
+ android:src="@drawable/ic_resolution_vector"/>
+ android:src="@drawable/ic_camera_front_vector"/>
+ android:src="@drawable/ic_shutter_vector"/>
+ android:src="@drawable/ic_flash_off_vector"/>