- hiding general settings option when child items are hidden
- change icon for 1x1 and full screen
- remove background tint from icons
This commit is contained in:
darthpaul
2022-08-28 02:19:18 +01:00
parent 34c0f0bd6a
commit 77994d408e
6 changed files with 32 additions and 24 deletions

View File

@ -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) {

View File

@ -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