From dc76c6f07fd9a5718049d160e079842fa60ff406 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Wed, 23 Feb 2022 14:35:47 -0700 Subject: [PATCH] Create a protocols activity. https://redmine.stoutner.com/issues/774 --- COPYING | 2 +- app/build.gradle | 8 +- app/src/main/AndroidManifest.xml | 15 +- app/src/main/assets/de/changelog.html | 4 +- app/src/main/assets/de/licenses.html | 4 +- app/src/main/assets/en/changelog.html | 4 +- app/src/main/assets/en/licenses.html | 4 +- app/src/main/assets/es/changelog.html | 4 +- app/src/main/assets/es/licenses.html | 4 +- app/src/main/assets/fr/changelog.html | 16 +- app/src/main/assets/fr/licenses.html | 4 +- app/src/main/assets/it/changelog.html | 4 +- app/src/main/assets/it/licenses.html | 4 +- app/src/main/assets/ru/changelog.html | 4 +- app/src/main/assets/ru/licenses.html | 4 +- .../activities/PrivacyCellActivity.kt | 15 +- .../activities/ProtocolsActivity.kt | 146 ++++++++++++++++++ .../adapters/ProtocolArrayAdapter.kt | 49 ++++++ .../privacycell/dialogs/WebViewDialog.kt | 4 +- .../privacycell/fragments/SettingsFragment.kt | 6 +- app/src/main/res/drawable/donations.xml | 4 +- .../res/drawable/insecure_notification.xml | 4 +- app/src/main/res/drawable/not_secure.xml | 4 +- .../res/drawable/privacy_cell_foreground.xml | 4 +- app/src/main/res/drawable/protocols.xml | 13 ++ .../drawable/realtime_monitoring_disabled.xml | 4 +- .../drawable/realtime_monitoring_enabled.xml | 4 +- .../drawable/realtime_monitoring_ghosted.xml | 4 +- app/src/main/res/drawable/secure_5g_nr_sa.xml | 4 +- .../main/res/drawable/secure_notification.xml | 4 +- .../res/layout/protocol_header_textview.xml | 33 ++++ .../res/layout/protocol_item_textview.xml | 31 ++++ .../res/layout/protocols_bottom_appbar.xml | 55 +++++++ .../main/res/layout/protocols_top_appbar.xml | 52 +++++++ app/src/main/res/menu/logcat_options_menu.xml | 4 +- .../menu/navigation_menu_bottom_appbar.xml | 10 +- .../res/menu/navigation_menu_top_appbar.xml | 30 ++-- .../res/mipmap-anydpi-v26/privacy_cell.xml | 4 +- app/src/main/res/values-de/strings.xml | 20 +-- app/src/main/res/values-es/strings.xml | 6 +- app/src/main/res/values-fr/strings.xml | 6 +- app/src/main/res/values-it/strings.xml | 6 +- app/src/main/res/values-night/colors.xml | 4 +- app/src/main/res/values-night/themes.xml | 2 + app/src/main/res/values-ru/strings.xml | 6 +- app/src/main/res/values/colors.xml | 4 +- app/src/main/res/values/strings.xml | 14 +- app/src/main/res/values/themes.xml | 2 + build.gradle | 4 +- .../metadata/android/fr-FR/changelogs/7.txt | 4 + gradle/wrapper/gradle-wrapper.properties | 2 +- 51 files changed, 550 insertions(+), 103 deletions(-) create mode 100644 app/src/main/java/com/stoutner/privacycell/activities/ProtocolsActivity.kt create mode 100644 app/src/main/java/com/stoutner/privacycell/adapters/ProtocolArrayAdapter.kt create mode 100644 app/src/main/res/drawable/protocols.xml create mode 100644 app/src/main/res/layout/protocol_header_textview.xml create mode 100644 app/src/main/res/layout/protocol_item_textview.xml create mode 100644 app/src/main/res/layout/protocols_bottom_appbar.xml create mode 100644 app/src/main/res/layout/protocols_top_appbar.xml create mode 100644 fastlane/metadata/android/fr-FR/changelogs/7.txt diff --git a/COPYING b/COPYING index 545ca2a..aa4972b 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Privacy Cell copyright © 2021 Soren Stoutner . +Privacy Cell copyright © 2021-2022 Soren Stoutner . This file is part of Privacy Cell . diff --git a/app/build.gradle b/app/build.gradle index a53b551..a015f11 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,5 @@ /* - * Copyright © 2021 Soren Stoutner . + * Copyright © 2021-2022 Soren Stoutner . * * This file is part of Privacy Cell . * @@ -49,9 +49,9 @@ android { dependencies { // Include the following AndroidX libraries. - implementation 'androidx.appcompat:appcompat:1.4.0' + implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'androidx.core:core-ktx:1.7.0' - implementation 'androidx.preference:preference-ktx:1.1.1' + implementation 'androidx.preference:preference-ktx:1.2.0' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.webkit:webkit:1.4.0' implementation 'androidx.work:work-runtime-ktx:2.7.1' @@ -60,5 +60,5 @@ dependencies { implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10' // Include the Google material library. - implementation 'com.google.android.material:material:1.4.0' + implementation 'com.google.android.material:material:1.5.0' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index be16e6e..4deb14c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ - + + android:theme="@style/Theme.PrivacyCell" + tools:ignore="DataExtractionRules" > + + -

1.6 (version code 7)

-

21. Dezember 2021 - Mindest-API 30, Ziel-API 31

+

1.6 (version code 7)

+

21. Dezember 2021 - Mindest-API 30, Ziel-API 31

  • Von androidx.work hinzugefügte, nicht benötigte Berechtigungen entfernt.
  • Fehler behoben, durch den unter Android 12 der Benachrichtigungs-Dienst im Hintergrund nicht neu gestartet werden konnte.
  • diff --git a/app/src/main/assets/de/licenses.html b/app/src/main/assets/de/licenses.html index ab529be..fff3db3 100644 --- a/app/src/main/assets/de/licenses.html +++ b/app/src/main/assets/de/licenses.html @@ -1,5 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/realtime_monitoring_disabled.xml b/app/src/main/res/drawable/realtime_monitoring_disabled.xml index 83b6e26..fe45484 100644 --- a/app/src/main/res/drawable/realtime_monitoring_disabled.xml +++ b/app/src/main/res/drawable/realtime_monitoring_disabled.xml @@ -1,7 +1,7 @@ + + \ No newline at end of file diff --git a/app/src/main/res/layout/protocol_item_textview.xml b/app/src/main/res/layout/protocol_item_textview.xml new file mode 100644 index 0000000..897b8f5 --- /dev/null +++ b/app/src/main/res/layout/protocol_item_textview.xml @@ -0,0 +1,31 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/protocols_bottom_appbar.xml b/app/src/main/res/layout/protocols_bottom_appbar.xml new file mode 100644 index 0000000..e273674 --- /dev/null +++ b/app/src/main/res/layout/protocols_bottom_appbar.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/protocols_top_appbar.xml b/app/src/main/res/layout/protocols_top_appbar.xml new file mode 100644 index 0000000..c374a89 --- /dev/null +++ b/app/src/main/res/layout/protocols_top_appbar.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/logcat_options_menu.xml b/app/src/main/res/menu/logcat_options_menu.xml index f81aa28..150ced2 100644 --- a/app/src/main/res/menu/logcat_options_menu.xml +++ b/app/src/main/res/menu/logcat_options_menu.xml @@ -1,7 +1,7 @@ @@ -37,31 +43,31 @@ android:id="@+id/permissions" android:title="@string/permissions" android:icon="@drawable/permissions" - android:orderInCategory="30" /> + android:orderInCategory="40" /> + android:orderInCategory="50" /> + android:orderInCategory="60" /> + android:orderInCategory="70" /> + android:orderInCategory="80" /> @@ -70,25 +76,25 @@ android:id="@+id/news" android:title="@string/news" android:icon="@drawable/news" - android:orderInCategory="80" /> + android:orderInCategory="90" /> + android:orderInCategory="100" /> + android:orderInCategory="110" /> + android:orderInCategory="120" /> @@ -97,6 +103,6 @@ android:id="@+id/donations" android:title="@string/donations" android:icon="@drawable/donations" - android:orderInCategory="120" /> + android:orderInCategory="130" /> \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/privacy_cell.xml b/app/src/main/res/mipmap-anydpi-v26/privacy_cell.xml index b920bec..1a8afaf 100644 --- a/app/src/main/res/mipmap-anydpi-v26/privacy_cell.xml +++ b/app/src/main/res/mipmap-anydpi-v26/privacy_cell.xml @@ -1,7 +1,9 @@ - + Privacy Cell Zelle @@ -55,7 +57,7 @@ Unbekannt GPRS – 2.5G/3G - General Packet Radio Service + General Packet Radio Service EDGE – 2.5G/3G Enhanced Data rates for GSM Evolution UMTS – 3G @@ -69,11 +71,11 @@ 1xRTT – 3G Single-Carrier Radio Transmission Technology HSDPA – 3.5G - High Speed Downlink Packet Access + High Speed Downlink Packet Access HSUPA – 3.5G - High-Speed Uplink Packet Access + High-Speed Uplink Packet Access HSPA – 3.5G - High Speed Packet Access + High Speed Packet Access IDEN – 2G Integrated Digital Enhanced Network EVDO B – 3.5G @@ -81,9 +83,9 @@ LTE – 4G Long-Term Evolution EHRPD – 3.5G/4G - Enhanced High-Rate Packet Data + Enhanced High-Rate Packet Data HSPAP – 3.5G - High Speed Packet Access Plus + High Speed Packet Access Plus GSM – 2G Global System for Mobile Communications TD-SCDMA – 3G @@ -128,7 +130,7 @@ - Kopieren + Kopieren Speichern Löschen Logcat wurde kopiert. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index ce7e3d8..4651b8e 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,5 +1,7 @@ + + - Copiar + Copiar Guardar Limpiar Logcat copiado. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 029e29a..ffea456 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,5 +1,7 @@ + + - Copier + Copier Sauvegarder Nettoyer Logcat copié. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 7314af4..235dabd 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1,5 +1,7 @@ + + - Copia + Copia Salva Cancella Logcat copiato. diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 3a15eb2..194ddaf 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -1,7 +1,7 @@ - Скопировать + Скопировать Сохранить Очистить Logcat скопирован. diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 95f9c46..2b2a8fc 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,7 +1,7 @@ Settings + Protocols Logcat Permissions Privacy Policy @@ -52,6 +55,13 @@ Forum Donations + + 2G + 3G + 4G + 5G + Other + Unknown GPRS – 2.5G/3G @@ -128,7 +138,7 @@ - Copy + Copy Save Clear Logcat copied. diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index cb42f25..300ca07 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,3 +1,5 @@ + +