Update transparent theme warnings

Signed-off-by: androidacy-user <opensource@androidacy.com>
pull/242/head
androidacy-user 2 years ago
commit 74dbd66ff7

@ -1,42 +1,51 @@
name: Generate APK Debug name: Generate APK Debug
on: on:
# Triggers the workflow on push or pull request events but only for default and protected branches
push: push:
branches: branches:
- master - '*'
paths-ignore:
- '**.md'
pull_request: pull_request:
branches: branches:
- master - '*'
paths-ignore:
- '**.md'
workflow_dispatch:
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps: steps:
- uses: actions/checkout@v3 - name: Check out repository
uses: actions/checkout@v3
with:
submodules: true
- name: Set Up JDK - name: Set up Java 11
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:
distribution: 'zulu' java-version: 11
java-version: '11' distribution: 'adopt'
cache: gradle
- name: Change wrapper permissions - name: Change wrapper permissions
run: chmod +x ./gradlew run: chmod +x ./gradlew
- name: Run tests - name: Run tests
run: ./gradlew test run: ./gradlew test
# Create APK Debug
- name: Build apk debug - name: Build apk debug
run: ./gradlew app:assembleDefaultDebug run: ./gradlew app:assembleDefaultDebug
- name: Build apk fdroid-debug - name: Build apk fdroid-debug
run: ./gradlew app:assembleFdroidDebug run: ./gradlew app:assembleFdroidDebug
# Upload Artifact Build
# Noted For Output [module-name]/build/outputs/apk
- name: Upload apk debug - name: Upload apk debug
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:

@ -161,27 +161,53 @@ public class SettingsActivity extends FoxActivity implements LanguageActivity {
if (BuildConfig.DEBUG) { if (BuildConfig.DEBUG) {
Log.d(TAG, "Transparent theme is being set, disabling monet"); Log.d(TAG, "Transparent theme is being set, disabling monet");
} }
findPreference("pref_enable_monet").setEnabled(false); // Show a dialogue warning the user about issues with transparent themes and
((TwoStatePreference) findPreference("pref_enable_monet")).setChecked(false); // that blur/monet will be disabled
editor.putBoolean("pref_enable_monet", false).apply(); new MaterialAlertDialogBuilder(requireContext())
findPreference("pref_enable_monet").setSummary(R.string.monet_disabled_summary); .setTitle(R.string.transparent_theme_dialogue_title)
// Same for blur .setMessage(R.string.transparent_theme_dialogue_message)
findPreference("pref_enable_blur").setEnabled(false); .setPositiveButton(R.string.ok, (dialog, which) -> {
((TwoStatePreference) findPreference("pref_enable_blur")).setChecked(false); // Toggle monet off
editor.putBoolean("pref_enable_blur", false).apply(); ((TwoStatePreference) findPreference("pref_enable_monet")).setChecked(false);
findPreference("pref_enable_blur").setSummary(R.string.blur_disabled_summary); editor.putBoolean("pref_enable_monet", false).apply();
// Set summary
findPreference("pref_enable_monet").setSummary(R.string.monet_disabled_summary);
// Same for blur
((TwoStatePreference) findPreference("pref_enable_blur")).setChecked(false);
editor.putBoolean("pref_enable_blur", false).apply();
findPreference("pref_enable_blur").setSummary(R.string.blur_disabled_summary);
// Refresh activity
devModeStep = 0;
UiThreadHandler.handler.postDelayed(() -> {
MainApplication.getINSTANCE().updateTheme();
FoxActivity.getFoxActivity(this).setThemeRecreate(
MainApplication.getINSTANCE().getManagerThemeResId());
}, 1);
})
.setNegativeButton(R.string.cancel, (dialog, which) -> {
// Revert to system theme
((ListPreference) findPreference("pref_theme")).setValue("system");
// Refresh activity
devModeStep = 0;
UiThreadHandler.handler.postDelayed(() -> {
MainApplication.getINSTANCE().updateTheme();
FoxActivity.getFoxActivity(this).setThemeRecreate(
MainApplication.getINSTANCE().getManagerThemeResId());
}, 1);
})
.show();
} else { } else {
findPreference("pref_enable_monet").setEnabled(true); findPreference("pref_enable_monet").setEnabled(true);
findPreference("pref_enable_monet").setSummary(null); findPreference("pref_enable_monet").setSummary(null);
findPreference("pref_enable_blur").setEnabled(true); findPreference("pref_enable_blur").setEnabled(true);
findPreference("pref_enable_blur").setSummary(null); findPreference("pref_enable_blur").setSummary(null);
devModeStep = 0;
UiThreadHandler.handler.postDelayed(() -> {
MainApplication.getINSTANCE().updateTheme();
FoxActivity.getFoxActivity(this).setThemeRecreate(
MainApplication.getINSTANCE().getManagerThemeResId());
}, 1);
} }
devModeStep = 0;
UiThreadHandler.handler.postDelayed(() -> {
MainApplication.getINSTANCE().updateTheme();
FoxActivity.getFoxActivity(this).setThemeRecreate(
MainApplication.getINSTANCE().getManagerThemeResId());
}, 1);
return true; return true;
}); });
// Crash reporting // Crash reporting

@ -1,9 +1,10 @@
<resources> <resources>
<string-array name="theme_values_names"> <string-array name="theme_values_names">
<item comment="theme_values_names">Zgodny z systemem</item> <item>Zgodny z systemem</item>
<item comment="theme_values_names">Ciemny</item> <item>Ciemny</item>
<item>AMOLED Black</item> <item>Czarny</item>
<item>Transparent (light)</item> <item>Transparent (light)</item>
<item comment="theme_values_names">Jasny</item> <item>Jasny</item>
</string-array> </string-array>
<string-array name="permission_notification_dont_ask_again">Nie pytaj ponownie</string-array>
</resources> </resources>

@ -201,4 +201,6 @@
<string name="repo_update_failed_extended">Update of %1$s failed. Please try again later.</string> <string name="repo_update_failed_extended">Update of %1$s failed. Please try again later.</string>
<string name="monet_disabled_summary">Monet is not compatible with transparent themes.</string> <string name="monet_disabled_summary">Monet is not compatible with transparent themes.</string>
<string name="blur_disabled_summary">Blur is not compatible with transparent themes.</string> <string name="blur_disabled_summary">Blur is not compatible with transparent themes.</string>
<string name="transparent_theme_dialogue_title">You are setting a transparent theme</string>
<string name="transparent_theme_dialogue_message">Transparent themes may have some inconsistencies and may not work on all ROMs. In additon, monet and blur will be disabled. You can change back at any time.</string>
</resources> </resources>

Loading…
Cancel
Save