From 9aafe7160c016c13ebf807822ef05347a3eb61b9 Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Sun, 9 Apr 2017 16:56:04 -0400
Subject: [PATCH] Update translation links

---
 .../activities/about/AboutRootView.java       |  7 +++++++
 .../activities/settings/SettingsFragment.java | 11 ----------
 .../isoron/uhabits/intents/IntentFactory.java |  6 ++++++
 .../isoron/uhabits/utils/InterfaceUtils.java  | 20 -------------------
 app/src/main/res/layout/about.xml             |  5 +++++
 app/src/main/res/values/constants.xml         |  2 +-
 app/src/main/res/xml/preferences.xml          | 14 -------------
 7 files changed, 19 insertions(+), 46 deletions(-)

diff --git a/app/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java b/app/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java
index bcc3db46f..695f9a3ca 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java
@@ -94,6 +94,13 @@ public class AboutRootView extends BaseRootView
         getContext().startActivity(intent);
     }
 
+    @OnClick(R.id.tvTranslate)
+    public void onClickTranslate()
+    {
+        Intent intent = intents.helpTranslate(getContext());
+        getContext().startActivity(intent);
+    }
+
     @OnClick(R.id.tvRate)
     public void onClickRate()
     {
diff --git a/app/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java b/app/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java
index 9b71bc153..330e05b34 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java
@@ -61,9 +61,6 @@ public class SettingsFragment extends PreferenceFragmentCompat
         setResultOnPreferenceClick("bugReport", ListHabitsScreen.RESULT_BUG_REPORT);
 
         updateRingtoneDescription();
-
-        if (InterfaceUtils.isLocaleFullyTranslated())
-            removePreference("translate", "linksCategory");
     }
 
     @Override
@@ -110,14 +107,6 @@ public class SettingsFragment extends PreferenceFragmentCompat
         BackupManager.dataChanged("org.isoron.uhabits");
     }
 
-    private void removePreference(String preferenceKey, String categoryKey)
-    {
-        PreferenceCategory cat =
-            (PreferenceCategory) findPreference(categoryKey);
-        Preference pref = findPreference(preferenceKey);
-        cat.removePreference(pref);
-    }
-
     private void setResultOnPreferenceClick(String key, final int result)
     {
         Preference pref = findPreference(key);
diff --git a/app/src/main/java/org/isoron/uhabits/intents/IntentFactory.java b/app/src/main/java/org/isoron/uhabits/intents/IntentFactory.java
index 8ace599a5..47172d2fa 100644
--- a/app/src/main/java/org/isoron/uhabits/intents/IntentFactory.java
+++ b/app/src/main/java/org/isoron/uhabits/intents/IntentFactory.java
@@ -39,6 +39,12 @@ public class IntentFactory
     {
     }
 
+    public Intent helpTranslate(Context context)
+    {
+        String url = context.getString(R.string.translateURL);
+        return buildViewIntent(url);
+    }
+
     public Intent rateApp(Context context)
     {
         String url = context.getString(R.string.playStoreURL);
diff --git a/app/src/main/java/org/isoron/uhabits/utils/InterfaceUtils.java b/app/src/main/java/org/isoron/uhabits/utils/InterfaceUtils.java
index 5db2a875a..e22118b2b 100644
--- a/app/src/main/java/org/isoron/uhabits/utils/InterfaceUtils.java
+++ b/app/src/main/java/org/isoron/uhabits/utils/InterfaceUtils.java
@@ -24,17 +24,8 @@ import android.content.res.*;
 import android.graphics.*;
 import android.util.*;
 
-import java.util.*;
-
 public abstract class InterfaceUtils
 {
-
-    // TODO: Move this to another place, or detect automatically
-    private static String fullyTranslatedLanguages[] = {
-        "ca", "zh", "en", "de", "in", "it", "ko", "pl", "pt", "es", "tk", "uk",
-        "ja", "fr", "hr", "sl"
-    };
-
     private static Typeface fontAwesome;
 
     public static Typeface getFontAwesome(Context context)
@@ -58,15 +49,4 @@ public abstract class InterfaceUtils
         DisplayMetrics metrics = resources.getDisplayMetrics();
         return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, sp, metrics);
     }
-
-    public static boolean isLocaleFullyTranslated()
-    {
-        final String currentLanguage = Locale.getDefault().getLanguage();
-
-        for(String lang : fullyTranslatedLanguages)
-            if(currentLanguage.equals(lang)) return true;
-
-        return false;
-    }
-
 }
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
index ea0d88999..a944c1dd8 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
@@ -87,6 +87,11 @@
                     style="@style/About.Item.Clickable"
                     android:text="@string/pref_send_feedback"/>
 
+                <TextView
+                    android:id="@+id/tvTranslate"
+                    style="@style/About.Item.Clickable"
+                    android:text="@string/help_translate"/>
+
                 <TextView
                     android:id="@+id/tvSource"
                     style="@style/About.Item.Clickable"
diff --git a/app/src/main/res/values/constants.xml b/app/src/main/res/values/constants.xml
index e9bb09d04..311d2c241 100644
--- a/app/src/main/res/values/constants.xml
+++ b/app/src/main/res/values/constants.xml
@@ -23,7 +23,7 @@
     <string name="feedbackURL" formatted="false">mailto:dev@loophabits.org?subject=Feedback%20about%20Loop%20Habit%20Tracker</string>
     <string name="bugReportURL" formatted="false">mailto:dev@loophabits.org?subject=Bug%20Report%20-%20Loop%20Habit%20Tracker</string>
     <string name="sourceCodeURL">https://github.com/iSoron/uhabits</string>
-    <string name="translateURL">https://poeditor.com/join/project/8DWX5pfjS0</string>
+    <string name="translateURL">http://translate.loophabits.org/</string>
     <string name="bugReportTo">dev@loophabits.org</string>
     <string name="bugReportSubject">Bug Report - Loop Habit Tracker</string>
 
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 6b5502414..092a373b6 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -124,20 +124,6 @@
                 android:data="@string/playStoreURL"/>
         </Preference>
 
-        <Preference android:title="@string/pref_send_feedback">
-            <intent
-                android:action="android.intent.action.SENDTO"
-                android:data="@string/feedbackURL"/>
-        </Preference>
-
-        <Preference
-            android:key="translate"
-            android:title="@string/help_translate">
-            <intent
-                android:action="android.intent.action.VIEW"
-                android:data="@string/feedbackURL"/>
-        </Preference>
-
         <Preference android:title="@string/about">
             <intent
                 android:action="android.intent.action.VIEW"