From 1ea95c709ba94805a66a7ea0774486eded2bb5da Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 20 Mar 2017 20:41:36 +0100 Subject: [PATCH] add a button for setting the photo/video resolution --- .../camera/activities/MainActivity.kt | 19 ++++++++++++------ .../main/res/drawable-hdpi/ic_resolution.png | Bin 0 -> 295 bytes .../main/res/drawable-mdpi/ic_resolution.png | Bin 0 -> 184 bytes .../main/res/drawable-xhdpi/ic_resolution.png | Bin 0 -> 304 bytes .../res/drawable-xxhdpi/ic_resolution.png | Bin 0 -> 420 bytes .../res/drawable-xxxhdpi/ic_resolution.png | Bin 0 -> 542 bytes app/src/main/res/layout/activity_main.xml | 12 ++++++++++- 7 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_resolution.png create mode 100644 app/src/main/res/drawable-mdpi/ic_resolution.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_resolution.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_resolution.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_resolution.png 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 0000000000000000000000000000000000000000..719ebf72f336a0cc83997902c3efce0f21f30eb0 GIT binary patch literal 295 zcmV+?0oeYDP)!qGS)biS(jWuGR12M5i3}_%G)&|%hYIzNt^Jr>N!T*=! zdkvv=0#MHN|6lR~d)9yD|8K#pBmY^!vQ6X|bml)hxaj@;|HXePs8Xi?`$+ZL+y4qs z=?vsF{9giSED3@A_rC{D70%F*B4AJ*SkVo38Kjg zWC{6VMt1E%6Pn&#v;2R5)7;u$KITr`ltdztNHRj50TD_YJvP>3ZfNQ&v&Vo=c9F&P z9)St!fHx5I(x5tc1wk_j8h8hVNl@e+G}b`nm^lXtNI+Vg0<_FINI(LzJ#sJ#NI(`+ zz&Vs70uqpb%De3aB%p}Xa)BBs+U42yXDAd^M(#n^m0`$eM_TdJv09^fATO+o=?N3s#?l9qr z>K{dWwn2RsjF($%W>j6;1U<9z@2Vw+wm=_jw^gf=5ms6N O00004e-7{>7-2!>!R_PTUes%Rm$Vr^?-acLICZ(tSgz%L*+#!k3eELCi*tnaFXXr-kf zW(zf&pyqFP;oiB87URvl@H|g<@3JqyVwhr+a1upP6h%=Kg&rfOv;JkB;s90x*MR~^=vu<1( z;E-zs0)4(<^O+61&Ypz)fP1s&u5&au`N<8t%$|h&fM;{Bx-&Ps-?_3b1u$XNyzJ3z z_Tto~;}R~iuk;C~E4%{WJ?nO6PeN|MZ*CIea-JQ&b19z0Cm}E3A)%vvZvE4WIw#;Y zD+!j2a{)e5C0Vk@ZVo`p)dUO7NmwS}E+Jv-{|`7~2}$;cuLm*UgDb!!20V2I7{-7r z9J>MRQ^kP5wj02Jun2ILw=Mu%-Je-k+2*)tz<&HsK(?28!XAgk0S=fjq|%pq0R#|0 g009ILK!B6}0sT9E%uJ^)AOHXW07*qoM6N<$g0#uz`v3p{ literal 0 HcmV?d00001 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"/> + +