import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.content.res.Configuration;
import android.content.res.Resources;
import android.database.Cursor;
import android.os.Bundle;
// Get a handle for the shared preferences.
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
- // Get the theme and screenshot preferences.
- boolean darkTheme = sharedPreferences.getBoolean("dark_theme", false);
+ // Get the screenshot preference.
boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false);
// Disable screenshots if not allowed.
getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
}
- // Set the activity theme.
- if (darkTheme) {
- setTheme(R.style.PrivacyBrowserDark_SecondaryActivity);
- } else {
- setTheme(R.style.PrivacyBrowserLight_SecondaryActivity);
- }
+ // Set the theme.
+ setTheme(R.style.PrivacyBrowser);
// Run the default commands.
super.onCreate(savedInstanceState);
// Disable the options `MenuItems`.
deleteMenuItem.setEnabled(false);
- deleteMenuItem.setIcon(R.drawable.delete_blue);
+ deleteMenuItem.setIcon(R.drawable.delete_disabled);
// Remove the domain settings fragment.
fragmentManager.beginTransaction().remove(Objects.requireNonNull(fragmentManager.findFragmentById(R.id.domain_settings_fragment_container))).commit();
// Get a handle for the activity.
Activity activity = this;
- // Display a `Snackbar`.
+ // Display a snackbar.
undoDeleteSnackbar = Snackbar.make(domainsListView, R.string.domain_deleted, Snackbar.LENGTH_LONG)
.setAction(R.string.undo, (View v) -> {
// Do nothing because everything will be handled by `onDismissed()` below.
}
};
- // Update the `ListView`.
+ // Update the domains list view.
domainsListView.setAdapter(undoDeleteDomainsCursorAdapter);
- // Select the previously deleted domain in `domainsListView`.
+
+ // Select the previously deleted domain in the list view.
domainsListView.setItemChecked(deletedDomainPosition, true);
- // Display `domainSettingsFragment`.
+ // Display the domain settings fragment.
fragmentManager.beginTransaction().replace(R.id.domain_settings_fragment_container, domainSettingsFragment).commit();
- // Enable the options `MenuItems`.
+ // Enable the options delete menu item.
deleteMenuItem.setEnabled(true);
- deleteMenuItem.setIcon(R.drawable.delete_light);
+
+ // Get the current theme status.
+ int currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+
+ // Set the delete menu item icon according to the theme.
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+ deleteMenuItem.setIcon(R.drawable.delete_night);
+ } else {
+ deleteMenuItem.setIcon(R.drawable.delete_day);
+ }
} else { // The device in in one-paned mode.
// Display `domainSettingsFragment`.
fragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainSettingsFragment).commit();
if (dismissingSnackbar) {
// Create a `Runnable` to enable the delete menu item.
Runnable enableDeleteMenuItemRunnable = () -> {
- // Enable `deleteMenuItem` according to the display mode.
+ // Enable the delete menu item according to the display mode.
if (twoPanedMode) { // Two-paned mode.
// Enable the delete menu item.
deleteMenuItem.setEnabled(true);
- // Get a handle for the shared preferences.
- SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-
- // Get the theme preferences.
- boolean darkTheme = sharedPreferences.getBoolean("dark_theme", false);
+ // Get the current theme status.
+ int currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
- // Set the delete icon according to the theme.
- if (darkTheme) {
- deleteMenuItem.setIcon(R.drawable.delete_dark);
+ // Set the delete menu item icon according to the theme.
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+ deleteMenuItem.setIcon(R.drawable.delete_night);
} else {
- deleteMenuItem.setIcon(R.drawable.delete_light);
+ deleteMenuItem.setIcon(R.drawable.delete_day);
}
} else { // Single-paned mode.
- // Show `deleteMenuItem`.
+ // Show the delete menu item.
deleteMenuItem.setVisible(true);
}
- // Reset `dismissingSnackbar`.
+ // Reset the dismissing snackbar tracker.
dismissingSnackbar = false;
};
Spinner fontSizeSpinner = view.findViewById(R.id.font_size_spinner);
EditText customFontSizeEditText = view.findViewById(R.id.custom_font_size_edittext);
Spinner swipeToRefreshSpinner = view.findViewById(R.id.swipe_to_refresh_spinner);
- Spinner nightModeSpinner = view.findViewById(R.id.night_mode_spinner);
+ Spinner webViewThemeSpinner = view.findViewById(R.id.webview_theme_spinner);
Spinner wideViewportSpinner = view.findViewById(R.id.wide_viewport_spinner);
Spinner displayWebpageImagesSpinner = view.findViewById(R.id.display_webpage_images_spinner);
Switch pinnedSslCertificateSwitch = view.findViewById(R.id.pinned_ssl_certificate_switch);
int userAgentSwitchPosition = userAgentSpinner.getSelectedItemPosition();
int fontSizeSwitchPosition = fontSizeSpinner.getSelectedItemPosition();
int swipeToRefreshInt = swipeToRefreshSpinner.getSelectedItemPosition();
- int nightModeInt = nightModeSpinner.getSelectedItemPosition();
+ int webViewThemeInt = webViewThemeSpinner.getSelectedItemPosition();
int wideViewportInt = wideViewportSpinner.getSelectedItemPosition();
int displayWebpageImagesInt = displayWebpageImagesSpinner.getSelectedItemPosition();
boolean pinnedSslCertificate = pinnedSslCertificateSwitch.isChecked();
// Save the domain settings.
domainsDatabaseHelper.updateDomain(DomainsActivity.currentDomainDatabaseId, domainNameString, javaScript, firstPartyCookies, thirdPartyCookies, domStorage, formData, easyList, easyPrivacy,
- fanboysAnnoyance, fanboysSocialBlocking, ultraList, ultraPrivacy, blockAllThirdPartyRequests, userAgentName, fontSizeInt, swipeToRefreshInt, nightModeInt, wideViewportInt,
+ fanboysAnnoyance, fanboysSocialBlocking, ultraList, ultraPrivacy, blockAllThirdPartyRequests, userAgentName, fontSizeInt, swipeToRefreshInt, webViewThemeInt, wideViewportInt,
displayWebpageImagesInt, pinnedSslCertificate, pinnedIpAddress);
// Update the pinned SSL certificate if a new one is checked.
// Enable the delete options menu items.
deleteMenuItem.setEnabled(true);
- // Get a handle for the shared preferences.
- SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
-
- // Get the theme and screenshot preferences.
- boolean darkTheme = sharedPreferences.getBoolean("dark_theme", false);
+ // Get the current theme status.
+ int currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
// Set the delete icon according to the theme.
- if (darkTheme) {
- deleteMenuItem.setIcon(R.drawable.delete_dark);
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+ deleteMenuItem.setIcon(R.drawable.delete_night);
} else {
- deleteMenuItem.setIcon(R.drawable.delete_light);
+ deleteMenuItem.setIcon(R.drawable.delete_day);
}
} else if (twoPanedMode) { // Two-paned mode is enabled but there are no domains.
// Disable the options `MenuItems`.
deleteMenuItem.setEnabled(false);
- deleteMenuItem.setIcon(R.drawable.delete_blue);
+ deleteMenuItem.setIcon(R.drawable.delete_disabled);
}
}
projects / PrivacyBrowserAndroid.git / blobdiff