Fixed: Language list when building outside of project root

freedomofkeima · Aug 25, 2017 · eea6f92 · eea6f92
1 parent c659c77
commit eea6f92
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ### v1.2.4
 - Updated: Readme
+- Fixed: Language list when building outside of project root
 
 ### v1.2.3
 - Added: Option to change app language

diff --git a/app/build.gradle b/app/build.gradle
@@ -59,16 +59,16 @@ android {
     sourceSets { main { assets.srcDirs = ['src/main/assets', '../assets'] } }
 }
 
-String[] getUsedAndroidLanguages(){
-    Set<String> langs = new HashSet<>();
-    String[] resFolders = new File("app/src/main/res").list()
-    for(resFolder in resFolders){
-        if (resFolder.startsWith("values-")){
-            String[] files = new File("app/src/main/res/"+resFolder).list();
-            for (file in files){
-                if (file.startsWith("strings") && file.endsWith(".xml")){
-                    langs.add(resFolder.replace("values-",""))
-                    break;
+@SuppressWarnings(["UnnecessaryQualifiedReference", "SpellCheckingInspection"])
+static String[] getUsedAndroidLanguages() {
+    Set<String> langs = new HashSet<>()
+    new File('.').eachFileRecurse(groovy.io.FileType.DIRECTORIES) {
+        final foldername = it.name
+        if (foldername.startsWith('values-') && !it.canonicalPath.contains("build" + File.separator + "intermediates")) {
+            new File(it.toString()).eachFileRecurse(groovy.io.FileType.FILES) {
+                if (it.name.toLowerCase().endsWith(".xml") && it.getCanonicalFile().getText('UTF-8').contains("<string")) {
+                    langs.add(foldername.replace("values-", ""))
+
                 }
             }
         }

diff --git a/app/src/main/java/io/github/gsantner/opoc/ui/LanguagePreference.java b/app/src/main/java/io/github/gsantner/opoc/ui/LanguagePreference.java
@@ -17,24 +17,26 @@
  *     opoc/Helpers
  * BuildConfig field can be defined by using the method below
 
-    buildConfigField("String[]", "APPLICATION_LANGUAGES", '{' + getUsedAndroidLanguages().collect {"\"${it}\""}.join(",")  + '}')
-
-    String[] getUsedAndroidLanguages(){
-        Set<String> langs = new HashSet<>();
-        String[] resFolders = new File("app/src/main/res").list()
-        for(resFolder in resFolders){
-            if (resFolder.startsWith("values-")){
-                String[] files = new File("app/src/main/res/"+resFolder).list();
-                for (file in files){
-                    if (file.startsWith("strings") && file.endsWith(".xml")){
-                        langs.add(resFolder.replace("values-",""))
-                        break;
-                    }
+buildConfigField("String[]", "APPLICATION_LANGUAGES", '{' + getUsedAndroidLanguages().collect {"\"${it}\""}.join(",")  + '}')
+
+@SuppressWarnings(["UnnecessaryQualifiedReference", "SpellCheckingInspection"])
+static String[] getUsedAndroidLanguages() {
+    Set<String> langs = new HashSet<>()
+    new File('.').eachFileRecurse(groovy.io.FileType.DIRECTORIES) {
+        final foldername = it.name
+        if (foldername.startsWith('values-') && !it.canonicalPath.contains("build" + File.separator + "intermediates")) {
+            new File(it.toString()).eachFileRecurse(groovy.io.FileType.FILES) {
+                if (it.name.toLowerCase().endsWith(".xml") && it.getCanonicalFile().getText('UTF-8').contains("<string")) {
+                    langs.add(foldername.replace("values-", ""))
+
                 }
             }
         }
-        return langs.toArray(new String[langs.size()])
     }
+    return langs.toArray(new String[langs.size()])
+}
+
+ * Summary: Change language of this app. Restart app for changes to take effect
 
  * Define element in Preferences-XML:
     <!--suppress AndroidDomInspection -->

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
@@ -87,4 +87,8 @@
     <string name="pref_title__is_statusbar_hidden">Esconder barra de status</string>
     <string name="pref_summary__picture_quality__percent">Qualidade e tamanho. Valores altos causam mais tempo de carregamento. Dependendo do processador e o tamanho da imagem o app pode falhar se o valor extrapolar 25%.</string>
     <string name="pref_title__thumbnail_quality__percent">Qualidade da pré-visualização</string>
+
+    <!-- Language -->
+    <string name="pref_title__language">Idioma</string>
+    <string name="pref_desc__language">Muda o idioma do aplicativo. Reinicie o aplicativo para que as alterações entrem em vigor</string>
 </resources>