Fragment requires theme in styles.xml & icon colour moved

daniel-stoneuk · Jun 10, 2017 · 5c7de58 · 5c7de58
1 parent 58a3b13
commit 5c7de58
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 36 deletions.
diff --git a/app/src/main/java/com/danielstone/materialaboutlibrarydemo/ExampleMaterialAboutActivity.java b/app/src/main/java/com/danielstone/materialaboutlibrarydemo/ExampleMaterialAboutActivity.java
@@ -31,7 +31,7 @@ public class ExampleMaterialAboutActivity extends MaterialAboutActivity {
     public static final int THEME_DARK_LIGHTBAR = 2;
     public static final int THEME_DARK_DARKBAR = 3;
 
-    protected int colorIcon = R.color.colorIconLight;
+    protected int colorIcon = R.color.mal_color_icon_light_theme;
 
     @NonNull @Override
     protected MaterialAboutList getMaterialAboutList(@NonNull final Context c) {
@@ -106,19 +106,19 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         switch (getIntent().getIntExtra(THEME_EXTRA, THEME_LIGHT_DARKBAR)) {
             case THEME_LIGHT_LIGHTBAR:
                 setTheme(R.style.AppTheme_MaterialAboutActivity_Light_LightActionBar);
-                colorIcon = R.color.colorIconLight;
+                colorIcon = R.color.mal_color_icon_light_theme;
                 break;
             case THEME_DARK_LIGHTBAR:
                 setTheme(R.style.AppTheme_MaterialAboutActivity_Dark_LightActionBar);
-                colorIcon = R.color.colorIconDark;
+                colorIcon = R.color.mal_color_icon_dark_theme;
                 break;
             case THEME_LIGHT_DARKBAR:
                 setTheme(R.style.AppTheme_MaterialAboutActivity_Light_DarkActionBar);
-                colorIcon = R.color.colorIconLight;
+                colorIcon = R.color.mal_color_icon_light_theme;
                 break;
             case THEME_DARK_DARKBAR:
                 setTheme(R.style.AppTheme_MaterialAboutActivity_Dark_DarkActionBar);
-                colorIcon = R.color.colorIconDark;
+                colorIcon = R.color.mal_color_icon_dark_theme;
                 break;
         }
 

diff --git a/app/src/main/java/com/danielstone/materialaboutlibrarydemo/ExampleMaterialAboutFragment.java b/app/src/main/java/com/danielstone/materialaboutlibrarydemo/ExampleMaterialAboutFragment.java
@@ -13,11 +13,11 @@ public class ExampleMaterialAboutFragment extends MaterialAboutFragment {
 
     @Override
     protected MaterialAboutList getMaterialAboutList(final Context c) {
-        return Demo.createMaterialAboutList(c, R.color.colorIconDark, THEME_LIGHT_DARKBAR);
+        return Demo.createMaterialAboutList(c, R.color.mal_color_icon_dark_theme, THEME_LIGHT_DARKBAR);
     }
 
     @Override
     protected int getTheme() {
-        return THEME_DARK;
+        return R.style.AppTheme_MaterialAboutActivity_Fragment;
     }
 }
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -6,7 +6,4 @@
 
     <color name="colorLightBar">#FFFFFF</color>
     <color name="colorLightStatus">#9E9E9E</color>
-
-    <color name="colorIconLight">#616161</color>
-    <color name="colorIconDark">#E0E0E0</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -20,6 +20,13 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
+    <style name="AppTheme.MaterialAboutActivity.Fragment" parent="Theme.Mal.Dark.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
     <style name="AppTheme.MaterialAboutActivity.Dark.LightActionBar" parent="Theme.Mal.Dark.LightActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorLightBar</item>

diff --git a/library/src/main/java/com/danielstone/materialaboutlibrary/MaterialAboutFragment.java b/library/src/main/java/com/danielstone/materialaboutlibrary/MaterialAboutFragment.java
@@ -3,13 +3,11 @@
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.animation.FastOutSlowInInterpolator;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -19,32 +17,20 @@
 import com.danielstone.materialaboutlibrary.util.DefaultViewTypeManager;
 import com.danielstone.materialaboutlibrary.util.ViewTypeManager;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
 public abstract class MaterialAboutFragment extends Fragment {
 
     private MaterialAboutList list = new MaterialAboutList.Builder().build();
     private RecyclerView recyclerView;
     private MaterialAboutListAdapter adapter;
 
-    @Retention(RetentionPolicy.SOURCE)
-    @IntDef({THEME_LIGHT, THEME_DARK})
-    public @interface FragmentTheme {
-    }
-
-    public static final int THEME_LIGHT = 0;
-    public static final int THEME_DARK = 1;
-
     public static MaterialAboutFragment newInstance(MaterialAboutFragment fragment) {
         return fragment;
     }
 
     protected abstract MaterialAboutList getMaterialAboutList(Context activityContext);
 
-    @FragmentTheme
     protected int getTheme() {
-        return THEME_LIGHT;
+        return R.style.Theme_Mal_Light_DarkActionBar;
     }
 
     protected boolean shouldAnimate() {
@@ -54,17 +40,7 @@ protected boolean shouldAnimate() {
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        int style = -1;
-        switch (getTheme()) {
-            case THEME_LIGHT:
-                Log.i("test", "onCreateView: light theme");
-                style = R.style.Theme_Mal_Light_DarkActionBar;
-                break;
-            case THEME_DARK:
-                Log.i("test", "onCreateView: dark theme");
-                style = R.style.Theme_Mal_Dark_DarkActionBar;
-                break;
-        }
+        int style = getTheme();
 
         // create ContextThemeWrapper from the original Activity Context with the custom theme
         final Context contextThemeWrapper = new android.view.ContextThemeWrapper(getActivity(), style);

diff --git a/library/src/main/res/values/colors.xml b/library/src/main/res/values/colors.xml
@@ -7,4 +7,6 @@
     <color name="mal_text_primary_dark">#FFFFFF</color>
     <color name="mal_text_secondary_dark">#b4ffffff</color>
 
+    <color name="mal_color_icon_light_theme">#616161</color>
+    <color name="mal_color_icon_dark_theme">#E0E0E0</color>
 </resources>