diff --git a/app/build.gradle b/app/build.gradle index 167eccd..6e7da8d 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 13 + versionName "1.2.3-google" vectorDrawables.useSupportLibrary = true } buildTypes { 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..d7c52ab --- /dev/null +++ b/app/src/main/java/org/secuso/aktivpause/GoodbyeGoogleHelper.kt @@ -0,0 +1,38 @@ +package org.secuso.aktivpause; + +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/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() { 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 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 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1f79287..890e627 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -177,4 +177,8 @@ Ja Online-Befragung + Wir verlassen Google Play 😢 + 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 d8f2d44..c4d68ea 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -170,4 +170,8 @@ Online Evaluation + Goodbye Google Play 😢 + 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.