🔥 merge pull request termux#4166

Author: john-peterson

app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java

@@ -19,7 +19,6 @@
 import com.termux.R;
 import com.termux.app.TermuxActivity;
 import com.termux.shared.termux.shell.command.runner.terminal.TermuxSession;
-import com.termux.shared.theme.NightMode;
 import com.termux.shared.theme.ThemeUtils;
 import com.termux.terminal.TerminalSession;
 import java.util.List;
@@ -52,7 +51,7 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) {
             sessionTitleView.setText("null session");
             return sessionRowView;
         }
-        boolean shouldEnableDarkTheme = ThemeUtils.shouldEnableDarkTheme(mActivity, NightMode.getAppNightMode().getName());
+        boolean shouldEnableDarkTheme = ThemeUtils.shouldEnableDarkTheme(mActivity);
         String name = sessionAtRow.mSessionName;
         String sessionTitle = sessionAtRow.getTitle();
         String numberPart = "[" + (position + 1) + "] ";

app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java

@@ -25,6 +25,7 @@
 import com.termux.app.TermuxService;
 import com.termux.shared.termux.settings.properties.TermuxPropertyConstants;
 import com.termux.shared.termux.terminal.io.BellHandler;
+import com.termux.shared.theme.ThemeUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.terminal.TerminalColors;
 import com.termux.terminal.TerminalSession;
@@ -293,6 +294,7 @@ public void setCurrentSession(TerminalSession session) {
         if (mActivity.getTerminalView().attachSession(session)) {
             // notify about switched session if not already displaying the session
             notifyOfSessionChange();
+            checkForFontAndColors();
         }
         // We call the following even when the session is already being displayed since config may
         // be stale, like current session not selected or scrolled to.
@@ -497,7 +499,8 @@ public void checkForFontAndColors() {
                     props.load(in);
                 }
             }
-            TerminalColors.COLOR_SCHEME.updateWith(props);
+
+            TerminalColors.COLOR_SCHEME.updateWith(props, !ThemeUtils.shouldEnableDarkTheme(mActivity));
             TerminalSession session = mActivity.getCurrentSession();
             if (session != null && session.getEmulator() != null) {
                 session.getEmulator().mColors.reset();

terminal-emulator/src/main/java/com/termux/terminal/TerminalColorScheme.java

@@ -47,11 +47,32 @@ private void reset() {
         System.arraycopy(DEFAULT_COLORSCHEME, 0, mDefaultColors, 0, TextStyle.NUM_INDEXED_COLORS);
     }
 
-    public void updateWith(Properties props) {
+    void logEx(Exception e) {
+        throw new IllegalArgumentException(e.toString()+e.getMessage());
+    }
+
+    public void updateWith(Properties props, boolean isDay) {
         reset();
         boolean cursorPropExists = false;
         for (Map.Entry<Object, Object> entries : props.entrySet()) {
             String key = (String) entries.getKey();
+
+            try {
+                if (key.contains(".")) {
+                    String[] parts = key.split("\\.");
+                    String prefix = parts[0];
+                    boolean useDay = isDay && prefix.equals("day");
+                    boolean useNight = !isDay && prefix.equals("night");
+
+                    if (useDay || useNight)
+                        key = parts[1];
+                    else
+                        continue;
+                }
+            } catch (Exception e) {
+                logEx(e);
+            }
+
             String value = (String) entries.getValue();
             int colorIndex;
             if (key.equals("foreground")) {

termux-shared/src/main/java/com/termux/shared/theme/ThemeUtils.java

@@ -30,7 +30,8 @@ public static boolean isNightModeEnabled(Context context) {
      * Will return true if mode is set to {@link NightMode#TRUE}, otherwise will return true if
      * mode is set to {@link NightMode#SYSTEM} and night mode is enabled by system.
      */
-    public static boolean shouldEnableDarkTheme(Context context, String name) {
+    public static boolean shouldEnableDarkTheme(Context context) {
+        String name = NightMode.getAppNightMode().getName();
         if (NightMode.TRUE.getName().equals(name))
             return true;
         else if (NightMode.FALSE.getName().equals(name))