Skip to content

Commit

Permalink
Remove app theme selection dropdown
Browse files Browse the repository at this point in the history
When targetting SDK 35, setting a manual theme does not work correctly
with edge-to-edge, making text unreadable. Now the app will always
use the system default
  • Loading branch information
emanuele-f committed Jan 1, 2025
1 parent f0d1b67 commit 5f50ae3
Show file tree
Hide file tree
Showing 22 changed files with 0 additions and 98 deletions.
13 changes: 0 additions & 13 deletions app/src/main/java/com/emanuelef/remote_capture/PCAPdroid.java
Original file line number Diff line number Diff line change
Expand Up @@ -86,19 +86,6 @@ public void onCreate() {
mInstance = new WeakReference<>(this);
mLocalizedContext = createConfigurationContext(Utils.getLocalizedConfig(this));

SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
String theme = prefs.getString(Prefs.PREF_APP_THEME, "");

if("".equals(theme)) {
if(Utils.isTv(this)) {
// Use the dark theme by default on Android TV
theme = "dark";
prefs.edit().putString(Prefs.PREF_APP_THEME, theme).apply();
} else
theme = "system";
}
Utils.setAppTheme(theme);

// Listen to package events
IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_PACKAGE_ADDED);
Expand Down
9 changes: 0 additions & 9 deletions app/src/main/java/com/emanuelef/remote_capture/Utils.java
Original file line number Diff line number Diff line change
Expand Up @@ -378,15 +378,6 @@ public static Configuration getLocalizedConfig(Context context) {
return config;
}

public static void setAppTheme(String theme) {
if(theme.equals("light"))
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
else if(theme.equals("dark"))
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
else
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
}

public static String proto2str(int proto) {
switch(proto) {
case 6: return "TCP";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -456,13 +456,6 @@ else if (!locales.isEmpty())
private void setupOtherPrefs() {
setupAppLanguagePref();

DropDownPreference appTheme = requirePreference(Prefs.PREF_APP_THEME);
appTheme.setOnPreferenceChangeListener((preference, newValue) -> {
Utils.setAppTheme(newValue.toString());

return true;
});

mPortMapping = requirePreference(Prefs.PREF_PORT_MAPPING);
mPortMapping.setOnPreferenceClickListener(preference -> {
Intent intent = new Intent(requireContext(), PortMapActivity.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ public class Prefs {
public static final String PREF_PCAP_DUMP_MODE = "pcap_dump_mode_v2";
public static final String PREF_IP_MODE = "ip_mode";
public static final String PREF_APP_LANGUAGE = "app_language";
public static final String PREF_APP_THEME = "app_theme";
public static final String PREF_ROOT_CAPTURE = "root_capture";
public static final String PREF_VISUALIZATION_MASK = "vis_mask";
public static final String PREF_MALWARE_WHITELIST = "malware_whitelist";
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,6 @@
<string name="lang_english">الإنجليزية</string>
<string name="no_activity_file_selection">لم يتم العثور على تطبيق للتعامل مع الملف المُختار</string>
<string name="file_saved_with_name">تم حفظ الملف باسم \"%1$s\"</string>
<string name="theme_dark">داكن</string>
<string name="theme_light">فاتح</string>
<string name="app_theme">السمة</string>
<string name="socks5_redirection">إعادة توجيه SOCKS5</string>
<string name="socks5_summary">قم بتكوين إعادة التوجيه إلى وكيل SOCKS5</string>
<string name="enable_socks5_proxy_summary">إعادة توجيه كافة اتصالات TCP إلى وكيل SOCKS5</string>
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@
<string name="last_blacklists_update">Letzte Aktualisierung</string>
<string name="select_all">Alles auswählen</string>
<string name="enable_socks5_proxy_summary">Umleiten aller TCP-Verbindungen an einen SOCKS5 Proxy</string>
<string name="theme_dark">Dunkel</string>
<string name="receiver_ip_address">Empfänger-IP-Adresse</string>
<string name="malware_detection_learn_more">Erfahre mehr über die Malware-Erkennungsfunktion</string>
<string name="save_ok">Gespeichert</string>
Expand All @@ -98,11 +97,9 @@
<string name="lang_english">Englisch</string>
<string name="system_default">System</string>
<string name="file_saved_with_name">Datei als \"%1$s\" gespeichert</string>
<string name="theme_light">Hell</string>
<string name="get_app">Kapiert:</string>
<string name="no_activity_file_selection">Keine App für die Dateiauswahl gefunden</string>
<string name="about_text">PCAPdroid ist ein Open-Source-Netzwerkaufnahme- und Überwachungswerkzeug, das ohne Root-Rechte funktioniert</string>
<string name="app_theme">Thema</string>
<string name="proxy_port">Proxy-Port</string>
<string name="root_capture_summary">Erlaubt PCAPdroid die Ausführung mit anderen VPN-Apps</string>
<string name="donate">Spenden</string>
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,6 @@
<string name="lang_english">Inglés</string>
<string name="system_default">Predeterminado del sistema</string>
<string name="no_activity_file_selection">No se encontró una app como administrador de archivos</string>
<string name="theme_light">Claro</string>
<string name="theme_dark">Oscuro</string>
<string name="app_theme">Tema</string>
<string name="socks5_proxy">SOCKS5</string>
<string name="proxy_port">Puerto proxy</string>
<string name="root_capture">Capturar como root</string>
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
<string name="status">État</string>
<string name="dns_server">Serveur DNS</string>
<string name="notification_msg">%1$s capturés, %2$s connexions</string>
<string name="theme_dark">Sombre</string>
<string name="app_theme">Thème</string>
<string name="title_activity_settings">Paramètres</string>
<string name="collector_info">Collecteur UDP : %1$s:%2$d</string>
<string name="rcvd_and_sent">%1$s reçus – %2$s envoyés</string>
Expand Down Expand Up @@ -57,7 +55,6 @@
<string name="system_default">Système</string>
<string name="no_activity_file_selection">Aucune application trouvée pour gérer la sélection des fichiers</string>
<string name="file_saved_with_name">Fichier enregistré sous le nom de « %1$s »</string>
<string name="theme_light">Clair</string>
<string name="donate">Faire un don</string>
<string name="search">Recherche…</string>
<string name="app_val">Appli : %1$s</string>
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-in/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,6 @@
<string name="app_language">Bahasa</string>
<string name="no_activity_file_selection">Tidak ada aplikasi yang ditemukan untuk menangani pemilihan file</string>
<string name="file_saved_with_name">File disimpan sebagai \"%1$s\"</string>
<string name="theme_dark">Gelap</string>
<string name="app_theme">Tema</string>
<string name="enable_socks5_proxy_summary">Arahkan ulang semua koneksi TCP ke proxy SOCKS5</string>
<string name="proxy_port">Port proksi</string>
<string name="root_capture">Capture dengan akses root</string>
Expand Down Expand Up @@ -209,7 +207,6 @@
<string name="unknown_app">Tidak diketahui</string>
<string name="system_default">Sistem</string>
<string name="conn_status_unreachable">Tidak terjangkau</string>
<string name="theme_light">Terang</string>
<string name="root_capture_summary">Mengizinkan PCAPdroid menangkap koneksi VPN aplikasi lain yang sedang berjalan</string>
<string name="network_traffic">Lalu lintas</string>
<string name="warn_no_app_data">Tidak ada data aplikasi yang dipertukarkan</string>
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,6 @@
<string name="lang_english">Inglese</string>
<string name="system_default">Predefinita del sistema</string>
<string name="no_activity_file_selection">App di selezione file mancante</string>
<string name="theme_light">Chiaro</string>
<string name="theme_dark">Scuro</string>
<string name="app_theme">Tema</string>
<string name="socks5_proxy">SOCKS5</string>
<string name="proxy_port">Porta del proxy</string>
<string name="root_capture">Cattura come root</string>
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-ja/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@
<string name="system_default">システム標準</string>
<string name="no_activity_file_selection">ファイル選択を処理するアプリが見つかりません</string>
<string name="file_saved_with_name">「%1$s」としてファイルを保存しました</string>
<string name="theme_light">ライト</string>
<string name="theme_dark">ダーク</string>
<string name="app_theme">テーマ</string>
<string name="socks5_proxy">SOCKS5 プロキシを有効にする</string>
<string name="enable_socks5_proxy_summary">すべての TCP 接続を指定した SOCKS5 プロキシにリダイレクトします</string>
<string name="proxy_port">プロキシ ポート</string>
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-ko/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
<string name="dns_server">DNS 서버</string>
<string name="apps">앱</string>
<string name="pcap_file_info">기기의 저장공간에 PCAP 파일을 생성합니다</string>
<string name="app_theme">테마</string>
<string name="pcap_file">PCAP 파밍</string>
<string name="ok">확인</string>
<string name="capture_running">캡처 하는중</string>
Expand All @@ -78,11 +77,9 @@
<string name="app_language">앱 언어</string>
<string name="lang_english">English</string>
<string name="no_activity_file_selection">선택한 파일을 처리할 수 있는 앱을 찾을 수 없습니다</string>
<string name="theme_dark">다크</string>
<string name="socks5_proxy">SOCKS5</string>
<string name="system_default">시스템</string>
<string name="file_saved_with_name">파일이 \"%1$s\"로 저장되었습니다</string>
<string name="theme_light">라이트</string>
<string name="enable_socks5_proxy_summary">모든 TCP 커넥션을 지정된 SOCKS5 프록시로 리다이렉트합니다</string>
<string name="root_capture">루트로 캡처하기</string>
<string name="socks5_info">SOCKS5 프록시: %1$s:%2$d</string>
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-nb-rNO/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
<string name="about_text">PCAPdroid er et fritt verktøy for nettverksovervåkning og lagring, som fungerer uten rot-tilgang</string>
<string name="get_app">Hent det:</string>
<string name="conn_status_unreachable">Kan ikke nåes</string>
<string name="theme_light">Lys</string>
<string name="donate">Doner</string>
<string name="search">Søk …</string>
<string name="ip_address_val">IP-adresse: %1$s</string>
Expand Down Expand Up @@ -112,15 +111,13 @@
<string name="bytes_rcvd">Byte mottatt</string>
<string name="open_sockets">Åpne socket-er</string>
<string name="app_language">Programspråk</string>
<string name="theme_dark">Mørk</string>
<string name="search_apps">Søk i programmer</string>
<string name="no_apps">Ingen programmer</string>
<string name="deny">Nekt</string>
<string name="country">Land</string>
<string name="other_prefs">Annet</string>
<string name="lang_english">Engelsk</string>
<string name="system_default">System</string>
<string name="app_theme">Drakt</string>
<string name="socks5_proxy">Skru på SOCKS5-mellomtjener</string>
<string name="blacklists">Svartelister</string>
<string name="status_not_loaded">Ikke innlastet</string>
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-pl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,6 @@
<string name="system_default">System</string>
<string name="no_activity_file_selection">Nie znaleziono aplikacji obsługującej wybór plików</string>
<string name="file_saved_with_name">Plik zapisany jako \"%1$s\"</string>
<string name="theme_light">Jasny</string>
<string name="theme_dark">Ciemny</string>
<string name="app_theme">Motyw</string>
<string name="socks5_proxy">SOCKS5</string>
<string name="socks5_redirection">Przekierowanie SOCKS5</string>
<string name="socks5_summary">Skonfiguruj przekierowanie do serwera proxy SOCKS5</string>
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-pt-rBR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@
<string name="lang_english">Inglês</string>
<string name="system_default">Sistema</string>
<string name="no_activity_file_selection">Não foi encontrado nenhum app de seleção de arquivos</string>
<string name="theme_light">Claro</string>
<string name="theme_dark">Escuro</string>
<string name="app_theme">Tema</string>
<string name="socks5_proxy">SOCKS5</string>
<string name="proxy_port">Porta do proxy</string>
<string name="root_capture">Capturar como root</string>
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,6 @@
<string name="lang_english">Английский</string>
<string name="system_default">Как в системе</string>
<string name="no_activity_file_selection">Программа для взаимодействия с данным файлом не обнаружена</string>
<string name="theme_light">Светлая</string>
<string name="theme_dark">Тёмная</string>
<string name="app_theme">Тема</string>
<string name="socks5_proxy">Включить SOCKS5 прокси</string>
<string name="proxy_port">Порт прокси</string>
<string name="root_capture">Захват в root режиме</string>
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-tr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -191,13 +191,10 @@
<string name="get_app">Edin:</string>
<string name="error">Hata</string>
<string name="no_activity_file_selection">Dosya seçimini yapacak uygulama bulunamadı</string>
<string name="theme_dark">Koyu</string>
<string name="app_theme">Tema</string>
<string name="proxy_port">Vekil bağlantı noktası</string>
<string name="root_capture">Root olarak yakala</string>
<string name="host_val">Ana makine: %1$s</string>
<string name="app_details">Uygulama ayrıntıları</string>
<string name="theme_light">Açık</string>
<string name="netd_app_info">DNS çözümlemelerini gerçekleştiren sistem arka plan programı</string>
<string name="loading">Yükleniyor…</string>
<string name="capturing_from">\"%1$s\" paketlerini yakala</string>
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-uk/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
<string name="dns_queries">Запитів DNS</string>
<string name="notification_msg">%1$s захоплено, %2$s з\'єднань</string>
<string name="lang_english">Англійська</string>
<string name="theme_dark">Темна</string>
<string name="app_theme">Тема</string>
<string name="socks5_proxy">SOCKS5</string>
<string name="ip_address_val">IP адреса: %1$s</string>
<string name="host_val">Хост: %1$s</string>
Expand Down Expand Up @@ -288,7 +286,6 @@
<string name="system_default">Системна</string>
<string name="no_activity_file_selection">Не знайдено програми для ручного вибирання файлу</string>
<string name="file_saved_with_name">Файл збережено як \"%1$s\"</string>
<string name="theme_light">Світла</string>
<string name="socks5_redirection">Перенаправлення SOCKS5</string>
<string name="socks5_summary">Параметри перенаправлення до проксі SOCKS5</string>
<string name="enable_socks5_proxy_summary">Перенаправити TCP всі з\'єднання до проксі SOCKS5</string>
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-zh-rCN/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,6 @@
<string name="lang_english">英语</string>
<string name="system_default">系统默认</string>
<string name="no_activity_file_selection">没有找到应用来处理选中的文件</string>
<string name="theme_light">浅色</string>
<string name="theme_dark">深色</string>
<string name="app_theme">主题</string>
<string name="socks5_proxy">启用 SOCKS5 代理</string>
<string name="proxy_port">代理端口</string>
<string name="root_capture">以 root 用户身份捕获流量</string>
Expand Down
11 changes: 0 additions & 11 deletions app/src/main/res/values/arrays.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,6 @@
<item>@string/ip_both</item>
</string-array>

<string-array name="app_theme">
<item>system</item>
<item>light</item>
<item>dark</item>
</string-array>
<string-array name="app_theme_labels">
<item>@string/system_default</item>
<item>@string/theme_light</item>
<item>@string/theme_dark</item>
</string-array>

<string-array name="block_quic">
<item>never</item>
<item>always</item>
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,6 @@
<string name="system_default">System default</string>
<string name="no_activity_file_selection">No app found to handle file selection</string>
<string name="file_saved_with_name">File saved as \"%1$s\"</string>
<string name="theme_light">Light</string>
<string name="theme_dark">Dark</string>
<string name="app_theme">Theme</string>
<string name="socks5_proxy">SOCKS5</string>
<string name="socks5_redirection">SOCKS5 redirection</string>
<string name="socks5_summary">Configure the redirection to a SOCKS5 proxy</string>
Expand Down
9 changes: 0 additions & 9 deletions app/src/main/res/xml/root_preferences.xml
Original file line number Diff line number Diff line change
Expand Up @@ -194,15 +194,6 @@
</PreferenceCategory>

<PreferenceCategory app:title="@string/other_prefs" app:iconSpaceReserved="false" >
<DropDownPreference
app:key="app_theme"
app:title="@string/app_theme"
android:entries="@array/app_theme_labels"
android:entryValues="@array/app_theme"
app:iconSpaceReserved="false"
app:defaultValue="system"
app:useSimpleSummaryProvider="true"/>

<DropDownPreference
app:key="app_language"
app:title="@string/app_language"
Expand Down

0 comments on commit 5f50ae3

Please sign in to comment.