From 34d9b273674d8b90815c72def928da88da704c2b Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 7 Apr 2019 23:10:01 +0200 Subject: [PATCH] updating gradle, commons --- app/build.gradle | 2 +- .../camera/activities/SettingsActivity.kt | 12 +---- .../camera/activities/SplashActivity.kt | 2 + .../camera/helpers/PhotoProcessor.kt | 4 +- app/src/main/res/layout/activity_settings.xml | 45 ------------------- 5 files changed, 7 insertions(+), 58 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4f3c1052..937294f4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -41,7 +41,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.1.4' + implementation 'com.simplemobiletools:commons:5.11.2' } Properties props = new Properties() diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt index 422d09f1..a1605b4c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt @@ -27,7 +27,6 @@ class SettingsActivity : SimpleActivity() { setupPurchaseThankYou() setupCustomizeColors() setupUseEnglish() - setupAvoidWhatsNew() setupSound() setupFocusBeforeCapture() setupVolumeButtonsAsShutter() @@ -85,14 +84,6 @@ class SettingsActivity : SimpleActivity() { } } - private fun setupAvoidWhatsNew() { - settings_avoid_whats_new.isChecked = config.avoidWhatsNew - settings_avoid_whats_new_holder.setOnClickListener { - settings_avoid_whats_new.toggle() - config.avoidWhatsNew = settings_avoid_whats_new.isChecked - } - } - private fun launchAbout() { val licenses = LICENSE_GLIDE @@ -177,8 +168,9 @@ class SettingsActivity : SimpleActivity() { settings_save_photos.text = getLastPart(config.savePhotosFolder) settings_save_photos_holder.setOnClickListener { FilePickerDialog(this, config.savePhotosFolder, false, showFAB = true) { + val path = it handleSAFDialog(it) { - config.savePhotosFolder = it + config.savePhotosFolder = path settings_save_photos.text = getLastPart(config.savePhotosFolder) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SplashActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SplashActivity.kt index 45c1e3dc..b29f0f09 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SplashActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SplashActivity.kt @@ -4,6 +4,8 @@ import android.content.Intent import com.simplemobiletools.commons.activities.BaseSplashActivity class SplashActivity : BaseSplashActivity() { + override fun getAppPackageName() = packageName + override fun initActivity() { startActivity(Intent(this, MainActivity::class.java)) finish() diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/helpers/PhotoProcessor.kt b/app/src/main/kotlin/com/simplemobiletools/camera/helpers/PhotoProcessor.kt index 786b9907..d1d395e0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/helpers/PhotoProcessor.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/helpers/PhotoProcessor.kt @@ -46,7 +46,7 @@ class PhotoProcessor(val activity: MainActivity, val saveUri: Uri?, val deviceOr val photoFile = File(path) if (activity.needsStupidWritePermissions(path)) { - if (!activity.hasProperStoredTreeUri()) { + if (!activity.hasProperStoredTreeUri(activity.isPathOnOTG(path))) { activity.toast(R.string.save_error_internal_storage) activity.config.savePhotosFolder = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).toString() return "" @@ -107,7 +107,7 @@ class PhotoProcessor(val activity: MainActivity, val saveUri: Uri?, val deviceOr try { image.compress(Bitmap.CompressFormat.JPEG, activity.config.photoQuality, fos) - if (!isThirdPartyIntent) { + if (!isThirdPartyIntent && isNougatPlus()) { activity.saveImageRotation(path, totalRotation) } } catch (e: Exception) { diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 847d3a05..f66aa3f0 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -29,7 +29,6 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:paddingStart="@dimen/medium_margin" - android:paddingLeft="@dimen/medium_margin" android:text="@string/purchase_simple_thank_you"/> @@ -51,7 +50,6 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:paddingStart="@dimen/medium_margin" - android:paddingLeft="@dimen/medium_margin" android:text="@string/customize_colors"/> @@ -74,36 +72,11 @@ android:background="@null" android:clickable="false" android:paddingStart="@dimen/medium_margin" - android:paddingLeft="@dimen/medium_margin" android:text="@string/use_english_language" app:switchPadding="@dimen/medium_margin"/> - - - - - - - @@ -165,7 +135,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/bigger_margin" - android:layout_marginLeft="@dimen/bigger_margin" android:layout_marginTop="@dimen/activity_margin" android:text="@string/shutter" android:textAllCaps="true" @@ -189,7 +158,6 @@ android:background="@null" android:clickable="false" android:paddingStart="@dimen/medium_margin" - android:paddingLeft="@dimen/medium_margin" android:text="@string/shutter_sound" app:switchPadding="@dimen/medium_margin"/> @@ -213,7 +181,6 @@ android:background="@null" android:clickable="false" android:paddingStart="@dimen/medium_margin" - android:paddingLeft="@dimen/medium_margin" android:text="@string/volume_buttons_as_shutter" app:switchPadding="@dimen/medium_margin"/> @@ -231,7 +198,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/bigger_margin" - android:layout_marginLeft="@dimen/bigger_margin" android:layout_marginTop="@dimen/activity_margin" android:text="@string/startup" android:textAllCaps="true" @@ -255,7 +221,6 @@ android:background="@null" android:clickable="false" android:paddingStart="@dimen/medium_margin" - android:paddingLeft="@dimen/medium_margin" android:text="@string/turn_flash_off_at_startup" app:switchPadding="@dimen/medium_margin"/> @@ -279,7 +244,6 @@ android:background="@null" android:clickable="false" android:paddingStart="@dimen/medium_margin" - android:paddingLeft="@dimen/medium_margin" android:text="@string/always_open_back_camera" app:switchPadding="@dimen/medium_margin"/> @@ -297,7 +261,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/bigger_margin" - android:layout_marginLeft="@dimen/bigger_margin" android:layout_marginTop="@dimen/activity_margin" android:text="@string/saving_label" android:textAllCaps="true" @@ -321,7 +284,6 @@ android:background="@null" android:clickable="false" android:paddingStart="@dimen/medium_margin" - android:paddingLeft="@dimen/medium_margin" android:text="@string/save_photo_metadata" app:switchPadding="@dimen/medium_margin"/> @@ -345,7 +307,6 @@ android:background="@null" android:clickable="false" android:paddingStart="@dimen/medium_margin" - android:paddingLeft="@dimen/medium_margin" android:text="@string/flip_front_camera_photos_horizontally" app:switchPadding="@dimen/medium_margin"/> @@ -368,7 +329,6 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_toStartOf="@+id/settings_save_photos" - android:layout_toLeftOf="@+id/settings_save_photos" android:paddingLeft="@dimen/medium_margin" android:paddingRight="@dimen/medium_margin" android:text="@string/save_photos"/> @@ -378,9 +338,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" android:layout_marginEnd="@dimen/small_margin" - android:layout_marginRight="@dimen/small_margin" android:background="@null" android:clickable="false"/> @@ -403,7 +361,6 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_toStartOf="@+id/settings_photo_quality" - android:layout_toLeftOf="@+id/settings_photo_quality" android:paddingLeft="@dimen/medium_margin" android:paddingRight="@dimen/medium_margin" android:text="@string/photo_compression_quality"/> @@ -413,9 +370,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" android:layout_marginEnd="@dimen/small_margin" - android:layout_marginRight="@dimen/small_margin" android:background="@null" android:clickable="false"/>