From 2b20b6bb9d6489a285a2b857d4db0f44c2643209 Mon Sep 17 00:00:00 2001 From: Alinson Xavier Date: Sun, 29 Dec 2019 11:12:29 -0600 Subject: [PATCH] Add link to privacy policy --- .../org/isoron/uhabits/activities/about/AboutRootView.java | 7 +++++++ .../org/isoron/uhabits/activities/about/AboutScreen.java | 6 ++++++ .../main/java/org/isoron/uhabits/intents/IntentFactory.kt | 3 +++ android/uhabits-android/src/main/res/layout/about.xml | 5 +++++ android/uhabits-android/src/main/res/values/constants.xml | 1 + android/uhabits-android/src/main/res/values/strings.xml | 2 ++ .../uhabits/core/ui/screens/about/AboutBehavior.java | 6 ++++++ 7 files changed, 30 insertions(+) diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java index 1a88668a1..f3a25f33f 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java @@ -97,6 +97,13 @@ public class AboutRootView extends BaseRootView behavior.onTranslateApp(); } + @OnClick(R.id.tvPrivacy) + public void onClickPrivacy() + { + behavior.onClickPrivacy(); + } + + @Override protected void initToolbar() { diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.java index c8c5808c4..f82e0dc04 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.java +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.java @@ -74,4 +74,10 @@ public class AboutScreen extends BaseScreen implements AboutBehavior.Screen { activity.startActivity(intents.helpTranslate(activity)); } + + @Override + public void showPrivacyPolicyWebsite() + { + activity.startActivity(intents.privacyPolicy(activity)); + } } diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.kt index fd04ee1a4..c7aefb427 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.kt @@ -46,6 +46,9 @@ class IntentFactory fun sendFeedback(context: Context) = buildSendToIntent(context.getString(R.string.feedbackURL)) + fun privacyPolicy(context: Context) = + buildViewIntent(context.getString(R.string.privacyPolicyURL)) + fun startAboutActivity(context: Context) = Intent(context, AboutActivity::class.java) diff --git a/android/uhabits-android/src/main/res/layout/about.xml b/android/uhabits-android/src/main/res/layout/about.xml index 523c965f6..30bc487ce 100644 --- a/android/uhabits-android/src/main/res/layout/about.xml +++ b/android/uhabits-android/src/main/res/layout/about.xml @@ -97,6 +97,11 @@ style="@style/About.Item.Clickable" android:text="@string/pref_view_source_code"/> + + market://details?id=org.isoron.uhabits mailto:dev@loophabits.org?subject=Feedback%20about%20Loop%20Habit%20Tracker mailto:dev@loophabits.org?subject=Bug%20Report%20-%20Loop%20Habit%20Tracker + http://loophabits.org/privacy https://github.com/iSoron/uhabits http://translate.loophabits.org/ dev@loophabits.org diff --git a/android/uhabits-android/src/main/res/values/strings.xml b/android/uhabits-android/src/main/res/values/strings.xml index 917bd8b30..c68fd2c99 100644 --- a/android/uhabits-android/src/main/res/values/strings.xml +++ b/android/uhabits-android/src/main/res/values/strings.xml @@ -235,4 +235,6 @@ No Change sound, vibration, light and other notification settings Customize notifications + View our privacy policy + \ No newline at end of file diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/about/AboutBehavior.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/about/AboutBehavior.java index 17da79732..cd8bfb6ee 100644 --- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/about/AboutBehavior.java +++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/about/AboutBehavior.java @@ -72,6 +72,10 @@ public class AboutBehavior screen.showSourceCodeWebsite(); } + public void onClickPrivacy() { + screen.showPrivacyPolicyWebsite(); + } + public enum Message { YOU_ARE_NOW_A_DEVELOPER @@ -88,6 +92,8 @@ public class AboutBehavior void showSourceCodeWebsite(); void showTranslationWebsite(); + + void showPrivacyPolicyWebsite(); } }