From 53de0a2bb83d4b3c5d2e5138089070a99a34b0ff Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Fri, 24 Jun 2022 16:02:35 +0300 Subject: [PATCH 01/16] Switched to use Material Design Theme.| #1870 --- FlowCrypt/src/main/res/layout/nav_header.xml | 2 +- FlowCrypt/src/main/res/values/styles.xml | 4 ++-- FlowCrypt/src/main/res/values/themes.xml | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/FlowCrypt/src/main/res/layout/nav_header.xml b/FlowCrypt/src/main/res/layout/nav_header.xml index 2df2ea7df6..9fd1e89880 100644 --- a/FlowCrypt/src/main/res/layout/nav_header.xml +++ b/FlowCrypt/src/main/res/layout/nav_header.xml @@ -9,7 +9,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/nav_header_height" android:background="@drawable/side_nav_bar" - android:theme="@style/ThemeOverlay.AppCompat.Dark"> + android:theme="@style/ThemeOverlay.MaterialComponents.Dark"> @color/colorPrimary - + + + + + + - + + + - - - - - - - - - - + + + + + diff --git a/FlowCrypt/src/main/res/values/themes.xml b/FlowCrypt/src/main/res/values/themes.xml index ddab7f5881..c2d420fde0 100644 --- a/FlowCrypt/src/main/res/values/themes.xml +++ b/FlowCrypt/src/main/res/values/themes.xml @@ -5,18 +5,25 @@ - From 991027d45c141ef5d03ac3d813044bea62e26dc5 Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Sat, 25 Jun 2022 10:42:01 +0300 Subject: [PATCH 03/16] Fixed appBarLayout color.| #1870 --- FlowCrypt/src/main/res/values/styles.xml | 4 ++++ FlowCrypt/src/main/res/values/themes.xml | 1 + 2 files changed, 5 insertions(+) diff --git a/FlowCrypt/src/main/res/values/styles.xml b/FlowCrypt/src/main/res/values/styles.xml index d595bb7a2e..67dce04ffe 100644 --- a/FlowCrypt/src/main/res/values/styles.xml +++ b/FlowCrypt/src/main/res/values/styles.xml @@ -13,6 +13,10 @@ true + + + + diff --git a/FlowCrypt/src/main/res/values/themes.xml b/FlowCrypt/src/main/res/values/themes.xml index 0e6349d91e..adbea2a2bf 100644 --- a/FlowCrypt/src/main/res/values/themes.xml +++ b/FlowCrypt/src/main/res/values/themes.xml @@ -20,19 +20,22 @@ @style/AppWidget.TabLayout @style/AppWidget.AppBarLayout @style/AppWidget.Toolbar + @style/AppWidget.FloatingActionButton @style/AppWidget.ActionMode true + @style/Widget.Design.TextInputLayout + + + + + + + + + - - - + + - - - - - - - + + diff --git a/FlowCrypt/src/main/res/values/themes.xml b/FlowCrypt/src/main/res/values/themes.xml index 88a3692a0a..6b23fcdf2c 100644 --- a/FlowCrypt/src/main/res/values/themes.xml +++ b/FlowCrypt/src/main/res/values/themes.xml @@ -22,6 +22,7 @@ @style/AppWidget.AppBarLayout @style/AppWidget.Toolbar @style/AppWidget.FloatingActionButton + @style/AppWidget.NavigationView @style/AppWidget.ActionMode From fa474e59933b814073a2f87511b66eca378681e2 Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Mon, 27 Jun 2022 18:14:29 +0300 Subject: [PATCH 10/16] Set Theme.Material3.Light as a default theme.| #1870 --- FlowCrypt/src/main/res/values/themes.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/FlowCrypt/src/main/res/values/themes.xml b/FlowCrypt/src/main/res/values/themes.xml index 6b23fcdf2c..ebe83584f8 100644 --- a/FlowCrypt/src/main/res/values/themes.xml +++ b/FlowCrypt/src/main/res/values/themes.xml @@ -5,7 +5,8 @@ - + + @@ -163,14 +167,6 @@ @drawable/bg_message_part_other - - - - From 2d824cf3d5194d6650fada4a3807a8687f6c2e6c Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Tue, 28 Jun 2022 15:45:52 +0300 Subject: [PATCH 16/16] Fixed issue with some buttons background.| #1870 --- .../fragment/CheckPassphraseStrengthFragment.kt | 7 +++++-- .../fragment/CreatePrivateKeyFirstFragment.kt | 8 ++++++-- .../base/BasePassphraseStrengthFragment.kt | 14 ++++---------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckPassphraseStrengthFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckPassphraseStrengthFragment.kt index ad0642da83..284f3debd2 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckPassphraseStrengthFragment.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckPassphraseStrengthFragment.kt @@ -13,6 +13,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.view.inputmethod.EditorInfo +import androidx.core.content.ContextCompat import androidx.core.widget.addTextChangedListener import androidx.navigation.fragment.navArgs import com.flowcrypt.email.R @@ -51,8 +52,10 @@ class CheckPassphraseStrengthFragment : initPasswordStrengthViewModel() } - override fun onButtonContinueColorChanged(colorFilter: ColorFilter) { - binding?.btSetPassphrase?.background?.colorFilter = colorFilter + override fun onButtonContinueColorChanged(colorRes: Int) { + context?.let { + binding?.btSetPassphrase?.backgroundTintList = ContextCompat.getColorStateList(it, colorRes) + } } override fun onPassphraseQualityChanged(progress: Int) { diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreatePrivateKeyFirstFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreatePrivateKeyFirstFragment.kt index 7dfdb50d63..a2e206336a 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreatePrivateKeyFirstFragment.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreatePrivateKeyFirstFragment.kt @@ -11,6 +11,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.view.inputmethod.EditorInfo +import androidx.core.content.ContextCompat import androidx.core.os.bundleOf import androidx.core.widget.addTextChangedListener import androidx.fragment.app.setFragmentResult @@ -47,8 +48,11 @@ class CreatePrivateKeyFirstFragment : subscribeToCreatePrivateKey() } - override fun onButtonContinueColorChanged(colorFilter: ColorFilter) { - binding?.buttonSetPassPhrase?.background?.colorFilter = colorFilter + override fun onButtonContinueColorChanged(colorRes: Int) { + context?.let { + binding?.buttonSetPassPhrase?.backgroundTintList = + ContextCompat.getColorStateList(it, colorRes) + } } override fun onPassphraseQualityChanged(progress: Int) { diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/BasePassphraseStrengthFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/BasePassphraseStrengthFragment.kt index 72299c6266..4e4a561137 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/BasePassphraseStrengthFragment.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/BasePassphraseStrengthFragment.kt @@ -16,7 +16,7 @@ import android.text.style.ForegroundColorSpan import android.text.style.StyleSpan import android.view.View import android.widget.Toast -import androidx.core.content.ContextCompat +import androidx.annotation.ColorRes import androidx.core.graphics.BlendModeColorFilterCompat import androidx.core.graphics.BlendModeCompat import androidx.fragment.app.viewModels @@ -48,7 +48,7 @@ abstract class BasePassphraseStrengthFragment : BaseFragment protected val passwordStrengthViewModel: PasswordStrengthViewModel by viewModels() protected var pwdStrengthResult: PgpPwd.PwdStrengthResult? = null - abstract fun onButtonContinueColorChanged(colorFilter: ColorFilter) + abstract fun onButtonContinueColorChanged(@ColorRes colorRes: Int) abstract fun onPassphraseQualityChanged(progress: Int) abstract fun onPassphraseQualityProgressDrawableColorChanged(colorFilter: ColorFilter) abstract fun onPassphraseQualityTextChanged(charSequence: CharSequence) @@ -132,17 +132,11 @@ abstract class BasePassphraseStrengthFragment : BaseFragment when (word?.word) { Constants.PASSWORD_QUALITY_WEAK, Constants.PASSWORD_QUALITY_POOR -> { - val colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat( - ContextCompat.getColor(requireContext(), R.color.silver), BlendModeCompat.MODULATE - ) - colorFilter?.let { onButtonContinueColorChanged(it) } + onButtonContinueColorChanged(R.color.silver) } else -> { - val colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat( - ContextCompat.getColor(requireContext(), R.color.colorPrimary), BlendModeCompat.MODULATE - ) - colorFilter?.let { onButtonContinueColorChanged(it) } + onButtonContinueColorChanged(R.color.colorPrimary) } }