From deeee2552648973a5619a2c1e106fbd5588bc6f6 Mon Sep 17 00:00:00 2001
From: Roman Romanov <rromanov@65gb.net>
Date: Wed, 9 Nov 2016 15:53:11 +0400
Subject: [PATCH 1/2] [android] Background color fix.

---
 android/res/layout/downloader_item_header.xml     |  2 +-
 android/res/layout/fragment_downloader.xml        |  2 +-
 android/res/layout/fragment_migrate.xml           |  2 +-
 android/res/values/themes.xml                     | 13 ++++++++++++-
 .../bookmarks/BookmarkCategoriesActivity.java     | 15 +++++++++++++++
 .../maps/bookmarks/BookmarkListActivity.java      | 15 +++++++++++++++
 .../mapswithme/maps/search/SearchActivity.java    | 14 ++++++++++++++
 7 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/android/res/layout/downloader_item_header.xml b/android/res/layout/downloader_item_header.xml
index fb262137a7..06d5bb6f7c 100644
--- a/android/res/layout/downloader_item_header.xml
+++ b/android/res/layout/downloader_item_header.xml
@@ -13,7 +13,7 @@
     android:paddingTop="@dimen/margin_half"
     android:paddingBottom="@dimen/margin_half"
     android:layout_marginRight="@dimen/margin_base"
-    android:background="?panel"
+    android:background="?cardBackground"
     android:textAppearance="@style/MwmTextAppearance.Caption"
     tools:text="Downloaded"
     tools:background="#80FF0000"/>
diff --git a/android/res/layout/fragment_downloader.xml b/android/res/layout/fragment_downloader.xml
index dcc99104ca..47a3e3f0ac 100644
--- a/android/res/layout/fragment_downloader.xml
+++ b/android/res/layout/fragment_downloader.xml
@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   style="@style/MwmWidget.Floating"
-  android:background="?windowBackgroundForced"
+  android:background="?cardBackground"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
   <include layout="@layout/toolbar_with_search"/>
diff --git a/android/res/layout/fragment_migrate.xml b/android/res/layout/fragment_migrate.xml
index dbcafbac08..b93dec1197 100644
--- a/android/res/layout/fragment_migrate.xml
+++ b/android/res/layout/fragment_migrate.xml
@@ -6,7 +6,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:animateLayoutChanges="true"
-  android:background="?windowBackgroundForced">
+  android:background="?cardBackground">
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/android/res/values/themes.xml b/android/res/values/themes.xml
index 25c60b246b..39cfcd2313 100644
--- a/android/res/values/themes.xml
+++ b/android/res/values/themes.xml
@@ -15,10 +15,21 @@
     <item name="android:windowBackground">@null</item>
   </style>
 
-  <style name="MwmTheme.Settings"/>
+  <style name="MwmTheme.Settings">
+    <item name="android:windowBackground">@color/bg_cards</item>
+  </style>
 
   <style name="MwmTheme.Night.Settings">
     <item name="colorSwitchThumbNormal">?android:colorControlNormal</item>
+    <item name="android:windowBackground">@color/bg_cards_night</item>
+  </style>
+
+  <style name="MwmTheme.CardBg">
+    <item name="android:windowBackground">@color/bg_cards</item>
+  </style>
+
+  <style name="MwmTheme.Night.CardBg">
+    <item name="android:windowBackground">@color/bg_cards_night</item>
   </style>
 
   <style name="MwmTheme.DialogFragment" parent="android:Theme.Holo.Light.Dialog.NoActionBar">
diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesActivity.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesActivity.java
index 7350df3867..0856dad145 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesActivity.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesActivity.java
@@ -1,10 +1,25 @@
 package com.mapswithme.maps.bookmarks;
 
 import android.support.v4.app.Fragment;
+
+import com.mapswithme.maps.R;
 import com.mapswithme.maps.base.BaseToolbarActivity;
+import com.mapswithme.util.ThemeUtils;
 
 public class BookmarkCategoriesActivity extends BaseToolbarActivity
 {
+  @Override
+  public int getThemeResourceId(String theme)
+  {
+    if (ThemeUtils.isDefaultTheme(theme))
+      return R.style.MwmTheme_CardBg;
+
+    if (ThemeUtils.isNightTheme(theme))
+      return R.style.MwmTheme_Night_CardBg;
+
+    throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);
+  }
+
   @Override
   protected Class<? extends Fragment> getFragmentClass()
   {
diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkListActivity.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkListActivity.java
index 67595da0c0..d32b24757b 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarkListActivity.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkListActivity.java
@@ -1,10 +1,25 @@
 package com.mapswithme.maps.bookmarks;
 
 import android.support.v4.app.Fragment;
+
+import com.mapswithme.maps.R;
 import com.mapswithme.maps.base.BaseToolbarActivity;
+import com.mapswithme.util.ThemeUtils;
 
 public class BookmarkListActivity extends BaseToolbarActivity
 {
+  @Override
+  public int getThemeResourceId(String theme)
+  {
+    if (ThemeUtils.isDefaultTheme(theme))
+      return R.style.MwmTheme_CardBg;
+
+    if (ThemeUtils.isNightTheme(theme))
+      return R.style.MwmTheme_Night_CardBg;
+
+    throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);
+  }
+
   @Override
   protected Class<? extends Fragment> getFragmentClass()
   {
diff --git a/android/src/com/mapswithme/maps/search/SearchActivity.java b/android/src/com/mapswithme/maps/search/SearchActivity.java
index 083da2cab1..3f85836055 100644
--- a/android/src/com/mapswithme/maps/search/SearchActivity.java
+++ b/android/src/com/mapswithme/maps/search/SearchActivity.java
@@ -6,9 +6,11 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.NavUtils;
 
+import com.mapswithme.maps.R;
 import com.mapswithme.maps.activity.CustomNavigateUpListener;
 import com.mapswithme.maps.base.BaseMwmFragmentActivity;
 import com.mapswithme.maps.base.OnBackPressListener;
+import com.mapswithme.util.ThemeUtils;
 
 public class SearchActivity extends BaseMwmFragmentActivity implements CustomNavigateUpListener
 {
@@ -21,6 +23,18 @@ public class SearchActivity extends BaseMwmFragmentActivity implements CustomNav
     context.startActivity(i);
   }
 
+  @Override
+  public int getThemeResourceId(String theme)
+  {
+    if (ThemeUtils.isDefaultTheme(theme))
+      return R.style.MwmTheme_CardBg;
+
+    if (ThemeUtils.isNightTheme(theme))
+      return R.style.MwmTheme_Night_CardBg;
+
+    throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);
+  }
+
   @Override
   protected Class<? extends Fragment> getFragmentClass()
   {

From 44121ab3f33fea0bf4093291055593b5b4c22437 Mon Sep 17 00:00:00 2001
From: Roman Romanov <rromanov@65gb.net>
Date: Thu, 10 Nov 2016 08:54:50 +0400
Subject: [PATCH 2/2] [android] Review fixes.

---
 android/src/com/mapswithme/maps/MwmActivity.java   |  4 +++-
 .../src/com/mapswithme/maps/base/BaseActivity.java |  5 ++++-
 .../maps/base/BaseMwmFragmentActivity.java         |  4 +++-
 .../maps/bookmarks/BookmarkCategoriesActivity.java | 14 +++++---------
 .../maps/bookmarks/BookmarkListActivity.java       | 14 +++++---------
 .../maps/gallery/FullScreenGalleryActivity.java    |  4 +++-
 .../com/mapswithme/maps/search/SearchActivity.java | 14 +++++---------
 .../mapswithme/maps/settings/SettingsActivity.java |  4 +++-
 android/src/com/mapswithme/util/ThemeUtils.java    | 13 +++++++++++++
 9 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index ba9e27517b..768787edfc 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -10,6 +10,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.StyleRes;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
@@ -381,7 +382,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
   }
 
   @Override
-  public int getThemeResourceId(String theme)
+  @StyleRes
+  public int getThemeResourceId(@NonNull String theme)
   {
     if (ThemeUtils.isDefaultTheme(theme))
       return R.style.MwmTheme_MainActivity;
diff --git a/android/src/com/mapswithme/maps/base/BaseActivity.java b/android/src/com/mapswithme/maps/base/BaseActivity.java
index 0c5b56c5ee..408bd59155 100644
--- a/android/src/com/mapswithme/maps/base/BaseActivity.java
+++ b/android/src/com/mapswithme/maps/base/BaseActivity.java
@@ -1,9 +1,12 @@
 package com.mapswithme.maps.base;
 
 import android.app.Activity;
+import android.support.annotation.NonNull;
+import android.support.annotation.StyleRes;
 
 public interface BaseActivity
 {
   Activity get();
-  int getThemeResourceId(String theme);
+  @StyleRes
+  int getThemeResourceId(@NonNull String theme);
 }
diff --git a/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java b/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java
index f1f6ef3f3e..27aa6e136b 100644
--- a/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java
+++ b/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java
@@ -6,6 +6,7 @@ import android.media.AudioManager;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.StyleRes;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
@@ -31,7 +32,8 @@ public class BaseMwmFragmentActivity extends AppCompatActivity
   }
 
   @Override
-  public int getThemeResourceId(String theme)
+  @StyleRes
+  public int getThemeResourceId(@NonNull String theme)
   {
     if (ThemeUtils.isDefaultTheme(theme))
         return R.style.MwmTheme;
diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesActivity.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesActivity.java
index 0856dad145..12074b1f86 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesActivity.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesActivity.java
@@ -1,23 +1,19 @@
 package com.mapswithme.maps.bookmarks;
 
+import android.support.annotation.NonNull;
+import android.support.annotation.StyleRes;
 import android.support.v4.app.Fragment;
 
-import com.mapswithme.maps.R;
 import com.mapswithme.maps.base.BaseToolbarActivity;
 import com.mapswithme.util.ThemeUtils;
 
 public class BookmarkCategoriesActivity extends BaseToolbarActivity
 {
   @Override
-  public int getThemeResourceId(String theme)
+  @StyleRes
+  public int getThemeResourceId(@NonNull String theme)
   {
-    if (ThemeUtils.isDefaultTheme(theme))
-      return R.style.MwmTheme_CardBg;
-
-    if (ThemeUtils.isNightTheme(theme))
-      return R.style.MwmTheme_Night_CardBg;
-
-    throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);
+    return ThemeUtils.getCardBgThemeResourceId(theme);
   }
 
   @Override
diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkListActivity.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkListActivity.java
index d32b24757b..63d975c904 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarkListActivity.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkListActivity.java
@@ -1,23 +1,19 @@
 package com.mapswithme.maps.bookmarks;
 
+import android.support.annotation.NonNull;
+import android.support.annotation.StyleRes;
 import android.support.v4.app.Fragment;
 
-import com.mapswithme.maps.R;
 import com.mapswithme.maps.base.BaseToolbarActivity;
 import com.mapswithme.util.ThemeUtils;
 
 public class BookmarkListActivity extends BaseToolbarActivity
 {
   @Override
-  public int getThemeResourceId(String theme)
+  @StyleRes
+  public int getThemeResourceId(@NonNull String theme)
   {
-    if (ThemeUtils.isDefaultTheme(theme))
-      return R.style.MwmTheme_CardBg;
-
-    if (ThemeUtils.isNightTheme(theme))
-      return R.style.MwmTheme_Night_CardBg;
-
-    throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);
+    return ThemeUtils.getCardBgThemeResourceId(theme);
   }
 
   @Override
diff --git a/android/src/com/mapswithme/maps/gallery/FullScreenGalleryActivity.java b/android/src/com/mapswithme/maps/gallery/FullScreenGalleryActivity.java
index 96c2d13620..0bc2c16cba 100644
--- a/android/src/com/mapswithme/maps/gallery/FullScreenGalleryActivity.java
+++ b/android/src/com/mapswithme/maps/gallery/FullScreenGalleryActivity.java
@@ -6,6 +6,7 @@ import android.graphics.Bitmap;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
+import android.support.annotation.StyleRes;
 import android.support.v4.graphics.drawable.RoundedBitmapDrawable;
 import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory;
 import android.support.v4.view.ViewPager;
@@ -95,7 +96,8 @@ public class FullScreenGalleryActivity extends BaseMwmFragmentActivity
   }
 
   @Override
-  public int getThemeResourceId(String theme)
+  @StyleRes
+  public int getThemeResourceId(@NonNull String theme)
   {
     if (ThemeUtils.isDefaultTheme(theme))
       return R.style.MwmTheme_FullScreenGalleryActivity;
diff --git a/android/src/com/mapswithme/maps/search/SearchActivity.java b/android/src/com/mapswithme/maps/search/SearchActivity.java
index 3f85836055..f915c7f532 100644
--- a/android/src/com/mapswithme/maps/search/SearchActivity.java
+++ b/android/src/com/mapswithme/maps/search/SearchActivity.java
@@ -2,11 +2,12 @@ package com.mapswithme.maps.search;
 
 import android.content.Context;
 import android.content.Intent;
+import android.support.annotation.NonNull;
+import android.support.annotation.StyleRes;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.NavUtils;
 
-import com.mapswithme.maps.R;
 import com.mapswithme.maps.activity.CustomNavigateUpListener;
 import com.mapswithme.maps.base.BaseMwmFragmentActivity;
 import com.mapswithme.maps.base.OnBackPressListener;
@@ -24,15 +25,10 @@ public class SearchActivity extends BaseMwmFragmentActivity implements CustomNav
   }
 
   @Override
-  public int getThemeResourceId(String theme)
+  @StyleRes
+  public int getThemeResourceId(@NonNull String theme)
   {
-    if (ThemeUtils.isDefaultTheme(theme))
-      return R.style.MwmTheme_CardBg;
-
-    if (ThemeUtils.isNightTheme(theme))
-      return R.style.MwmTheme_Night_CardBg;
-
-    throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);
+    return ThemeUtils.getCardBgThemeResourceId(theme);
   }
 
   @Override
diff --git a/android/src/com/mapswithme/maps/settings/SettingsActivity.java b/android/src/com/mapswithme/maps/settings/SettingsActivity.java
index b34d93ad8b..bcd34bcea8 100644
--- a/android/src/com/mapswithme/maps/settings/SettingsActivity.java
+++ b/android/src/com/mapswithme/maps/settings/SettingsActivity.java
@@ -9,6 +9,7 @@ import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.support.annotation.NonNull;
 import android.support.annotation.StringRes;
+import android.support.annotation.StyleRes;
 import android.support.v7.app.AppCompatDelegate;
 import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
@@ -49,7 +50,8 @@ public class SettingsActivity extends PreferenceActivity
   }
 
   @Override
-  public int getThemeResourceId(String theme)
+  @StyleRes
+  public int getThemeResourceId(@NonNull String theme)
   {
     if (ThemeUtils.isDefaultTheme(theme))
       return R.style.MwmTheme_Settings;
diff --git a/android/src/com/mapswithme/util/ThemeUtils.java b/android/src/com/mapswithme/util/ThemeUtils.java
index 412329bda5..135aa57822 100644
--- a/android/src/com/mapswithme/util/ThemeUtils.java
+++ b/android/src/com/mapswithme/util/ThemeUtils.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.support.annotation.AttrRes;
 import android.support.annotation.ColorInt;
+import android.support.annotation.NonNull;
 import android.support.annotation.StyleRes;
 import android.support.v7.internal.view.ContextThemeWrapper;
 import android.util.TypedValue;
@@ -91,4 +92,16 @@ public final class ThemeUtils
     return (THEME_DEFAULT.equals(theme) ||
             THEME_NIGHT.equals(theme));
   }
+
+  @StyleRes
+  public static int getCardBgThemeResourceId(@NonNull String theme)
+  {
+    if (isDefaultTheme(theme))
+      return R.style.MwmTheme_CardBg;
+
+    if (isNightTheme(theme))
+      return R.style.MwmTheme_Night_CardBg;
+
+    throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);
+  }
 }