From 77458cc759a83a181afd1d826601b4e4b423bc0f Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 20 Apr 2022 21:17:05 +0200 Subject: [PATCH] updating commons --- app/build.gradle | 2 +- .../com/simplemobiletools/camera/activities/MainActivity.kt | 2 +- .../simplemobiletools/camera/activities/SettingsActivity.kt | 4 ++-- .../com/simplemobiletools/camera/views/FocusCircleView.kt | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index dbde0964..90188b2d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,7 +56,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:99a97f2e16' + implementation 'com.github.SimpleMobileTools:Simple-Commons:d5e1100f27' implementation 'androidx.documentfile:documentfile:1.0.1' implementation "androidx.exifinterface:exifinterface:1.3.3" } 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 62e02c61..fc31976f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt @@ -70,7 +70,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener { resumeCameraItems() setupPreviewImage(mIsInPhotoMode) scheduleFadeOut() - mFocusCircleView.setStrokeColor(getAdjustedPrimaryColor()) + mFocusCircleView.setStrokeColor(getProperPrimaryColor()) if (mIsVideoCaptureIntent && mIsInPhotoMode) { handleTogglePhotoVideo() 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 0b41c2eb..988793c7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt @@ -57,9 +57,9 @@ class SettingsActivity : SimpleActivity() { } private fun setupSectionColors() { - val adjustedPrimaryColor = getAdjustedPrimaryColor() + val properPrimaryColor = getProperPrimaryColor() arrayListOf(shutter_label, startup_label, saving_label).forEach { - it.setTextColor(adjustedPrimaryColor) + it.setTextColor(properPrimaryColor) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/views/FocusCircleView.kt b/app/src/main/kotlin/com/simplemobiletools/camera/views/FocusCircleView.kt index ccb63d8c..8a75b6d6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/views/FocusCircleView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/views/FocusCircleView.kt @@ -6,6 +6,7 @@ import android.graphics.Paint import android.os.Handler import android.view.ViewGroup import com.simplemobiletools.camera.extensions.config +import com.simplemobiletools.commons.extensions.getProperPrimaryColor class FocusCircleView(context: Context) : ViewGroup(context) { private val CIRCLE_RADIUS = 50f @@ -22,7 +23,7 @@ class FocusCircleView(context: Context) : ViewGroup(context) { mHandler = Handler() mPaint = Paint().apply { style = Paint.Style.STROKE - color = context.config.primaryColor + color = context.getProperPrimaryColor() strokeWidth = 2f } }