Added: Add support for shared day/night theming based on night-mode termux.properties value

agnostic-apollo · agnostic-apollo · commit 397359b913ad · 2025-01-17T02:35:29.000+05:00
Also add a toolbar to the activities for later use.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
         android:allowBackup="false"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@android:style/Theme.Material.Light.DarkActionBar"
+        android:theme="@style/Theme.BaseActivity.DayNight.DarkActionBar"
         tools:ignore="GoogleAppIndexingWarning">
 
         <receiver
@@ -32,7 +32,7 @@
         <activity
             android:name=".activities.TermuxWidgetMainActivity"
             android:exported="true"
-            android:theme="@style/Theme.MaterialComponents.DayNight.TermuxPrimaryActivity">
+            android:theme="@style/Theme.BaseActivity.DayNight.NoActionBar">
         </activity>
 
         <activity-alias
@@ -48,7 +48,8 @@
         <activity
             android:name=".TermuxCreateShortcutActivity"
             android:exported="true"
-            android:label="@string/title_single_shortcut_name">
+            android:label="@string/title_single_shortcut_name"
+            android:theme="@style/Theme.BaseActivity.DayNight.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/app/src/main/java/com/termux/widget/TermuxCreateShortcutActivity.java b/app/src/main/java/com/termux/widget/TermuxCreateShortcutActivity.java
@@ -1,6 +1,5 @@
 package com.termux.widget;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.pm.ShortcutManager;
@@ -11,7 +10,9 @@
 import android.widget.ListView;
 
 import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.AppCompatActivity;
 
+import com.termux.shared.activity.media.AppCompatActivityUtils;
 import com.termux.shared.data.DataUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.termux.TermuxConstants;
@@ -21,7 +22,7 @@
 import java.io.File;
 import java.util.Arrays;
 
-public class TermuxCreateShortcutActivity extends Activity {
+public class TermuxCreateShortcutActivity extends AppCompatActivity {
 
     private ListView mListView;
     private File mCurrentDirectory;
@@ -32,8 +33,10 @@ public class TermuxCreateShortcutActivity extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.shortcuts_listview);
+        setContentView(R.layout.activity_termux_create_shortcut);
         mListView = findViewById(R.id.list);
+
+        AppCompatActivityUtils.setToolbar(this, com.termux.shared.R.id.toolbar);
     }
 
     @Override
@@ -70,7 +73,7 @@ private void updateListview(File directory) {
         Arrays.sort(mCurrentFiles, (f1, f2) -> f1.getName().compareTo(f2.getName()));
 
         final boolean isTopDir = directory.equals(TermuxConstants.TERMUX_SHORTCUT_SCRIPTS_DIR);
-        getActionBar().setDisplayHomeAsUpEnabled(!isTopDir);
+        AppCompatActivityUtils.setShowBackButtonInActionBar(this, !isTopDir);
 
         if (isTopDir && mCurrentFiles.length == 0) {
             // Create if necessary so user can more easily add.
diff --git a/app/src/main/java/com/termux/widget/TermuxWidgetApplication.java b/app/src/main/java/com/termux/widget/TermuxWidgetApplication.java
@@ -6,6 +6,7 @@
 import com.termux.shared.logger.Logger;
 import com.termux.shared.termux.crash.TermuxCrashUtils;
 import com.termux.shared.termux.settings.preferences.TermuxWidgetAppSharedPreferences;
+import com.termux.shared.termux.theme.TermuxThemeUtils;
 
 public class TermuxWidgetApplication extends Application {
 
@@ -19,6 +20,9 @@ public void onCreate() {
         setLogLevel(getApplicationContext(), true);
 
         Logger.logDebug("Starting Application");
+
+        // Set NightMode.APP_NIGHT_MODE
+        TermuxThemeUtils.setAppNightMode(context);
     }
 
     public static void setLogLevel(Context context, boolean commitToFile) {
diff --git a/app/src/main/java/com/termux/widget/activities/TermuxWidgetMainActivity.java b/app/src/main/java/com/termux/widget/activities/TermuxWidgetMainActivity.java
@@ -14,13 +14,15 @@
 import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.termux.shared.activity.media.AppCompatActivityUtils;
 import com.termux.shared.android.PackageUtils;
 import com.termux.shared.errors.Error;
 import com.termux.shared.file.FileUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.file.TermuxFileUtils;
+import com.termux.shared.theme.NightMode;
 import com.termux.widget.R;
 import com.termux.widget.ShortcutFile;
 import com.termux.widget.TermuxWidgetProvider;
@@ -51,6 +53,11 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setContentView(R.layout.activity_termux_widget_main);
 
+        AppCompatActivityUtils.setNightMode(this, NightMode.getAppNightMode().getName(), true);
+
+        AppCompatActivityUtils.setToolbar(this, com.termux.shared.R.id.toolbar);
+        AppCompatActivityUtils.setToolbarTitle(this, com.termux.shared.R.id.toolbar, TermuxConstants.TERMUX_WIDGET_APP_NAME, 0);
+
         TextView pluginInfo = findViewById(R.id.textview_plugin_info);
         pluginInfo.setText(getString(R.string.plugin_info, TermuxConstants.TERMUX_GITHUB_REPO_URL,
                 TermuxConstants.TERMUX_WIDGET_GITHUB_REPO_URL));
diff --git a/app/src/main/res/layout/activity_termux_create_shortcut.xml b/app/src/main/res/layout/activity_termux_create_shortcut.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include
+        layout="@layout/partial_primary_toolbar"
+        android:id="@+id/partial_primary_toolbar"/>
+
+    <ListView
+        android:id="@+id/list"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent">
+    </ListView>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_termux_widget_main.xml b/app/src/main/res/layout/activity_termux_widget_main.xml
diff --git a/app/src/main/res/layout/shortcuts_listview.xml b/app/src/main/res/layout/shortcuts_listview.xml
