From 70e85c4e9c81fcceb0524c9db3cf781209852a8c Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Fri, 24 Mar 2023 09:30:58 -0700 Subject: [PATCH] Add a monochrome icon. https://redmine.stoutner.com/issues/988 --- COPYING | 2 +- app/build.gradle | 14 +++---- app/src/main/assets/de/changelog.html | 12 +++--- app/src/main/assets/de/licenses.html | 24 +++++------ app/src/main/assets/en/changelog.html | 4 +- app/src/main/assets/en/licenses.html | 24 +++++------ app/src/main/assets/es/changelog.html | 4 +- app/src/main/assets/es/licenses.html | 24 +++++------ app/src/main/assets/fr/changelog.html | 16 ++++---- app/src/main/assets/fr/licenses.html | 24 +++++------ .../main/assets/images/list_alt_rounded.svg | 30 -------------- .../assets/images/list_alt_rounded_24.svg | 30 ++++++++++++++ app/src/main/assets/it/changelog.html | 4 +- app/src/main/assets/it/licenses.html | 24 +++++------ app/src/main/assets/ru/changelog.html | 4 +- app/src/main/assets/ru/licenses.html | 24 +++++------ .../res/drawable/antiquated_3g_disabled.xml | 6 ++- .../res/drawable/antiquated_3g_enabled.xml | 6 ++- app/src/main/res/drawable/bug_tracker.xml | 4 +- app/src/main/res/drawable/logcat.xml | 8 ++-- .../res/drawable/privacy_cell_monochrome.xml | 40 +++++++++++++++++++ .../drawable/secure_notification_disabled.xml | 6 ++- .../drawable/secure_notification_enabled.xml | 6 ++- .../drawable/secure_notification_ghosted.xml | 6 ++- app/src/main/res/drawable/settings.xml | 4 +- .../privacy_cell.xml | 9 +++-- build.gradle | 6 +-- .../metadata/android/de-DE/changelogs/11.txt | 8 ++-- .../metadata/android/fr-FR/changelogs/11.txt | 8 ++-- gradle.properties | 21 +++++++++- gradle/wrapper/gradle-wrapper.properties | 2 +- 31 files changed, 240 insertions(+), 164 deletions(-) delete mode 100644 app/src/main/assets/images/list_alt_rounded.svg create mode 100644 app/src/main/assets/images/list_alt_rounded_24.svg create mode 100644 app/src/main/res/drawable/privacy_cell_monochrome.xml rename app/src/main/res/{mipmap-anydpi-v26 => mipmap}/privacy_cell.xml (83%) diff --git a/COPYING b/COPYING index aa4972b..1f57575 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Privacy Cell copyright © 2021-2022 Soren Stoutner . +Privacy Cell copyright © 2021-2023 Soren Stoutner . This file is part of Privacy Cell . diff --git a/app/build.gradle b/app/build.gradle index c82f041..39d64f4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,5 @@ /* - * Copyright 2021-2022 Soren Stoutner . + * Copyright 2021-2023 Soren Stoutner . * * This file is part of Privacy Cell . * @@ -52,17 +52,17 @@ android { dependencies { // Include the following AndroidX libraries. - implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0' implementation 'androidx.preference:preference-ktx:1.2.0' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' - implementation 'androidx.webkit:webkit:1.5.0' - implementation 'androidx.work:work-runtime-ktx:2.7.1' + implementation 'androidx.webkit:webkit:1.6.0' + implementation 'androidx.work:work-runtime-ktx:2.8.1' // Include the Kotlin standard library. This should be the same version number listed in the project build.gradle. - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20' + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0' // Include the Google material library. - implementation 'com.google.android.material:material:1.7.0' + implementation 'com.google.android.material:material:1.8.0' } diff --git a/app/src/main/assets/de/changelog.html b/app/src/main/assets/de/changelog.html index b46b306..a4fc8bd 100644 --- a/app/src/main/assets/de/changelog.html +++ b/app/src/main/assets/de/changelog.html @@ -29,13 +29,13 @@ -

1.9 (Version Code 11)

-

5. Dezember 2022 - Mindest-API 30, Ziel-API 33

+

1.9 (Version Code 11)

+

5. Dezember 2022 - Mindest-API 30, Ziel-API 33

diff --git a/app/src/main/assets/de/licenses.html b/app/src/main/assets/de/licenses.html index a0143c8..209cf52 100644 --- a/app/src/main/assets/de/licenses.html +++ b/app/src/main/assets/de/licenses.html @@ -1,5 +1,5 @@ - - - - - diff --git a/app/src/main/assets/images/list_alt_rounded_24.svg b/app/src/main/assets/images/list_alt_rounded_24.svg new file mode 100644 index 0000000..c888193 --- /dev/null +++ b/app/src/main/assets/images/list_alt_rounded_24.svg @@ -0,0 +1,30 @@ + + + + + + + + diff --git a/app/src/main/assets/it/changelog.html b/app/src/main/assets/it/changelog.html index 1a069f2..b473d2f 100644 --- a/app/src/main/assets/it/changelog.html +++ b/app/src/main/assets/it/changelog.html @@ -29,8 +29,8 @@ -

1.9 (versione codice 11)

-

5 Dicembre 2022 - minima API 30, target API 33

+

1.9 (versione codice 11)

+

5 Dicembre 2022 - minima API 30, target API 33

  • Modifica della target API a 33 (Android 13).
  • Disabilitata la possibilità di effettuare lo swipe per eliminare la notifica di monitoraggio in tempo reale su Android 13.
  • diff --git a/app/src/main/assets/it/licenses.html b/app/src/main/assets/it/licenses.html index 1323364..3d63167 100644 --- a/app/src/main/assets/it/licenses.html +++ b/app/src/main/assets/it/licenses.html @@ -1,5 +1,5 @@ + - \ No newline at end of file + android:pathData="M5,21q-0.825,0 -1.413,-0.587Q3,19.825 3,19L3,5q0,-0.825 0.587,-1.413Q4.175,3 5,3h14q0.825,0 1.413,0.587Q21,4.175 21,5v14q0,0.825 -0.587,1.413Q19.825,21 19,21ZM5,19h14L19,5L5,5v14ZM8,17q0.425,0 0.713,-0.288Q9,16.425 9,16t-0.287,-0.713Q8.425,15 8,15t-0.713,0.287Q7,15.575 7,16t0.287,0.712Q7.575,17 8,17ZM8,13q0.425,0 0.713,-0.288Q9,12.425 9,12t-0.287,-0.713Q8.425,11 8,11t-0.713,0.287Q7,11.575 7,12t0.287,0.712Q7.575,13 8,13ZM8,9q0.425,0 0.713,-0.288Q9,8.425 9,8t-0.287,-0.713Q8.425,7 8,7t-0.713,0.287Q7,7.575 7,8t0.287,0.712Q7.575,9 8,9ZM12,17h4q0.425,0 0.712,-0.288Q17,16.425 17,16t-0.288,-0.713Q16.425,15 16,15h-4q-0.425,0 -0.712,0.287Q11,15.575 11,16t0.288,0.712Q11.575,17 12,17ZM12,13h4q0.425,0 0.712,-0.288Q17,12.425 17,12t-0.288,-0.713Q16.425,11 16,11h-4q-0.425,0 -0.712,0.287Q11,11.575 11,12t0.288,0.712Q11.575,13 12,13ZM12,9h4q0.425,0 0.712,-0.288Q17,8.425 17,8t-0.288,-0.713Q16.425,7 16,7h-4q-0.425,0 -0.712,0.287Q11,7.575 11,8t0.288,0.712Q11.575,9 12,9ZM5,19L5,5v14Z" + tools:ignore="VectorPath" /> + diff --git a/app/src/main/res/drawable/privacy_cell_monochrome.xml b/app/src/main/res/drawable/privacy_cell_monochrome.xml new file mode 100644 index 0000000..2760c7c --- /dev/null +++ b/app/src/main/res/drawable/privacy_cell_monochrome.xml @@ -0,0 +1,40 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/secure_notification_disabled.xml b/app/src/main/res/drawable/secure_notification_disabled.xml index a4ed573..c28c7f2 100644 --- a/app/src/main/res/drawable/secure_notification_disabled.xml +++ b/app/src/main/res/drawable/secure_notification_disabled.xml @@ -1,5 +1,5 @@ - - - \ No newline at end of file + + + + diff --git a/build.gradle b/build.gradle index 5f4a005..7045733 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ /* - * Copyright 2021-2022 Soren Stoutner . + * Copyright 2021-2023 Soren Stoutner . * * This file is part of Privacy Cell . * @@ -25,8 +25,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20" + classpath 'com.android.tools.build:gradle:7.4.2' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/fastlane/metadata/android/de-DE/changelogs/11.txt b/fastlane/metadata/android/de-DE/changelogs/11.txt index 373be1f..765e279 100644 --- a/fastlane/metadata/android/de-DE/changelogs/11.txt +++ b/fastlane/metadata/android/de-DE/changelogs/11.txt @@ -1,5 +1,5 @@ -• Bump the target API to 33 (Android 13). -• Disable swiping to dismiss the realtime monitoring notification on Android 13. -• Enable per-app language support on Android 13. -• Preserve the Settings scroll location on restart. +• Ziel-API auf 33 (Android 13) angehoben. +• Wischgeste zum zum Ablehnen der Benachrichtigungen des Echtzeit-Monitorings unter Android 13 deaktiviert. +• App-Sprachauswahl zur Auswahl der Sprache von Privacy Cell unter Android 13 hinzugefügt. +• Scroll-Position im Einstellungs-Dialog wird nun bei Neustarts beibehalten. • Erste komplette deutsche Übersetzung von Bernhard G. Keller. \ No newline at end of file diff --git a/fastlane/metadata/android/fr-FR/changelogs/11.txt b/fastlane/metadata/android/fr-FR/changelogs/11.txt index 76ebe15..9bed719 100644 --- a/fastlane/metadata/android/fr-FR/changelogs/11.txt +++ b/fastlane/metadata/android/fr-FR/changelogs/11.txt @@ -1,5 +1,5 @@ -• Bump the target API to 33 (Android 13). -• Disable swiping to dismiss the realtime monitoring notification on Android 13. -• Enable per-app language support on Android 13. -• Preserve the Settings scroll location on restart. +• Passage de l'API cible à 33 (Android 13). +• Désactivation du glissement pour rejeter la notification de surveillance en temps réel sur Android 13. +• Activation du support de la langue par application sur Android 13. +• Conservation de l'emplacement du défilement des paramètres au redémarrage. • Mise à jour de la traduction française par Kévin L. \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 98bed16..02ba79e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,20 @@ +# Copyright 2023 Soren Stoutner . +# +# This file is part of Privacy Cell . +# +# Privacy Cell is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Privacy Cell is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Privacy Browser. If not, see . + # Project-wide Gradle settings. # IDE (e.g. Android Studio) users: # Gradle settings configured through the IDE *will override* @@ -18,4 +35,6 @@ android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official \ No newline at end of file +kotlin.code.style=official +# Enable the configuration cache, which improves build speed. +org.gradle.unsafe.configuration-cache=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 177ccd7..1e2b5c5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Aug 12 09:15:13 MST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME -- 2.43.0