From f3bfabc3d10837a68b1b387cd05966802e7427b6 Mon Sep 17 00:00:00 2001 From: Patrick Schneider Date: Mon, 9 Jun 2025 16:09:45 +0200 Subject: [PATCH 1/9] Initial goodbye google dialog --- .../secuso/aktivpause/GoodbyeGoogleHelper.kt | 38 +++++++++++++++ app/src/main/res/drawable/dialog_border.xml | 5 ++ .../main/res/layout/dialog_goodbye_google.xml | 47 +++++++++++++++++++ 3 files changed, 90 insertions(+) create mode 100644 app/src/main/java/org/secuso/aktivpause/GoodbyeGoogleHelper.kt create mode 100644 app/src/main/res/drawable/dialog_border.xml create mode 100644 app/src/main/res/layout/dialog_goodbye_google.xml diff --git a/app/src/main/java/org/secuso/aktivpause/GoodbyeGoogleHelper.kt b/app/src/main/java/org/secuso/aktivpause/GoodbyeGoogleHelper.kt new file mode 100644 index 0000000..90ba994 --- /dev/null +++ b/app/src/main/java/org/secuso/aktivpause/GoodbyeGoogleHelper.kt @@ -0,0 +1,38 @@ +package org.secuso.privacyfriendlyboardgameclock + +import android.content.Context +import android.graphics.text.LineBreaker +import android.os.Build +import android.preference.PreferenceManager +import android.text.method.LinkMovementMethod +import android.view.LayoutInflater +import android.widget.CheckBox +import android.widget.TextView +import androidx.appcompat.app.AlertDialog + +fun checkGoodbyeGoogle(context: Context, layoutInflater: LayoutInflater) { + + val showNotice = PreferenceManager.getDefaultSharedPreferences(context).getBoolean("show_goodbye_google_notice", true); + + if (showNotice) { + val view = layoutInflater.inflate(R.layout.dialog_goodbye_google, null, false) + view.findViewById(R.id.show_notice_checkbox).apply { + setOnClickListener { + PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean("show_goodbye_google_notice", !isChecked).apply() + } + } + val dialog = AlertDialog.Builder(context) + .setView(view) + .setNeutralButton(android.R.string.ok) { _, _ -> } + .setCancelable(false) + .create() + + dialog.show() + dialog.findViewById(R.id.text)?.apply { + movementMethod = LinkMovementMethod.getInstance() + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + justificationMode = LineBreaker.JUSTIFICATION_MODE_INTER_WORD + } + } + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/dialog_border.xml b/app/src/main/res/drawable/dialog_border.xml new file mode 100644 index 0000000..791ba04 --- /dev/null +++ b/app/src/main/res/drawable/dialog_border.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_goodbye_google.xml b/app/src/main/res/layout/dialog_goodbye_google.xml new file mode 100644 index 0000000..262993d --- /dev/null +++ b/app/src/main/res/layout/dialog_goodbye_google.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + From 5504092319e4bfc9cab1674e65bf4341e5db6f19 Mon Sep 17 00:00:00 2001 From: Patrick Schneider Date: Mon, 9 Jun 2025 16:44:58 +0200 Subject: [PATCH 2/9] Adds strings for goodbye google dialog --- app/src/main/res/values-de/strings.xml | 6 ++++++ app/src/main/res/values/strings.xml | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1f79287..f76da59 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -177,4 +177,10 @@ Ja Online-Befragung + Wir verlassen Google Play __ + Unsere Apps m_ssen sich leider von Google Play verabschieden. Sie k_nnen die App weiterhin nutzen, erhalten jedoch keine Updates mehr. +Weitere Informationen zu den Gr_nden und warum das nicht das Ende der Privacy Friendly Apps ist, finden Sie auf unserer Website: + +Hier klicken, um mehr zu erfahren + Zeige diese Mitteilung nicht nochmal \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d8f2d44..660eb8f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -170,4 +170,11 @@ Online Evaluation + Goodbye Google Play __ + Our apps will have to say goodbye to Google Play. You can continue to use the app but you will not receive any updates in the future. +You can find more info about the reasons and why this isn_t the end of the Privacy Friendly Apps on our website: + +Click here to learn more + + Don't show this notice again. From 55b3dd7817ca91473ffc8436ef5fb764a4f95f4c Mon Sep 17 00:00:00 2001 From: Patrick Schneider Date: Mon, 9 Jun 2025 17:45:14 +0200 Subject: [PATCH 3/9] Fixes copy-paste error regarding package --- app/src/main/java/org/secuso/aktivpause/GoodbyeGoogleHelper.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/secuso/aktivpause/GoodbyeGoogleHelper.kt b/app/src/main/java/org/secuso/aktivpause/GoodbyeGoogleHelper.kt index 90ba994..d7c52ab 100644 --- a/app/src/main/java/org/secuso/aktivpause/GoodbyeGoogleHelper.kt +++ b/app/src/main/java/org/secuso/aktivpause/GoodbyeGoogleHelper.kt @@ -1,4 +1,4 @@ -package org.secuso.privacyfriendlyboardgameclock +package org.secuso.aktivpause; import android.content.Context import android.graphics.text.LineBreaker From c83df124683a20806cf7e6e76cf8aedf619db3b1 Mon Sep 17 00:00:00 2001 From: Patrick Schneider Date: Mon, 9 Jun 2025 17:59:10 +0200 Subject: [PATCH 4/9] fixup: escape single ' in english dialog --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 660eb8f..266587d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -176,5 +176,5 @@ You can find more info about the reasons and why this isn_t the end of the Priva Click here to learn more - Don't show this notice again. + Don\'t show this notice again. From 1911e67126ed0fec5f75fa2fe5306d6419ebfc3d Mon Sep 17 00:00:00 2001 From: Patrick Schneider Date: Tue, 10 Jun 2025 20:42:29 +0200 Subject: [PATCH 5/9] Fixes character encoding errors due to unsupported terminal font --- app/src/main/res/values-de/strings.xml | 8 +++----- app/src/main/res/values/strings.xml | 8 ++------ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index f76da59..023b287 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -177,10 +177,8 @@ Ja Online-Befragung - Wir verlassen Google Play __ - Unsere Apps m_ssen sich leider von Google Play verabschieden. Sie k_nnen die App weiterhin nutzen, erhalten jedoch keine Updates mehr. -Weitere Informationen zu den Gr_nden und warum das nicht das Ende der Privacy Friendly Apps ist, finden Sie auf unserer Website: - -Hier klicken, um mehr zu erfahren + Wir verlassen Google Play 😢 + Unsere Apps müssen sich leider von Google Play verabschieden. Sie können die App weiterhin nutzen, erhalten jedoch keine Updates mehr.\nWeitere Informationen zu den Gründen und warum das nicht das Ende der Privacy Friendly Apps ist, finden Sie auf unserer Website:\n\nHier klicken, um mehr zu erfahren + Zeige diese Mitteilung nicht nochmal \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 266587d..a87188b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -170,11 +170,7 @@ Online Evaluation - Goodbye Google Play __ - Our apps will have to say goodbye to Google Play. You can continue to use the app but you will not receive any updates in the future. -You can find more info about the reasons and why this isn_t the end of the Privacy Friendly Apps on our website: - -Click here to learn more - + Goodbye Google Play 😢 + Our apps will have to say goodbye to Google Play. You can continue to use the app but you will not receive any updates in the future.\nYou can find more info about the reasons and why this isn\'t the end of the Privacy Friendly Apps on our website:\n\nClick here to learn more Don\'t show this notice again. From 8a6436039937e2923b149bda5312215fc34ab025 Mon Sep 17 00:00:00 2001 From: coderPaddyS Date: Tue, 10 Jun 2025 20:49:24 +0200 Subject: [PATCH 6/9] Adds goodbye google dialog. --- .../java/org/secuso/aktivpause/activities/TimerActivity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/org/secuso/aktivpause/activities/TimerActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/TimerActivity.java index 0f3c4ce..451c9f9 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/TimerActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/TimerActivity.java @@ -32,6 +32,7 @@ import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; +import org.secuso.aktivpause.GoodbyeGoogleHelperKt; import org.secuso.aktivpause.activities.tutorial.FirstLaunchManager; import org.secuso.aktivpause.exercises.ExerciseLocale; import org.secuso.aktivpause.R; @@ -136,6 +137,7 @@ public class TimerActivity extends BaseActivity implements LoaderManager.LoaderC } getSupportLoaderManager().initLoader(0, null, this); + GoodbyeGoogleHelperKt.checkGoodbyeGoogle(this, getLayoutInflater()); } @Override From 4b02cbd33228bf7bd907cdebef035d8ca467e64e Mon Sep 17 00:00:00 2001 From: Patrick Schneider Date: Sun, 3 Aug 2025 13:58:04 +0200 Subject: [PATCH 7/9] [update] bumps version. Corrects dialog description. --- app/build.gradle | 4 ++-- app/src/main/res/values-de/strings.xml | 4 ++-- app/src/main/res/values/strings.xml | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 167eccd..4217315 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "org.secuso.aktivpause" minSdkVersion 21 targetSdkVersion 34 - versionCode 11 - versionName "1.2.2" + versionCode 12 + versionName "1.2.3-google" vectorDrawables.useSupportLibrary = true } buildTypes { diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 023b287..890e627 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -178,7 +178,7 @@ Online-Befragung Wir verlassen Google Play 😢 - Unsere Apps müssen sich leider von Google Play verabschieden. Sie können die App weiterhin nutzen, erhalten jedoch keine Updates mehr.\nWeitere Informationen zu den Gründen und warum das nicht das Ende der Privacy Friendly Apps ist, finden Sie auf unserer Website:\n\nHier klicken, um mehr zu erfahren - + Unsere Apps müssen sich leider von Google Play verabschieden. Die App ist weiterhin nutzbar, erhält jedoch keine Updates mehr.\nWeitere Informationen zu den Gründen und warum das nicht das Ende der Privacy Friendly Apps ist, finden Sie auf unserer Website:\n\nHier klicken, um mehr zu erfahren + Zeige diese Mitteilung nicht nochmal \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a87188b..c4d68ea 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -171,6 +171,7 @@ Goodbye Google Play 😢 - Our apps will have to say goodbye to Google Play. You can continue to use the app but you will not receive any updates in the future.\nYou can find more info about the reasons and why this isn\'t the end of the Privacy Friendly Apps on our website:\n\nClick here to learn more - Don\'t show this notice again. + Unfortunately, our apps have to say goodbye to Google Play. The app is still usable but will not receive any updates in the future.\nYou can find more information about the reasons why this is not the end of the Privacy Friendly Apps on our website:\n\nClick here to learn more + + Don\'t show this notice again. From 733b0c72839604234226749bb3f0e89571dd4be4 Mon Sep 17 00:00:00 2001 From: Patrick Schneider Date: Sun, 3 Aug 2025 14:02:48 +0200 Subject: [PATCH 8/9] [fix] Adds dialog to ManageExerciseSetsActivity --- .../aktivpause/activities/ManageExerciseSetsActivity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/org/secuso/aktivpause/activities/ManageExerciseSetsActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/ManageExerciseSetsActivity.java index 1ab162a..fc86fb9 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/ManageExerciseSetsActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/ManageExerciseSetsActivity.java @@ -34,6 +34,7 @@ import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; +import org.secuso.aktivpause.GoodbyeGoogleHelperKt; import org.secuso.aktivpause.activities.tutorial.FirstLaunchManager; import org.secuso.aktivpause.exercises.ExerciseLocale; import org.secuso.aktivpause.R; @@ -76,6 +77,7 @@ public class ManageExerciseSetsActivity extends BaseActivity implements LoaderMa initResources(); getSupportLoaderManager().initLoader(0, null, this); + GoodbyeGoogleHelperKt.checkGoodbyeGoogle(this, getLayoutInflater()); } private void initResources() { From 34739f37144d0b57cc4bf1f877487e54fbc2826c Mon Sep 17 00:00:00 2001 From: Patrick Schneider Date: Sun, 3 Aug 2025 14:53:15 +0200 Subject: [PATCH 9/9] [update] bumps version. --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 4217315..6e7da8d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ android { applicationId "org.secuso.aktivpause" minSdkVersion 21 targetSdkVersion 34 - versionCode 12 + versionCode 13 versionName "1.2.3-google" vectorDrawables.useSupportLibrary = true }