Added 3 options in menu (day/night/auto theme).

Author: jainkuniya

app/src/main/java/com/zulip/android/activities/ZulipActivity.java

@@ -2259,8 +2259,13 @@ public boolean onCreateOptionsMenu(Menu menu) {
             getMenuInflater().inflate(R.menu.options, menu);
             prepareSearchView(menu);
             this.menu = menu;
-            menu.findItem(R.id.autoTheme).setChecked(app.getSettings()
-                    .getBoolean(Constants.AUTO_NIGHT_THEME, false));
+            if (app.getSettings().getBoolean(Constants.AUTO_NIGHT_THEME, false)) {
+                menu.findItem(R.id.autoTheme).setChecked(true);
+            } else if (app.getSettings().getBoolean(Constants.NIGHT_THEME, false)) {
+                menu.findItem(R.id.nightTheme).setChecked(true);
+            } else {
+                menu.findItem(R.id.dayTheme).setChecked(true);
+            }
             return true;
         }
 
@@ -2363,17 +2368,22 @@ public void onClick(
             case R.id.private_msg:
                 drawerLayout.openDrawer(GravityCompat.END);
                 break;
-            case R.id.daynight:
-                switch (AppCompatDelegate.getDefaultNightMode()) {
-                    case -1:
-                    case AppCompatDelegate.MODE_NIGHT_NO:
-                        setNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-                        app.makeNightThemeDefault(true);
-                        break;
-                    default:
-                        setNightMode(AppCompatDelegate.MODE_NIGHT_NO);
-                        app.makeNightThemeDefault(false);
-                        break;
+            case R.id.dayTheme:
+                item.setChecked(!item.isChecked());
+                if (item.isChecked() &&
+                        AppCompatDelegate.getDefaultNightMode() != AppCompatDelegate.MODE_NIGHT_NO) {
+                    setNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                    app.makeNightThemeDefault(false);
+                    app.setAutoNightTheme(false);
+                }
+                break;
+            case R.id.nightTheme:
+                item.setChecked(!item.isChecked());
+                if (item.isChecked() &&
+                        AppCompatDelegate.getDefaultNightMode() != AppCompatDelegate.MODE_NIGHT_YES) {
+                    setNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                    app.makeNightThemeDefault(true);
+                    app.setAutoNightTheme(false);
                 }
                 break;
             case R.id.autoTheme:

app/src/main/res/menu/options.xml

@@ -38,14 +38,19 @@
         android:id="@+id/theme"
         android:title="@string/theme">
         <menu>
-            <item
-                android:id="@+id/daynight"
-                android:title="@string/switch_theme" />
-            <item
-                android:id="@+id/autoTheme"
-                android:checkable="true"
-                android:title="@string/autoTheme"
-                app:actionViewClass="android.widget.CheckBox" />
+            <group
+                android:id="@+id/group"
+                android:checkableBehavior="single">
+                <item
+                    android:id="@+id/dayTheme"
+                    android:title="@string/dayTheme" />
+                <item
+                    android:id="@+id/nightTheme"
+                    android:title="@string/nightTheme" />
+                <item
+                    android:id="@+id/autoTheme"
+                    android:title="@string/autoTheme" />
+            </group>
         </menu>
     </item>
 

app/src/main/res/values/strings.xml

@@ -84,7 +84,6 @@
     <string name="use_https">Use HTTPS</string>
     <string name="use_http">Use HTTP</string>
     <string name="empty_list">Sorry, no messages here.</string>
-    <string name="switch_theme">Switch day/night theme</string>
     <string name="reply_stream">Reply to stream</string>
     <string name="reply_sender">Reply to sender</string>
     <string name="narrow_stream">Narrow to this stream</string>
@@ -175,13 +174,14 @@
     <string name="logout_title">Are you sure you want to logout?</string>
     <string name="autoTheme">Auto Night Theme</string>
     <string name="theme">Theme</string>
-    <string name="terms">Terms of Service</string>
+    <string name="terms">Terms Of Service</string>
+    <string name="nightTheme">Night Theme</string>
+    <string name="dayTheme">Day Theme</string>
     <!--Placeholder strings-->
     <string name="placeholder_my_stream">MyStream</string>
     <string name="placeholder_short_stream">Short stream</string>
     <string name="placeholder_topic">Topic</string>
     <string name="placeholder_message_here">Message here</string>
     <string name="placeholder_sender_name">Sender name</string>
     <string name="placeholder_social">Social</string>
-
 </resources>