Add dark theme fixes (#308)

vase4kin · Apr 1, 2020 · de9b540 · de9b540
1 parent 50f61f5
commit de9b540
Show file tree

Hide file tree

Showing 24 changed files with 94 additions and 40 deletions.
diff --git a/app/src/main/java/com/github/vase4kin/teamcityapp/app_navigation/BottomNavigationView.kt b/app/src/main/java/com/github/vase4kin/teamcityapp/app_navigation/BottomNavigationView.kt
@@ -25,6 +25,7 @@ import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem
 import com.github.vase4kin.teamcityapp.R
 import com.github.vase4kin.teamcityapp.home.view.HomeActivity
 import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.elevation.ElevationOverlayProvider
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import teamcityapp.libraries.utils.getThemeColor
 
@@ -99,8 +100,13 @@ class BottomNavigationViewImpl(
             bottomNavigation.addItem(bottomNavItem)
         }
 
+        val elevation =
+            activity.resources.getDimension(R.dimen.elevation_bottom_navigation)
+        val backgroundColor = ElevationOverlayProvider(activity).compositeOverlayIfNeeded(
+            activity.getThemeColor(R.attr.colorPrimarySurface), elevation
+        )
         // Set bottom nav settings
-        bottomNavigation.defaultBackgroundColor = activity.getThemeColor(R.attr.colorPrimarySurface)
+        bottomNavigation.defaultBackgroundColor = backgroundColor
         bottomNavigation.accentColor =
             activity.getThemeColor(R.attr.colorOnPrimary)
         bottomNavigation.inactiveColor =

diff --git a/app/src/main/java/com/github/vase4kin/teamcityapp/buildlist/view/BuildListViewImpl.kt b/app/src/main/java/com/github/vase4kin/teamcityapp/buildlist/view/BuildListViewImpl.kt
@@ -37,6 +37,7 @@ import com.github.vase4kin.teamcityapp.base.list.view.SimpleSectionedRecyclerVie
 import com.github.vase4kin.teamcityapp.buildlist.data.BuildListDataModel
 import com.github.vase4kin.teamcityapp.buildlist.data.OnBuildListPresenterListener
 import com.github.vase4kin.teamcityapp.onboarding.OnboardingManager
+import com.google.android.material.elevation.ElevationOverlayProvider
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
 import com.google.android.material.snackbar.Snackbar
 import com.mugen.Mugen
@@ -279,7 +280,7 @@ open class BuildListViewImpl(
      * {@inheritDoc}
      */
     override fun showFilterBuildsPrompt(listener: OnboardingManager.OnPromptShownListener) {
-        val color = activity.getThemeColor(R.attr.colorPrimarySurface)
+        val color = getBackgroundColor()
         MaterialTapTargetPrompt.Builder(activity)
             .setTarget(R.id.filter_builds)
             .setPrimaryText(R.string.title_onboarding_filter_builds)
@@ -301,7 +302,7 @@ open class BuildListViewImpl(
      * {@inheritDoc}
      */
     override fun showRunBuildPrompt(listener: OnboardingManager.OnPromptShownListener) {
-        val color = activity.getThemeColor(R.attr.colorPrimarySurface)
+        val color = getBackgroundColor()
         MaterialTapTargetPrompt.Builder(activity)
             .setTarget(floatingActionButton)
             .setPrimaryText(R.string.title_onboarding_run_build)
@@ -327,7 +328,7 @@ open class BuildListViewImpl(
      * {@inheritDoc}
      */
     override fun showFavPrompt(listener: OnboardingManager.OnPromptShownListener) {
-        val color = activity.getThemeColor(R.attr.colorPrimarySurface)
+        val color = getBackgroundColor()
         MaterialTapTargetPrompt.Builder(activity)
             .setTarget(R.id.add_to_favorites)
             .setPrimaryText(R.string.title_onboarding_add_fav)
@@ -387,6 +388,14 @@ open class BuildListViewImpl(
         }
     }
 
+    private fun getBackgroundColor(): Int {
+        val elevation =
+            activity.resources.getDimension(R.dimen.default_elevation)
+        return ElevationOverlayProvider(activity).compositeOverlayIfNeeded(
+            activity.getThemeColor(R.attr.colorPrimarySurface), elevation
+        )
+    }
+
     /**
      * Init sectionAdapter
      *

diff --git a/app/src/main/java/com/github/vase4kin/teamcityapp/home/view/HomeViewImpl.kt b/app/src/main/java/com/github/vase4kin/teamcityapp/home/view/HomeViewImpl.kt
@@ -27,6 +27,7 @@ import com.github.vase4kin.teamcityapp.R
 import com.github.vase4kin.teamcityapp.filter_bottom_sheet_dialog.filter.Filter
 import com.github.vase4kin.teamcityapp.filter_bottom_sheet_dialog.view.FilterBottomSheetDialogFragment
 import com.github.vase4kin.teamcityapp.onboarding.OnboardingManager
+import com.google.android.material.elevation.ElevationOverlayProvider
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.snackbar.Snackbar
 import teamcityapp.features.drawer.view.DrawerBottomSheetDialogFragment
@@ -132,7 +133,7 @@ class HomeViewImpl(private val activity: AppCompatActivity) : HomeView {
      */
     override fun showNavigationDrawerPrompt(listener: OnboardingManager.OnPromptShownListener) {
         // Creating prompt
-        val color = activity.getThemeColor(R.attr.colorPrimarySurface)
+        val color = getBackgroundColor()
         val navigationDrawerPrompt = MaterialTapTargetPrompt.Builder(activity)
             .setPrimaryText(R.string.title_onboarding_navigation_drawer)
             .setSecondaryText(R.string.text_onboarding_navigation_drawer)
@@ -153,7 +154,7 @@ class HomeViewImpl(private val activity: AppCompatActivity) : HomeView {
      * {@inheritDoc}
      */
     override fun showAddFavPrompt(listener: OnboardingManager.OnPromptShownListener) {
-        val color = activity.getThemeColor(R.attr.colorPrimarySurface)
+        val color = getBackgroundColor()
         MaterialTapTargetPrompt.Builder(activity)
             .setTarget(fab)
             .setPrimaryText(R.string.title_onboarding_add_fav)
@@ -172,7 +173,7 @@ class HomeViewImpl(private val activity: AppCompatActivity) : HomeView {
      * {@inheritDoc}
      */
     override fun showRunningBuildsFilterPrompt(listener: OnboardingManager.OnPromptShownListener) {
-        val color = activity.getThemeColor(R.attr.colorPrimarySurface)
+        val color = getBackgroundColor()
         MaterialTapTargetPrompt.Builder(activity)
             .setTarget(fab)
             .setPrimaryText(R.string.title_onboarding_filter)
@@ -191,7 +192,7 @@ class HomeViewImpl(private val activity: AppCompatActivity) : HomeView {
      * {@inheritDoc}
      */
     override fun showBuildsQueueFilterPrompt(onPromptShown: () -> Unit) {
-        val color = activity.getThemeColor(R.attr.colorPrimarySurface)
+        val color = getBackgroundColor()
         MaterialTapTargetPrompt.Builder(activity)
             .setTarget(fab)
             .setPrimaryText(R.string.title_onboarding_filter_queued)
@@ -210,7 +211,7 @@ class HomeViewImpl(private val activity: AppCompatActivity) : HomeView {
      * {@inheritDoc}
      */
     override fun showAgentsFilterPrompt(onPromptShown: () -> Unit) {
-        val color = activity.getThemeColor(R.attr.colorPrimarySurface)
+        val color = getBackgroundColor()
         MaterialTapTargetPrompt.Builder(activity)
             .setTarget(fab)
             .setPrimaryText(R.string.title_onboarding_filter_agents)
@@ -225,6 +226,14 @@ class HomeViewImpl(private val activity: AppCompatActivity) : HomeView {
             }.show()
     }
 
+    private fun getBackgroundColor(): Int {
+        val elevation =
+            activity.resources.getDimension(R.dimen.default_elevation)
+        return ElevationOverlayProvider(activity).compositeOverlayIfNeeded(
+            activity.getThemeColor(R.attr.colorPrimarySurface), elevation
+        )
+    }
+
     /**
      * {@inheritDoc}
      */

diff --git a/app/src/main/java/com/github/vase4kin/teamcityapp/overview/view/OverviewViewImpl.kt b/app/src/main/java/com/github/vase4kin/teamcityapp/overview/view/OverviewViewImpl.kt
@@ -44,6 +44,7 @@ import com.github.vase4kin.teamcityapp.bottomsheet_dialog.view.BottomSheetDialog
 import com.github.vase4kin.teamcityapp.navigation.api.BuildElement
 import com.github.vase4kin.teamcityapp.onboarding.OnboardingManager
 import com.github.vase4kin.teamcityapp.overview.data.OverviewDataModelImpl
+import com.google.android.material.elevation.ElevationOverlayProvider
 import io.supercharge.shimmerlayout.ShimmerLayout
 import teamcityapp.libraries.utils.getThemeColor
 import tr.xip.errorview.ErrorView
@@ -437,7 +438,7 @@ class OverviewViewImpl(
     ) {
         // Creating prompt
         val toolbar = activity.findViewById<Toolbar>(R.id.toolbar)
-        val color = activity.getThemeColor(R.attr.colorPrimarySurface)
+        val color = getBackgroundColor()
         val promptBuilder = MaterialTapTargetPrompt.Builder(activity)
             .setPrimaryText(R.string.title_onboarding_build_menu)
             .setSecondaryText(secondaryText)
@@ -456,4 +457,12 @@ class OverviewViewImpl(
             promptBuilder.show()
         }, TIMEOUT_PROMPT.toLong())
     }
+
+    private fun getBackgroundColor(): Int {
+        val elevation =
+            activity.resources.getDimension(R.dimen.default_elevation)
+        return ElevationOverlayProvider(activity).compositeOverlayIfNeeded(
+            activity.getThemeColor(R.attr.colorPrimarySurface), elevation
+        )
+    }
 }
diff --git a/app/src/main/res/layout/activity_artifact_list.xml b/app/src/main/res/layout/activity_artifact_list.xml
@@ -25,7 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"

diff --git a/app/src/main/res/layout/activity_build.xml b/app/src/main/res/layout/activity_build.xml
@@ -23,15 +23,13 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/container"
-        style="@style/Widget.MaterialComponents.AppBarLayout.PrimarySurface"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:elevation="0dp"
             app:layout_scrollFlags="scroll|enterAlways|snap" />
 
         <com.google.android.material.tabs.TabLayout

diff --git a/app/src/main/res/layout/activity_build_list.xml b/app/src/main/res/layout/activity_build_list.xml
@@ -26,7 +26,7 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"

diff --git a/app/src/main/res/layout/activity_create_account.xml b/app/src/main/res/layout/activity_create_account.xml
@@ -25,7 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
@@ -38,7 +38,7 @@
         android:layout_height="wrap_content">
 
         <LinearLayout
-            style="@style/ElevatedView"
+            style="@style/SurfaceView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">

diff --git a/app/src/main/res/layout/activity_filter_builds.xml b/app/src/main/res/layout/activity_filter_builds.xml
@@ -26,7 +26,7 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
@@ -50,7 +50,7 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <FrameLayout
-            style="@style/ElevatedView"
+            style="@style/SurfaceView"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 

diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
@@ -25,7 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
@@ -40,7 +40,7 @@
                 android:textColor="?attr/colorOnPrimarySurface"
                 tools:text="@string/home_drawer_item" />
 
-        </androidx.appcompat.widget.Toolbar>
+        </com.google.android.material.appbar.MaterialToolbar>
 
     </com.google.android.material.appbar.AppBarLayout>
 

diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
@@ -17,7 +17,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    style="@style/ElevatedView"
+    style="@style/SurfaceView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true">

diff --git a/app/src/main/res/layout/activity_navigation_list.xml b/app/src/main/res/layout/activity_navigation_list.xml
@@ -26,7 +26,7 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"

diff --git a/app/src/main/res/layout/activity_run_build.xml b/app/src/main/res/layout/activity_run_build.xml
@@ -26,7 +26,7 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize" />
@@ -49,7 +49,7 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <FrameLayout
-            style="@style/ElevatedView"
+            style="@style/SurfaceView"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 

diff --git a/app/src/main/res/layout/layout_skeleton_agent_item.xml b/app/src/main/res/layout/layout_skeleton_agent_item.xml
@@ -16,7 +16,7 @@
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="@style/ElevatedView"
+    style="@style/SurfaceView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 

diff --git a/app/src/main/res/layout/layout_skeleton_build_list_item.xml b/app/src/main/res/layout/layout_skeleton_build_list_item.xml
@@ -16,7 +16,7 @@
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="@style/ElevatedView"
+    style="@style/SurfaceView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 

diff --git a/app/src/main/res/layout/layout_skeleton_change_list_item.xml b/app/src/main/res/layout/layout_skeleton_change_list_item.xml
@@ -16,7 +16,7 @@
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="@style/ElevatedView"
+    style="@style/SurfaceView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 

diff --git a/app/src/main/res/layout/layout_skeleton_navigation_item.xml b/app/src/main/res/layout/layout_skeleton_navigation_item.xml
@@ -16,7 +16,7 @@
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="@style/ElevatedView"
+    style="@style/SurfaceView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 

diff --git a/features/about/feature/src/main/java/teamcityapp/features/about/AboutFragment.kt b/features/about/feature/src/main/java/teamcityapp/features/about/AboutFragment.kt
@@ -27,6 +27,7 @@ import com.danielstone.materialaboutlibrary.items.MaterialAboutActionItem
 import com.danielstone.materialaboutlibrary.model.MaterialAboutCard
 import com.danielstone.materialaboutlibrary.model.MaterialAboutList
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
+import com.google.android.material.elevation.ElevationOverlayProvider
 import dagger.android.support.AndroidSupportInjection
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
@@ -35,6 +36,7 @@ import io.reactivex.rxkotlin.subscribeBy
 import io.reactivex.schedulers.Schedulers
 import teamcityapp.features.about.repository.AboutRepository
 import teamcityapp.libraries.chrome_tabs.ChromeCustomTabs
+import teamcityapp.libraries.utils.getThemeColor
 import teamcityapp.libraries.utils.getTintedDrawable
 import javax.inject.Inject
 
@@ -102,6 +104,7 @@ class AboutFragment : MaterialAboutFragment() {
     ): MaterialAboutCard {
         val serverInfo = MaterialAboutCard.Builder()
         serverInfo.title(R.string.about_app_text_server_info)
+        serverInfo.cardColor(getBackgroundColor(requireActivity()))
         serverInfo.addItem(
             MaterialAboutActionItem.Builder()
                 .text(getString(R.string.about_version))
@@ -138,6 +141,7 @@ class AboutFragment : MaterialAboutFragment() {
     ): MaterialAboutList {
         val appCardBuilder = MaterialAboutCard.Builder()
         appCardBuilder.title(R.string.about_app_text_app)
+            .cardColor(getBackgroundColor(requireActivity()))
         appCardBuilder.addItem(
             MaterialAboutActionItem.Builder()
                 .text(getString(R.string.about_version))
@@ -181,6 +185,7 @@ class AboutFragment : MaterialAboutFragment() {
 
         val miscCardBuilder = MaterialAboutCard.Builder()
         miscCardBuilder.title(R.string.about_app_text_dev)
+            .cardColor(getBackgroundColor(requireActivity()))
         miscCardBuilder
             .addItem(MaterialAboutActionItem.Builder()
                 .text(R.string.about_app_text_source_code)
@@ -218,6 +223,7 @@ class AboutFragment : MaterialAboutFragment() {
 
         val authorCardBuilder = MaterialAboutCard.Builder()
         authorCardBuilder.title(R.string.about_app_text_contacts)
+            .cardColor(getBackgroundColor(requireActivity()))
         authorCardBuilder.addItem(MaterialAboutActionItem.Builder()
             .text(R.string.about_app_text_web)
             .subText(R.string.about_app_url_web)
@@ -277,6 +283,14 @@ class AboutFragment : MaterialAboutFragment() {
         }
     }
 
+    private fun getBackgroundColor(activity: Activity): Int {
+        val elevation =
+            activity.resources.getDimension(R.dimen.default_elevation)
+        return ElevationOverlayProvider(activity).compositeOverlayIfNeeded(
+            activity.getThemeColor(R.attr.colorSurface), elevation
+        )
+    }
+
     private fun openUrl(url: String) {
         chromeCustomTabs.launchUrl(url)
     }