beta icon and fileprovider

(cherry picked from commit 462b605921)

AndorsTrail/app/build.gradle

@@ -12,12 +12,41 @@ android {
 
     buildTypes {
         release {
+            manifestPlaceholders icon_name: 'icon', fileproviderPath: 'AndorsTrail'
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
+        debug {
+            manifestPlaceholders icon_name: 'icon_beta', fileproviderPath: 'AndorsTrail.beta2'
+            applicationIdSuffix 'beta2'
+        }
     }
 }
 
 dependencies {
     implementation 'com.android.support:support-v4:28.0.0'
 }
+
+task copyRes(type: Copy) {
+    description "Copies the res folder to the modules res folder (& renames .tmx to .xml)"
+    from "${rootDir}/res"
+    into "${projectDir}/src/main/res"
+    rename "(.*)\\.tmx", "\$1.xml"
+}
+
+task copyTranslation(type: Copy) {
+    description("Copies the translation files to the modules translations folder")
+    from "${rootDir}/assets/translation"
+    into "${projectDir}/src/main/assets/translation"
+}
+
+task cleanup(type: Delete) {
+    description("Deletes the assets/translation and the res folder from the modules folder")
+    delete "${projectDir}/src/main/res", "${projectDir}/src/main/assets/translation"
+}
+
+afterEvaluate {
+    preBuild.dependsOn project.tasks.copyRes
+    preBuild.dependsOn project.tasks.copyTranslation
+    clean.dependsOn project.tasks.cleanup
+}

AndorsTrail/app/src/main/AndroidManifest.xml

@@ -27,7 +27,7 @@
 	<application 
 		android:name="com.gpl.rpg.AndorsTrail.AndorsTrailApplication"
 		android:label="@string/app_name" 
-		android:icon="@drawable/icon"
+		android:icon="@drawable/${icon_name}"
 		android:description="@string/app_description"
         android:allowBackup="true"
         android:theme="@style/AndorsTrailTheme_Blue"
@@ -67,7 +67,7 @@
 
         <provider
         android:name="android.support.v4.content.FileProvider"
-        android:authorities="com.gpl.rpg.AndorsTrail.fileprovider"
+        android:authorities="${applicationId}.fileprovider"
         android:grantUriPermissions="true"
         android:exported="false">
         <meta-data

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/util/AndroidStorage.java

@@ -99,7 +99,9 @@ public final class AndroidStorage {
 
     public static String getUrlForFile(Context context, File worldmap) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.FROYO && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            Uri uri = FileProvider.getUriForFile(context, "com.gpl.rpg.AndorsTrail.fileprovider", worldmap);
+            String applicationId = context.getPackageName();
+//            Uri uri = FileProvider.getUriForFile(context, "com.gpl.rpg.AndorsTrail.fileprovider", worldmap);
+            Uri uri = FileProvider.getUriForFile(context, applicationId + ".fileprovider", worldmap);
             return uri.toString();
         } else {
             return "file://" + worldmap.getAbsolutePath();

AndorsTrail/res/raw/conversationlist_sullengard.json

@@ -415,16 +415,6 @@
     {
         "id":"sullengard_mayor",
         "replies":[
-            {
-                "nextPhraseID":"sullengard_mayor_5",
-                "requires":[
-                    {
-                        "requireType":"factionScore",
-                        "requireID":"gold_contribute",
-                        "value":50000
-                    }
-                ]
-            },
             {
                 "nextPhraseID":"sullengard_mayor_10",
                 "requires":[
@@ -471,6 +461,16 @@
                     }
                 ]
             },
+            {
+                "nextPhraseID":"sullengard_mayor_5",
+                "requires":[
+                    {
+                        "requireType":"factionScore",
+                        "requireID":"gold_contribute",
+                        "value":50000
+                    }
+                ]
+            },
             {
                 "nextPhraseID":"sullengard_mayor_1"
             }
@@ -6505,6 +6505,23 @@
             {
                 "text":"Can you tell me about your 'business agreement' with your beer 'distributors'?",
                 "nextPhraseID":"sullengard_mayor_beer"
+            },
+            {
+                "text":"We want to contribute gold coins for your financial loss.",
+                "nextPhraseID":"sullengard_mayor_4",
+                "requires":[
+                    {
+                        "requireType":"factionScore",
+                        "requireID":"gold_contribute",
+                        "value":50000,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves04",
+                        "value":70
+                    }
+                ]
             }
         ]
     },
@@ -6515,16 +6532,50 @@
             {
                 "text":"How did you know that?",
                 "nextPhraseID":"sullengard_mayor_beer_letter_not_delivered_10"
+            },
+            {
+                "text":"We want to contribute gold coins for your financial loss.",
+                "nextPhraseID":"sullengard_mayor_4",
+                "requires":[
+                    {
+                        "requireType":"factionScore",
+                        "requireID":"gold_contribute",
+                        "value":50000,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves04",
+                        "value":70
+                    }
+                ]
             }
         ]
     },
     {
         "id":"sullengard_mayor_letter_delivered",
-        "message":"Than you for delivering my letter to Kealwea.",
+        "message":"Thank you for delivering my letter to Kealwea.",
         "replies":[
             {
                 "text":"How did you know?",
                 "nextPhraseID":"sullengard_mayor_beer_50"
+            },
+            {
+                "text":"We want to contribute gold coins for your financial loss.",
+                "nextPhraseID":"sullengard_mayor_4",
+                "requires":[
+                    {
+                        "requireType":"factionScore",
+                        "requireID":"gold_contribute",
+                        "value":50000,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves04",
+                        "value":70
+                    }
+                ]
             }
         ]
     },