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 af8098fb..73282337 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
@@ -54,7 +54,6 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
lateinit var mTimerHandler: Handler
private lateinit var mOrientationEventListener: OrientationEventListener
private lateinit var mFocusCircleView: FocusCircleView
- private lateinit var mFadeHandler: Handler
private lateinit var mCameraImpl: MyCameraImpl
private var mPreview: MyPreview? = null
private var mPreviewUri: Uri? = null
@@ -154,8 +153,6 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
return
}
- mFadeHandler.removeCallbacksAndMessages(null)
-
hideTimer()
mOrientationEventListener.disable()
}
@@ -319,7 +316,6 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
view_holder.addView(mFocusCircleView)
mTimerHandler = Handler(Looper.getMainLooper())
- mFadeHandler = Handler(Looper.getMainLooper())
setupPreviewImage(true)
val initialFlashlightState = FLASH_OFF
@@ -769,9 +765,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
val primaryColor = getProperPrimaryColor()
val states = arrayOf(intArrayOf(-android.R.attr.state_checked), intArrayOf(android.R.attr.state_checked))
val iconColors = intArrayOf(ContextCompat.getColor(this, R.color.md_grey_white), primaryColor)
- val backgroundColors = intArrayOf(ContextCompat.getColor(this, android.R.color.transparent), primaryColor.adjustAlpha(0.1f))
button.iconTint = ColorStateList(states, iconColors)
- button.backgroundTintList = ColorStateList(states, backgroundColors)
}
fun setRecordingState(isRecording: Boolean) {
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 55fe06c8..bcfc674a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt
@@ -98,6 +98,9 @@ class SettingsActivity : SimpleActivity() {
settings_use_english_holder.beVisibleIf(config.wasUseEnglishToggled || Locale.getDefault().language != "en")
settings_use_english.isChecked = config.useEnglish
+ settings_general_settings_holder.beGoneIf(settings_use_english_holder.isGone() && settings_purchase_thank_you_holder.isGone())
+ settings_general_settings_label.beGoneIf(settings_use_english_holder.isGone() && settings_purchase_thank_you_holder.isGone())
+
settings_use_english_holder.setOnClickListener {
settings_use_english.toggle()
config.useEnglish = settings_use_english.isChecked
diff --git a/app/src/main/res/drawable/ic_photo_1x1.xml b/app/src/main/res/drawable/ic_photo_1x1.xml
index 3d9a453f..7acddfcd 100644
--- a/app/src/main/res/drawable/ic_photo_1x1.xml
+++ b/app/src/main/res/drawable/ic_photo_1x1.xml
@@ -1,26 +1,22 @@
+ android:viewportWidth="18"
+ android:viewportHeight="18">
+
+
+ android:pathData="M2,0C0.895,0 0,0.895 0,2V5H2V2L16,2V5H18V2C18,0.895 17.105,0 16,0H2ZM18,13H16V16H2V13H0V16C0,17.105 0.895,18 2,18H16C17.105,18 18,17.105 18,16V13Z" />
+ android:pathData="M15,12H13.13V9.033C13.13,8.978 13.13,8.878 13.13,8.733C13.13,8.585 13.132,8.423 13.135,8.245C13.141,8.067 13.149,7.907 13.158,7.765C13.078,7.85 13.002,7.922 12.93,7.982C12.862,8.042 12.795,8.099 12.73,8.15L11.956,8.713L11,7.679L13.34,6H15V12Z" />
-
-
-
+ android:pathData="M6,12H4.131V9.033C4.131,8.978 4.131,8.878 4.131,8.733C4.131,8.585 4.132,8.423 4.135,8.245C4.141,8.067 4.149,7.907 4.159,7.765C4.078,7.85 4.002,7.922 3.93,7.982C3.862,8.042 3.795,8.099 3.73,8.15L2.956,8.713L2,7.679L4.34,6H6V12Z" />
diff --git a/app/src/main/res/drawable/ic_photo_full.xml b/app/src/main/res/drawable/ic_photo_full.xml
index 48697239..0656868c 100644
--- a/app/src/main/res/drawable/ic_photo_full.xml
+++ b/app/src/main/res/drawable/ic_photo_full.xml
@@ -1,9 +1,21 @@
+ android:viewportWidth="512"
+ android:viewportHeight="512">
+ android:pathData="M0,0v512h512V0H0zM477.87,477.87H34.13V34.13h443.73V477.87z" />
+
+
+
+
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5010b38c..f16dffb2 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,6 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/black"
+ android:animateLayoutChanges="true"
android:fitsSystemWindows="true">
textStart
- 0dp
- @dimen/toggle_icon_size
+ - @android:color/transparent
+ - @android:color/transparent
- 0dp
- 0dp
- @dimen/icon_size