From 5173f16dede178d7bab544ec33a14b87bd00f9b9 Mon Sep 17 00:00:00 2001 From: zosc <29935021+byzosc@users.noreply.github.com> Date: Tue, 3 Nov 2026 17:02:18 +0800 Subject: [PATCH 1/3] Added: Theme-aware widget style and per-widget background opacity setting - The list widget now follows the system light/dark theme instead of the hardcoded black title bar and light list background. - The background is drawn with the system widget corner radius on Android 12+ (`system_app_widget_background_radius`) and the title/refresh button are inset so the launcher's corner clipping no longer cuts them off. - Add a configuration activity to set the background opacity per widget instance. It is reachable from the launcher's widget "Settings" entry (`reconfigurable|configuration_optional`) and by tapping the widget title. Closes #10 Assisted-by: Claude Opus 5.5 (Claude Code) --- app/src/main/AndroidManifest.xml | 10 ++ .../termux/widget/TermuxWidgetProvider.java | 22 ++++- .../com/termux/widget/WidgetSkinPrefs.java | 47 +++++++++ .../TermuxWidgetConfigureActivity.java | 97 +++++++++++++++++++ app/src/main/res/drawable-v31/widget_bg.xml | 10 ++ .../main/res/drawable/ic_widget_refresh.xml | 14 +++ app/src/main/res/drawable/ripple_circle.xml | 11 +++ app/src/main/res/drawable/ripple_mask.xml | 4 +- app/src/main/res/drawable/widget_bg.xml | 10 ++ .../activity_termux_widget_configure.xml | 40 ++++++++ app/src/main/res/layout/widget_item.xml | 12 ++- app/src/main/res/layout/widget_layout.xml | 81 ++++++++++------ app/src/main/res/values-night/colors.xml | 9 ++ app/src/main/res/values/colors.xml | 9 ++ app/src/main/res/values/strings.xml | 5 + .../main/res/xml/termux_appwidget_info.xml | 4 +- 16 files changed, 348 insertions(+), 37 deletions(-) create mode 100644 app/src/main/java/com/termux/widget/WidgetSkinPrefs.java create mode 100644 app/src/main/java/com/termux/widget/activities/TermuxWidgetConfigureActivity.java create mode 100644 app/src/main/res/drawable-v31/widget_bg.xml create mode 100644 app/src/main/res/drawable/ic_widget_refresh.xml create mode 100644 app/src/main/res/drawable/ripple_circle.xml create mode 100644 app/src/main/res/drawable/widget_bg.xml create mode 100644 app/src/main/res/layout/activity_termux_widget_configure.xml create mode 100644 app/src/main/res/values-night/colors.xml create mode 100644 app/src/main/res/values/colors.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0c74788..69cb267 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -45,6 +45,16 @@ + + + + + + + * settings) or by clicking the widget title. + */ +public class TermuxWidgetConfigureActivity extends AppCompatActivity { + + public static final String LOG_TAG = "TermuxWidgetConfigureActivity"; + + private int mAppWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID; + + private TextView mAlphaValueTextView; + private SeekBar mAlphaSeekBar; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + Logger.logDebug(LOG_TAG, "onCreate"); + + setContentView(R.layout.activity_termux_widget_configure); + + AppCompatActivityUtils.setNightMode(this, NightMode.getAppNightMode().getName(), true); + + // If user backs out of the activity, then the launcher should treat it as cancelled. + setResult(RESULT_CANCELED); + + mAppWidgetId = getIntent().getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID); + if (mAppWidgetId == AppWidgetManager.INVALID_APPWIDGET_ID) { + Logger.logError(LOG_TAG, "Invalid widget id received, finishing"); + finish(); + return; + } + + Logger.logDebug(LOG_TAG, "Configuring widget id: " + mAppWidgetId); + + setAlphaViews(); + + Button saveButton = findViewById(R.id.button_save); + saveButton.setOnClickListener(v -> saveAndFinish()); + } + + private void setAlphaViews() { + mAlphaValueTextView = findViewById(R.id.text_alpha_value); + mAlphaSeekBar = findViewById(R.id.seekbar_alpha); + + int percent = WidgetSkinPrefs.getAlphaPercent(this, mAppWidgetId); + mAlphaSeekBar.setProgress(percent); + setAlphaValueText(percent); + + mAlphaSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() { + @Override + public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { + setAlphaValueText(progress); + } + + @Override + public void onStartTrackingTouch(SeekBar seekBar) {} + + @Override + public void onStopTrackingTouch(SeekBar seekBar) {} + }); + } + + private void setAlphaValueText(int percent) { + mAlphaValueTextView.setText(getString(R.string.label_widget_background_opacity, percent)); + } + + private void saveAndFinish() { + int percent = mAlphaSeekBar.getProgress(); + Logger.logDebug(LOG_TAG, "Saving background opacity " + percent + "% for widget id: " + mAppWidgetId); + + WidgetSkinPrefs.setAlphaPercent(this, mAppWidgetId, percent); + TermuxWidgetProvider.updateAppWidgetRemoteViews(this, AppWidgetManager.getInstance(this), mAppWidgetId); + + setResult(RESULT_OK, new Intent().putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, mAppWidgetId)); + finish(); + } + +} diff --git a/app/src/main/res/drawable-v31/widget_bg.xml b/app/src/main/res/drawable-v31/widget_bg.xml new file mode 100644 index 0000000..42b0b98 --- /dev/null +++ b/app/src/main/res/drawable-v31/widget_bg.xml @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_widget_refresh.xml b/app/src/main/res/drawable/ic_widget_refresh.xml new file mode 100644 index 0000000..a89df06 --- /dev/null +++ b/app/src/main/res/drawable/ic_widget_refresh.xml @@ -0,0 +1,14 @@ + + + + + + + diff --git a/app/src/main/res/drawable/ripple_circle.xml b/app/src/main/res/drawable/ripple_circle.xml new file mode 100644 index 0000000..68cbc71 --- /dev/null +++ b/app/src/main/res/drawable/ripple_circle.xml @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/app/src/main/res/drawable/ripple_mask.xml b/app/src/main/res/drawable/ripple_mask.xml index fe34991..2082a7b 100644 --- a/app/src/main/res/drawable/ripple_mask.xml +++ b/app/src/main/res/drawable/ripple_mask.xml @@ -1,6 +1,6 @@ + android:color="@color/widget_ripple" > @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/app/src/main/res/drawable/widget_bg.xml b/app/src/main/res/drawable/widget_bg.xml new file mode 100644 index 0000000..706b948 --- /dev/null +++ b/app/src/main/res/drawable/widget_bg.xml @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/app/src/main/res/layout/activity_termux_widget_configure.xml b/app/src/main/res/layout/activity_termux_widget_configure.xml new file mode 100644 index 0000000..52686d3 --- /dev/null +++ b/app/src/main/res/layout/activity_termux_widget_configure.xml @@ -0,0 +1,40 @@ + + + + + + + + + +