Merge pull request #84 from mantas84/change-theme-sample-fix

static theme variable added back
jrvansuita · Apr 26, 2020 · 38aa803 · 38aa803
2 parents 367c193 + 338f9dd
commit 38aa803
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/app/src/main/java/com/vansuita/materialabout/sample/act/ActivitySample.java b/app/src/main/java/com/vansuita/materialabout/sample/act/ActivitySample.java
@@ -15,6 +15,7 @@ public class ActivitySample extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        setTheme(SampleHelper.theme);
         setContentView(R.layout.sample_view);
         SampleHelper.with(this).init().loadAbout();
     }

diff --git a/app/src/main/java/com/vansuita/materialabout/sample/act/FragmentActivitySample.java b/app/src/main/java/com/vansuita/materialabout/sample/act/FragmentActivitySample.java
@@ -20,6 +20,7 @@ public class FragmentActivitySample extends AppCompatActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setTheme(SampleHelper.theme);
         setContentView(new LinearLayout(this));
 
         getSupportFragmentManager()

diff --git a/app/src/main/java/com/vansuita/materialabout/sample/helper/SampleHelper.java b/app/src/main/java/com/vansuita/materialabout/sample/helper/SampleHelper.java
@@ -15,7 +15,7 @@
 public class SampleHelper implements View.OnClickListener {
 
     private Activity activity;
-    private int theme = R.style.AppThemeDark;
+    public static int theme = R.style.AppThemeDark;
 
     private SampleHelper(Activity activity) {
         this.activity = activity;
@@ -26,7 +26,6 @@ public static SampleHelper with(Activity activity) {
     }
 
     public SampleHelper init() {
-        activity.setTheme(theme);
 
         activity.findViewById(R.id.dark).setOnClickListener(this);
         activity.findViewById(R.id.light).setOnClickListener(this);