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 0eb4deb1..f57b9528 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt @@ -153,6 +153,7 @@ class MainActivity : SimpleActivity(), SensorEventListener, PreviewListener, Pho shutter.setOnClickListener { shutterPressed() } settings.setOnClickListener { launchSettings() } toggle_photo_video.setOnClickListener { handleTogglePhotoVideo() } + change_resolution.setOnClickListener { handleChangeResolution() } } private fun hasCameraAndStoragePermission() = hasCameraPermission() && hasWriteStoragePermission() @@ -180,7 +181,7 @@ class MainActivity : SimpleActivity(), SensorEventListener, PreviewListener, Pho } } - fun toggleCamera() { + private fun toggleCamera() { if (!checkCameraAvailable()) { return } @@ -206,7 +207,7 @@ class MainActivity : SimpleActivity(), SensorEventListener, PreviewListener, Pho } } - fun showLastMediaPreview() { + private fun showLastMediaPreview() { if (mPreviewUri == null) return @@ -224,7 +225,7 @@ class MainActivity : SimpleActivity(), SensorEventListener, PreviewListener, Pho } } - fun toggleFlash() { + private fun toggleFlash() { if (!checkCameraAvailable()) { return } @@ -288,7 +289,7 @@ class MainActivity : SimpleActivity(), SensorEventListener, PreviewListener, Pho toggle_flash.animate().alpha(alpha).start() } - fun launchSettings() { + private fun launchSettings() { if (settings.alpha == 1f) { val intent = Intent(applicationContext, SettingsActivity::class.java) startActivity(intent) @@ -297,11 +298,15 @@ class MainActivity : SimpleActivity(), SensorEventListener, PreviewListener, Pho } } - fun handleTogglePhotoVideo() { + private fun handleTogglePhotoVideo() { togglePhotoVideo() checkButtons() } + private fun handleChangeResolution() { + + } + private fun togglePhotoVideo() { if (!checkCameraAvailable()) { return @@ -389,12 +394,14 @@ class MainActivity : SimpleActivity(), SensorEventListener, PreviewListener, Pho private fun fadeOutButtons() { fadeAnim(settings, .5f) fadeAnim(toggle_photo_video, .0f) + fadeAnim(change_resolution, .0f) fadeAnim(last_photo_video_preview, .0f) } private fun fadeInButtons() { fadeAnim(settings, 1f) fadeAnim(toggle_photo_video, 1f) + fadeAnim(change_resolution, 1f) fadeAnim(last_photo_video_preview, 1f) scheduleFadeOut() } @@ -502,7 +509,7 @@ class MainActivity : SimpleActivity(), SensorEventListener, PreviewListener, Pho } private fun animateViews(degrees: Int) { - val views = arrayOf(toggle_camera, toggle_flash, toggle_photo_video, shutter, settings, last_photo_video_preview) + val views = arrayOf(toggle_camera, toggle_flash, toggle_photo_video, change_resolution, shutter, settings, last_photo_video_preview) for (view in views) { rotate(view, degrees) } diff --git a/app/src/main/res/drawable-hdpi/ic_resolution.png b/app/src/main/res/drawable-hdpi/ic_resolution.png new file mode 100644 index 00000000..719ebf72 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_resolution.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_resolution.png b/app/src/main/res/drawable-mdpi/ic_resolution.png new file mode 100644 index 00000000..a6066dd0 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_resolution.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_resolution.png b/app/src/main/res/drawable-xhdpi/ic_resolution.png new file mode 100644 index 00000000..4577f75b Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_resolution.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_resolution.png b/app/src/main/res/drawable-xxhdpi/ic_resolution.png new file mode 100644 index 00000000..2f6ca2c7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_resolution.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_resolution.png b/app/src/main/res/drawable-xxxhdpi/ic_resolution.png new file mode 100644 index 00000000..f6ba9d07 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_resolution.png differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4ed0a11c..a8e7e3d4 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -37,12 +37,22 @@ android:src="@drawable/ic_video"/> + +