Issue 917 day night theme

FlowCrypt/build.gradle

@@ -391,7 +391,7 @@ dependencies {
     implementation 'androidx.navigation:navigation-fragment-ktx:2.5.0'
     implementation 'androidx.navigation:navigation-ui-ktx:2.5.0'
     implementation 'androidx.navigation:navigation-runtime-ktx:2.5.0'
-
+    implementation 'androidx.webkit:webkit:1.4.0'
 
     //https://developers.google.com/android/guides/setup
     implementation 'com.google.android.gms:play-services-base:18.1.0'

FlowCrypt/src/main/assets/html/pass_phrase_hint.htm

@@ -10,8 +10,6 @@
        /* dimensions: handling large content */
        max-height: 100%;
        max-width: 95%;
-       /* styling */
-       background: #fff;
        /* reset white-space wrapping */
        white-space: normal;
    }
@@ -25,9 +23,6 @@
    .good { color: #088447; }
    .bad { color: #A44; }
 
-
-
-
 </style>
 <div class="featherlight-content">
     <div class="lightboxed featherlight-inner">

FlowCrypt/src/main/java/com/flowcrypt/email/extensions/android/webkit/WebViewExt.kt

@@ -0,0 +1,32 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact [email protected]
+ * Contributors: DenBond7
+ */
+
+package com.flowcrypt.email.extensions.android.webkit
+
+import android.content.res.Configuration
+import android.graphics.Color
+import android.webkit.WebView
+import androidx.webkit.WebSettingsCompat
+import androidx.webkit.WebViewFeature
+
+/**
+ * @author Denis Bondarenko
+ *         Date: 6/29/22
+ *         Time: 1:47 PM
+ *         E-mail: [email protected]
+ */
+fun WebView.setupDayNight() {
+  if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) {
+    setBackgroundColor(Color.TRANSPARENT)
+    when (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) {
+      Configuration.UI_MODE_NIGHT_YES -> {
+        WebSettingsCompat.setForceDark(settings, WebSettingsCompat.FORCE_DARK_ON)
+      }
+      Configuration.UI_MODE_NIGHT_NO, Configuration.UI_MODE_NIGHT_UNDEFINED -> {
+        WebSettingsCompat.setForceDark(settings, WebSettingsCompat.FORCE_DARK_OFF)
+      }
+    }
+  }
+}

FlowCrypt/src/main/java/com/flowcrypt/email/security/pgp/PgpMsg.kt

@@ -66,8 +66,7 @@ import kotlin.random.Random
 
 object PgpMsg {
   private const val GENERAL_CSS =
-    "background: white;padding-left: 8px;min-height: 50px;padding-top: 4px;" +
-        "padding-bottom: 4px;width: 100%;"
+    "padding-left: 8px;min-height: 50px;padding-top: 4px;padding-bottom: 4px;width: 100%;"
   private const val SEAMLESS_LOCK_BG = "iVBORw0KGgoAAAANSUhEUgAAAFoAAABaCAMAAAAPdrEwAAAAh1BMVEXw" +
       "8PD////w8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PD" +
       "w8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8P" +

FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/AttesterSettingsFragment.kt

@@ -9,7 +9,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.content.res.ResourcesCompat
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -73,8 +72,6 @@ class AttesterSettingsFragment : BaseFragment<FragmentAttesterSettingsBinding>()
     context?.let {
       val manager = LinearLayoutManager(it)
       val decoration = DividerItemDecoration(it, manager.orientation)
-      val drawable = ResourcesCompat.getDrawable(resources, R.drawable.divider_1dp_grey, it.theme)
-      drawable?.let { decoration.setDrawable(drawable) }
       rVAttester?.addItemDecoration(decoration)
       rVAttester?.layoutManager = manager
       rVAttester?.adapter = attesterKeyAdapter

FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/HtmlViewFromAssetsRawFragment.kt

@@ -11,6 +11,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.navigation.fragment.navArgs
 import com.flowcrypt.email.databinding.FragmentHtmlViewFromAssetsRawBinding
+import com.flowcrypt.email.extensions.android.webkit.setupDayNight
 import com.flowcrypt.email.extensions.supportActionBar
 import com.flowcrypt.email.ui.activity.fragment.base.BaseFragment
 
@@ -29,6 +30,8 @@ class HtmlViewFromAssetsRawFragment : BaseFragment<FragmentHtmlViewFromAssetsRaw
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
     supportActionBar?.title = args.title
+
+    binding?.webView?.setupDayNight()
     binding?.webView?.loadUrl("file:///android_asset/" + args.resourceIdAsString)
   }
 }

FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/LegalSettingsFragment.kt

@@ -21,6 +21,7 @@ import com.flowcrypt.email.Constants
 import com.flowcrypt.email.R
 import com.flowcrypt.email.databinding.FragmentLegalBinding
 import com.flowcrypt.email.databinding.SwipeToRefrechWithWebviewBinding
+import com.flowcrypt.email.extensions.android.webkit.setupDayNight
 import com.flowcrypt.email.extensions.androidx.viewpager2.widget.reduceDragSensitivity
 import com.flowcrypt.email.ui.activity.fragment.base.BaseFragment
 import com.google.android.material.tabs.TabLayoutMediator
@@ -124,7 +125,10 @@ class LegalSettingsFragment : BaseFragment<FragmentLegalBinding>() {
           binding?.swipeRefreshLayout?.isRefreshing = false
         }
       }
-      assetsPath?.let { binding?.webView?.loadUrl(it) }
+      assetsPath?.let {
+        binding?.webView?.setupDayNight()
+        binding?.webView?.loadUrl(it)
+      }
     }
 
     companion object {

FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeysListFragment.kt

@@ -14,7 +14,6 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.ActionMode
-import androidx.core.content.res.ResourcesCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.setFragmentResultListener
 import androidx.fragment.app.viewModels
@@ -167,9 +166,6 @@ class PrivateKeysListFragment : BaseFragment<FragmentPrivateKeysBinding>(), List
       setHasFixedSize(true)
       val manager = LinearLayoutManager(context)
       val decoration = DividerItemDecoration(context, manager.orientation)
-      val drawable =
-        ResourcesCompat.getDrawable(resources, R.drawable.divider_1dp_grey, requireContext().theme)
-      drawable?.let { decoration.setDrawable(drawable) }
       addItemDecoration(decoration)
       layoutManager = manager
       adapter = recyclerViewAdapter

FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/RecipientsListFragment.kt

@@ -10,7 +10,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.core.content.res.ResourcesCompat
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DividerItemDecoration
@@ -76,9 +75,6 @@ class RecipientsListFragment : BaseFragment<FragmentRecipientsListBinding>(),
   private fun initViews() {
     val manager = LinearLayoutManager(context)
     val decoration = DividerItemDecoration(context, manager.orientation)
-    val drawable =
-      ResourcesCompat.getDrawable(resources, R.drawable.divider_1dp_grey, requireContext().theme)
-    drawable?.let { decoration.setDrawable(drawable) }
     binding?.rVRecipients?.addItemDecoration(decoration)
     binding?.rVRecipients?.layoutManager = manager
     binding?.rVRecipients?.adapter = recipientsRecyclerViewAdapter

FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/SelectRecipientsFragment.kt

@@ -13,7 +13,6 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.SearchView
-import androidx.core.content.res.ResourcesCompat
 import androidx.core.os.bundleOf
 import androidx.core.view.MenuHost
 import androidx.core.view.MenuProvider
@@ -125,9 +124,6 @@ class SelectRecipientsFragment : BaseFragment<FragmentSelectRecipientsBinding>()
   private fun initViews() {
     val manager = LinearLayoutManager(requireContext())
     val decoration = DividerItemDecoration(requireContext(), manager.orientation)
-    val drawable =
-      ResourcesCompat.getDrawable(resources, R.drawable.divider_1dp_grey, requireActivity().theme)
-    drawable?.let { decoration.setDrawable(drawable) }
     binding?.recyclerViewContacts?.addItemDecoration(decoration)
     binding?.recyclerViewContacts?.layoutManager = manager
     binding?.recyclerViewContacts?.adapter = recipientsRecyclerViewAdapter

FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/EditScreenshotDialogFragment.kt

@@ -83,7 +83,7 @@ class EditScreenshotDialogFragment : BaseDialogFragment() {
     binding?.radioGroupColors?.setOnCheckedChangeListener { _, checkedId ->
       when (checkedId) {
         R.id.radioButtonFullColor -> {
-          photoEditor.brushColor = ContextCompat.getColor(requireContext(), R.color.black)
+          photoEditor.brushColor = ContextCompat.getColor(requireContext(), android.R.color.black)
           photoEditor.setOpacity(100)
         }
 
@@ -98,7 +98,7 @@ class EditScreenshotDialogFragment : BaseDialogFragment() {
 
     photoEditor = PhotoEditor.Builder(context, binding?.photoEditorView).build()
     photoEditor.setBrushDrawingMode(true)
-    photoEditor.brushColor = ContextCompat.getColor(requireContext(), R.color.black)
+    photoEditor.brushColor = ContextCompat.getColor(requireContext(), android.R.color.black)
     photoEditor.setOpacity(100)
   }
 

FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/InfoDialogFragment.kt

@@ -13,6 +13,7 @@ import androidx.core.os.bundleOf
 import androidx.fragment.app.setFragmentResult
 import androidx.navigation.fragment.navArgs
 import com.flowcrypt.email.R
+import com.flowcrypt.email.extensions.android.webkit.setupDayNight
 import com.flowcrypt.email.extensions.navController
 import com.flowcrypt.email.util.GeneralUtil
 import com.flowcrypt.email.util.UIUtil
@@ -58,6 +59,8 @@ class InfoDialogFragment : BaseDialogFragment() {
     if (args.useWebViewToRender) {
       val webView = WebView(requireContext())
       webView.id = R.id.webView
+      webView.setupDayNight()
+
       args.dialogMsg?.let {
         webView.loadDataWithBaseURL(
           null,

FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MsgsPagedListAdapter.kt

@@ -6,6 +6,7 @@
 package com.flowcrypt.email.ui.adapter
 
 import android.content.Context
+import android.graphics.Color
 import android.graphics.Typeface
 import android.text.SpannableString
 import android.text.Spanned
@@ -34,7 +35,7 @@ import com.flowcrypt.email.database.MessageState
 import com.flowcrypt.email.database.entity.MessageEntity
 import com.flowcrypt.email.util.DateTimeUtil
 import com.flowcrypt.email.util.LogsUtil
-import com.flowcrypt.email.util.UIUtil
+import com.google.android.material.color.MaterialColors
 import jakarta.mail.internet.InternetAddress
 import java.util.regex.Pattern
 
@@ -168,17 +169,20 @@ class MsgsPagedListAdapter(private val onMessageClickListener: OnMessageClickLis
 
       if (messageEntity.isSeen) {
         changeViewsTypeface(viewHolder, Typeface.NORMAL)
-        viewHolder.textViewSenderAddress?.setTextColor(UIUtil.getColor(context, R.color.dark))
-        viewHolder.textViewDate?.setTextColor(UIUtil.getColor(context, R.color.gray))
+        viewHolder.textViewSenderAddress?.setTextColor(
+          MaterialColors.getColor(context, R.attr.colorOnSurfaceVariant, Color.BLACK)
+        )
+        viewHolder.textViewDate?.setTextColor(
+          MaterialColors.getColor(context, R.attr.itemSubTitleColor, Color.BLACK)
+        )
       } else {
         changeViewsTypeface(viewHolder, Typeface.BOLD)
         viewHolder.textViewSenderAddress?.setTextColor(
-          UIUtil.getColor(
-            context,
-            android.R.color.black
-          )
+          MaterialColors.getColor(context, R.attr.itemTitleColor, Color.BLACK)
+        )
+        viewHolder.textViewDate?.setTextColor(
+          MaterialColors.getColor(context, R.attr.itemTitleColor, Color.BLACK)
         )
-        viewHolder.textViewDate?.setTextColor(UIUtil.getColor(context, android.R.color.black))
       }
 
       viewHolder.imageViewAtts?.visibility =

FlowCrypt/src/main/java/com/flowcrypt/email/ui/widget/EmailWebView.kt

@@ -18,6 +18,7 @@ import androidx.browser.customtabs.CustomTabColorSchemeParams
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.core.content.ContextCompat
 import com.flowcrypt.email.R
+import com.flowcrypt.email.extensions.android.webkit.setupDayNight
 import com.flowcrypt.email.model.MessageType
 import com.flowcrypt.email.ui.activity.CreateMessageActivity
 
@@ -67,6 +68,8 @@ class EmailWebView : WebView {
     webSettings.loadsImagesAutomatically = true
     webSettings.blockNetworkLoads = true
     webSettings.javaScriptEnabled = false
+
+    setupDayNight()
   }
 
   fun setOnPageLoadingListener(onPageLoadingListener: OnPageLoadingListener) {

FlowCrypt/src/main/res/drawable/selector_msg_item.xml → FlowCrypt/src/main/res/color/selector_msg_item.xml

@@ -4,5 +4,6 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/silver" android:state_activated="true" />
+    <item android:color="?attr/colorControlHighlight" android:state_activated="true" />
+    <item android:color="@android:color/transparent" />
 </selector>

FlowCrypt/src/main/res/drawable/bg_message_part_other.xml

@@ -11,7 +11,7 @@
 
     <item android:gravity="left">
         <shape>
-            <solid android:color="@android:color/white" />
+            <solid android:color="?attr/colorSurface" />
         </shape>
     </item>
 

FlowCrypt/src/main/res/layout/contact_item.xml

@@ -18,7 +18,6 @@
         android:id="@+id/cL"
         android:layout_width="0dp"
         android:layout_height="@dimen/default_button_height"
-        android:layout_marginTop="@dimen/default_margin_content_small"
         android:layout_marginEnd="@dimen/default_margin_content_small"
         android:orientation="vertical"
         app:layout_constraintEnd_toStartOf="@+id/iBtDeleteContact"
@@ -31,6 +30,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="1"
+            android:textColor="?attr/itemTitleColor"
             android:textSize="@dimen/default_text_size_big"
             android:visibility="visible"
             app:layout_constraintBottom_toTopOf="@+id/tVEmail"
@@ -44,6 +44,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="1"
+            android:textColor="?attr/itemSubTitleColor"
             android:visibility="visible"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

FlowCrypt/src/main/res/layout/fragment_add_other_account.xml

@@ -37,7 +37,7 @@
                 android:gravity="center"
                 android:lineSpacingExtra="@dimen/default_margin_small"
                 android:text="@string/connect_your_email_account_using_oauth_2_0"
-                android:textColor="@android:color/black"
+                android:textColor="?attr/colorOnSurface"
                 android:textSize="@dimen/default_text_size_big"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -66,7 +66,7 @@
                 android:gravity="center"
                 android:lineSpacingExtra="@dimen/default_margin_small"
                 android:text="@string/or_use_your_credentials_to_connect"
-                android:textColor="@android:color/black"
+                android:textColor="?attr/colorOnSurface"
                 android:textSize="@dimen/default_text_size_big"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"

FlowCrypt/src/main/res/layout/fragment_change_passphrase_of_imported_keys.xml

@@ -25,7 +25,7 @@
         android:layout_marginTop="@dimen/default_margin_content_big"
         android:layout_weight="1"
         android:gravity="center"
-        android:textColor="@android:color/black"
+        android:textColor="?attr/colorOnSurface"
         app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
         app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
         app:layout_constraintTop_toBottomOf="@+id/tVTitle"

FlowCrypt/src/main/res/layout/fragment_check_keys.xml

@@ -40,7 +40,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:gravity="center"
-                android:textColor="@android:color/black"
+                android:textColor="?attr/colorOnSurface"
                 android:textSize="@dimen/default_text_size_medium"
                 tools:text="No backups found on this account" />
 

FlowCrypt/src/main/res/layout/fragment_check_passphrase_strength.xml

@@ -24,7 +24,7 @@
         android:layout_weight="1"
         android:gravity="center"
         android:text="@string/see_choosing_secure_pass_phrases"
-        android:textColor="@android:color/black"
+        android:textColor="?attr/colorOnSurface"
         app:layout_constraintBottom_toBottomOf="@+id/iBShowPasswordHint"
         app:layout_constraintEnd_toStartOf="@+id/iBShowPasswordHint"
         app:layout_constraintHorizontal_bias="0.5"

FlowCrypt/src/main/res/layout/fragment_create_private_key_first.xml

@@ -38,7 +38,7 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:text="@string/see_choosing_secure_pass_phrases"
-                android:textColor="@android:color/black" />
+                android:textColor="?attr/colorOnSurface" />
 
             <ImageButton
                 android:id="@+id/imageButtonShowPasswordHint"

FlowCrypt/src/main/res/layout/fragment_create_private_key_second.xml

@@ -29,7 +29,7 @@
             android:layout_weight="1"
             android:gravity="center"
             android:text="@string/repeat_passphrase_hint"
-            android:textColor="@android:color/black"
+            android:textColor="?attr/colorOnSurface"
             app:layout_constraintEnd_toStartOf="@+id/guidelineRightSecond"
             app:layout_constraintStart_toStartOf="@+id/guidelineLeftSecond"
             app:layout_constraintTop_toBottomOf="@+id/textViewSecondPasswordCheckTitle" />