Skip to content

Fixed: Improve dark mode support for settings and shared activities #5025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
salmon-21 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed: Improve dark mode support for settings and shared activities #5025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions termux-shared/src/main/java/com/termux/shared/activities/TextIOActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;

import com.termux.shared.activity.media.AppCompatActivityUtils;
import com.termux.shared.interact.ShareUtils;
import com.termux.shared.logger.Logger;
import com.termux.shared.R;
import com.termux.shared.theme.NightMode;
import com.termux.shared.models.TextIOInfo;
import com.termux.shared.view.KeyboardUtils;

Expand Down Expand Up @@ -63,6 +65,8 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Logger.logVerbose(LOG_TAG, "onCreate");

AppCompatActivityUtils.setNightMode(this, NightMode.getAppNightMode().getName(), true);

setContentView(R.layout.activity_text_io);

mTextIOLabel = findViewById(R.id.text_io_label);
Expand Down
13 changes: 9 additions & 4 deletions termux-shared/src/main/java/com/termux/shared/interact/MessageDialogUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.graphics.Color;
import android.content.res.TypedArray;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.Button;
Expand Down Expand Up @@ -51,7 +51,7 @@ public static void showMessage(Context context, String titleText, String message
final DialogInterface.OnClickListener onNegativeButton,
final DialogInterface.OnDismissListener onDismiss) {

AlertDialog.Builder builder = new AlertDialog.Builder(context, androidx.appcompat.R.style.Theme_AppCompat_Light_Dialog);
AlertDialog.Builder builder = new AlertDialog.Builder(context, androidx.appcompat.R.style.Theme_AppCompat_DayNight_Dialog);

LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
View view = inflater.inflate(R.layout.dialog_show_message, null);
Expand Down Expand Up @@ -81,12 +81,17 @@ public static void showMessage(Context context, String titleText, String message

dialog.setOnShowListener(dialogInterface -> {
Logger.logError("dialog");
int[] attrs = new int[] { android.R.attr.textColorPrimary };
TypedArray ta = context.obtainStyledAttributes(attrs);
int textColor = ta.getColor(0, 0xFF000000);
ta.recycle();

Button button = dialog.getButton(AlertDialog.BUTTON_POSITIVE);
if (button != null)
button.setTextColor(Color.BLACK);
button.setTextColor(textColor);
button = dialog.getButton(AlertDialog.BUTTON_NEGATIVE);
if (button != null)
button.setTextColor(Color.BLACK);
button.setTextColor(textColor);
});

dialog.show();
Expand Down
6 changes: 3 additions & 3 deletions termux-shared/src/main/res/layout/dialog_show_message.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@android:color/white"/>
android:textColor="?android:attr/textColorPrimaryInverse"/>
</LinearLayout>

<ScrollView
Expand All @@ -37,8 +37,8 @@
android:layout_height="wrap_content"
android:autoLink="web|email"
android:textSize="14sp"
android:textColor="@android:color/tab_indicator_text"
android:textColorLink="@android:color/black"/>
android:textColor="?android:attr/textColorPrimary"
android:textColorLink="?android:attr/textColorLink"/>
</LinearLayout>
</ScrollView>

Expand Down
8 changes: 4 additions & 4 deletions termux-shared/src/main/res/layout/partial_primary_toolbar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<com.google.android.material.appbar.AppBarLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/toolbar_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:layout_height="wrap_content">

<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
Expand All @@ -19,4 +19,4 @@
app:subtitleTextAppearance="@style/TextAppearance.Widget.BaseToolbar.Subtitle">
</androidx.appcompat.widget.Toolbar>

</LinearLayout>
</com.google.android.material.appbar.AppBarLayout>
5 changes: 5 additions & 0 deletions termux-shared/src/main/res/values-night/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="background_markdown_code_inline">#1FFFFFFF</color>
<color name="background_markdown_code_block">#0FFFFFFF</color>
</resources>
11 changes: 7 additions & 4 deletions termux-shared/src/main/res/values-night/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,20 @@
-->
<style name="Theme.BaseActivity.DayNight.DarkActionBar" parent="Theme.MaterialComponents">
<!-- Primary brand color. -->
<item name="colorPrimary">@color/red_400</item>
<item name="colorPrimaryVariant">@color/red_800</item>
<item name="colorOnPrimary">@color/black</item>
<item name="colorPrimary">@color/grey_900</item>
<item name="colorPrimaryVariant">@color/black</item>
<item name="colorOnPrimary">@color/white</item>

<!-- Secondary brand color. -->
<item name="colorSecondary">@color/grey_400</item>
<item name="colorSecondaryVariant">@color/grey_500</item>
<item name="colorOnSecondary">@color/black</item>

<!-- Accent color for widgets (switches, checkboxes, etc.). -->
<item name="colorAccent">@color/red_400</item>

<!-- Status bar color. -->
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
<item name="android:statusBarColor" tools:targetApi="l">@color/grey_900</item>
<item name="colorPrimaryDark" tools:targetApi="l">?attr/colorPrimary</item>

<!-- Text color. -->
Expand Down
7 changes: 5 additions & 2 deletions termux-shared/src/main/res/values/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@
<item name="colorSecondaryVariant">@color/black</item>
<item name="colorOnSecondary">@color/white</item>

<!-- Toolbar / ActionBar background color. -->
<item name="colorPrimaryDark" tools:targetApi="l">@color/white</item>

<!-- Status bar color. -->
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
<item name="colorPrimaryDark" tools:targetApi="l">?attr/colorPrimary</item>
<item name="android:statusBarColor" tools:targetApi="l">@color/white</item>
<item name="android:windowLightStatusBar" tools:targetApi="m">true</item>

<!-- Text color. -->
<item name="android:textColorPrimary">@color/black</item>
Expand Down