move the stup of dark theme in Superclass NavigationDrawer

samuelchassot · Nov 16, 2018 · a4a873e · a4a873e
1 parent c1c27cf
commit a4a873e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 32 deletions.
diff --git a/app/src/main/java/ch/epfl/swissteam/services/ChatRoom.java b/app/src/main/java/ch/epfl/swissteam/services/ChatRoom.java
@@ -33,12 +33,6 @@ public class ChatRoom extends NavigationDrawer {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        int darkmode = SettingsDBUtility.retrieveDarkMode(this);
-        if (darkmode == 1){
-            getTheme().applyStyle(R.style.DarkMode, true);
-        } else {
-            getTheme().applyStyle(R.style.AppTheme, true);
-        }
 
         setContentView(R.layout.activity_chat_room);
         super.onCreateDrawer(BACK);

diff --git a/app/src/main/java/ch/epfl/swissteam/services/MainActivity.java b/app/src/main/java/ch/epfl/swissteam/services/MainActivity.java
@@ -31,12 +31,6 @@ public class MainActivity extends NavigationDrawer {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        int darkmode = SettingsDBUtility.retrieveDarkMode(this);
-        if (darkmode == 1){
-            getTheme().applyStyle(R.style.DarkMode, true);
-        } else {
-            getTheme().applyStyle(R.style.AppTheme, true);
-        }
         setContentView(R.layout.activity_main);
         super.onCreateDrawer(MAIN);
 

diff --git a/app/src/main/java/ch/epfl/swissteam/services/MyPostEdit.java b/app/src/main/java/ch/epfl/swissteam/services/MyPostEdit.java
@@ -18,6 +18,7 @@ public class MyPostEdit extends NavigationDrawer{
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
         setContentView(R.layout.activity_my_post_edit);
         super.onCreateDrawer(CANCEL);
 

diff --git a/app/src/main/java/ch/epfl/swissteam/services/NavigationDrawer.java b/app/src/main/java/ch/epfl/swissteam/services/NavigationDrawer.java
@@ -41,6 +41,12 @@ public class NavigationDrawer extends AppCompatActivity implements NavigationVie
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        int darkmode = SettingsDBUtility.retrieveDarkMode(this);
+        if (darkmode == 1){
+            getTheme().applyStyle(R.style.DarkMode, true);
+        } else {
+            getTheme().applyStyle(R.style.AppTheme, true);
+        }
         super.onCreate(savedInstanceState);
     }
 

diff --git a/app/src/main/java/ch/epfl/swissteam/services/PostActivity.java b/app/src/main/java/ch/epfl/swissteam/services/PostActivity.java
@@ -31,13 +31,6 @@ public class PostActivity extends NavigationDrawer{
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        int darkmode = SettingsDBUtility.retrieveDarkMode(this);
-        if (darkmode == 1){
-            getTheme().applyStyle(R.style.DarkMode, true);
-        } else {
-            getTheme().applyStyle(R.style.AppTheme, true);
-        }
-
         setContentView(R.layout.activity_post);
         super.onCreateDrawer(BACK);
 

diff --git a/app/src/main/java/ch/epfl/swissteam/services/ProfileActivity.java b/app/src/main/java/ch/epfl/swissteam/services/ProfileActivity.java
@@ -31,12 +31,6 @@ public class ProfileActivity extends NavigationDrawer {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        int darkmode = SettingsDBUtility.retrieveDarkMode(this);
-        if (darkmode == 1){
-            getTheme().applyStyle(R.style.DarkMode, true);
-        } else {
-            getTheme().applyStyle(R.style.AppTheme, true);
-        }
 
         setContentView(R.layout.activity_profile);
         super.onCreateDrawer(BACK);

diff --git a/app/src/main/java/ch/epfl/swissteam/services/ProfileSettings.java b/app/src/main/java/ch/epfl/swissteam/services/ProfileSettings.java
@@ -36,13 +36,6 @@ public class ProfileSettings extends NavigationDrawer {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        int darkmode = SettingsDBUtility.retrieveDarkMode(this);
-        if (darkmode == 1){
-            getTheme().applyStyle(R.style.DarkMode, true);
-        } else {
-            getTheme().applyStyle(R.style.AppTheme, true);
-        }
-
         setContentView(R.layout.activity_profile_settings);
         super.onCreateDrawer(CANCEL);