beta icon

WhatsNew
map_tree_1+2.png changes

.gitignore

@@ -1 +1,22 @@
-/AndorsTrail/.idea/workspace.xml
+# Android ignores
+gen/
+bin/
+target/
+local.properties
+
+#IntelliJ
+.idea/
+out/production/
+out/test/
+*.iws
+*.ipr
+
+# Other
+.metadata
+.svn/
+
+/AndorsTrail/.gradle
+/AndorsTrail/gradle/wrapper
+/AndorsTrail/app/build/
+/AndorsTrail/app/debug/
+/AndorsTrail/app/release/

AndorsTrail/.gitignore

@@ -1,52 +0,0 @@
-gen/
-bin/
-target/
-local.properties
-app/build/intermediates/
-build/
-debug/
-release/
-.gradle/
-
-#IntelliJ
-.idea/
-out/production/
-out/test/
-*.iws
-*.ipr
-
-# Other
-.metadata
-.svn/
-
-
-#copied from  https://github.com/github/gitignore/blob/main/Gradle.gitignore
-.gradle
-**/build/
-!src/**/build/
-
-# Ignore Gradle GUI config
-gradle-app.setting
-
-# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-!gradle-wrapper.jar
-
-# Avoid ignore Gradle wrappper properties
-!gradle-wrapper.properties
-
-# Cache of project
-.gradletasknamecache
-
-# Eclipse Gradle plugin generated files
-# Eclipse Core
-.project
-# JDT-specific (Eclipse Java Development Tools)
-.classpath
-#copied from  https://github.com/github/gitignore/blob/main/Gradle.gitignore
-
-
-/AndorsTrail/.gradle
-/AndorsTrail/gradle/wrapper
-/AndorsTrail/app/build/
-/AndorsTrail/app/debug/
-/AndorsTrail/app/release/

AndorsTrail/app/build.gradle

@@ -1,84 +1,23 @@
 apply plugin: 'com.android.application'
 
 android {
-
-    compileSdkVersion 34
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
-        applicationId "com.gpl.rpg.AndorsTrail"
+        applicationId "com.gpl.rpg.AndorsTrail_beta2"
         minSdkVersion 14
-        targetSdkVersion 34
+        targetSdkVersion 30
     }
 
     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'
-			signingConfig signingConfigs.debug
-        }
-    }
-    namespace 'com.gpl.rpg.AndorsTrail'
-    
-    sourceSets {
-        main {
-            res.srcDirs = ['build/gen-res', 'src/main/res']
-            assets.srcDirs = ['build/gen-assets', 'src/main/assets']
-        }
     }
 }
 
 dependencies {
-    implementation 'androidx.legacy:legacy-support-v4:1.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}/build/gen-res"
-    rename "(.*)\\.tmx", "\$1.xml"
-}
-
-task copyResValuesIn(type: Copy) {
-    description "Exception Indonesian language code (Old IN was renamed to now ID)"
-    from "${rootDir}/res/values-id/"
-    into "${projectDir}/build/gen-res/values-in/"
-}
-
-task copyTranslation(type: Copy) {
-    description("Copies the translation files to the modules translations folder")
-    from "${rootDir}/assets/translation"
-    into "${projectDir}/build/gen-assets/translation"
-}
-
-task cleanup(type: Delete) {
-    description("Deletes the assets/translation and the res folder from the modules folder")
-    delete "${projectDir}/build/gen-res", "${projectDir}/build/gen-assets/translation"
-}
-
-afterEvaluate {
-    project.tasks.copyRes.dependsOn project.tasks.copyResValuesIn
-
-    mapReleaseSourceSetPaths.dependsOn project.tasks.copyRes
-    generateReleaseResources.dependsOn project.tasks.copyRes
-
-    generateDebugResources.dependsOn project.tasks.copyRes
-    mapDebugSourceSetPaths.dependsOn project.tasks.copyRes
-    mergeDebugResources.dependsOn project.tasks.copyRes
-    extractDeepLinksDebug.dependsOn project.tasks.copyRes
-    mergeReleaseResources.dependsOn project.tasks.copyRes
-    extractDeepLinksRelease.dependsOn project.tasks.copyRes
-
-    generateDebugResources.dependsOn project.tasks.copyTranslation
-    mapDebugSourceSetPaths.dependsOn project.tasks.copyTranslation
-    mergeDebugAssets.dependsOn project.tasks.copyTranslation
-    mergeReleaseAssets.dependsOn project.tasks.copyTranslation
-    extractDeepLinksDebug.dependsOn project.tasks.copyTranslation
-    extractDeepLinksRelease.dependsOn project.tasks.copyTranslation
-
-    clean.dependsOn project.tasks.cleanup
+    implementation 'com.android.support:support-v4:28.0.0'
 }

AndorsTrail/app/src/main/AndroidManifest.xml

@@ -2,12 +2,16 @@
 
 <manifest 
 	xmlns:android="http://schemas.android.com/apk/res/android" 
-	package="com.gpl.rpg.AndorsTrail"
-	android:versionCode="81"
-	android:versionName="0.8.14"
+	package="com.gpl.rpg.AndorsTrail_beta2"
+	android:versionCode="65"
+	android:versionName="0.8.1beta"
 	android:installLocation="auto"
 	>
-
+	<uses-sdk 
+		android:minSdkVersion="4"
+		android:targetSdkVersion="30"
+		/>
+	
 	<supports-screens
 		android:smallScreens="true" 
 		android:normalScreens="true"
@@ -21,9 +25,9 @@
 
 
 	<application 
-		android:name="com.gpl.rpg.AndorsTrail.AndorsTrailApplication"
+		android:name=".AndorsTrailApplication"
 		android:label="@string/app_name" 
-		android:icon="@drawable/${icon_name}"
+		android:icon="@drawable/icon_beta"
 		android:description="@string/app_description"
         android:allowBackup="true"
         android:theme="@style/AndorsTrailTheme_Blue"
@@ -31,9 +35,8 @@
 		android:hasFragileUserData="true"
 		android:preserveLegacyExternalStorage="true"
 		>
-		<activity
-			android:exported="true"
-		    android:name="com.gpl.rpg.AndorsTrail.activity.StartScreenActivity"
+		<activity 
+		    android:name=".activity.StartScreenActivity"
 		    android:clearTaskOnLaunch="true"
 		    >
 			<intent-filter>
@@ -42,29 +45,29 @@
 			</intent-filter>
 		</activity>
    		<activity 
-			android:name="com.gpl.rpg.AndorsTrail.activity.MainActivity"
+			android:name=".activity.MainActivity"
 			android:label="@string/app_name" 
 			android:theme="@style/AndorsTrailTheme_Blue.NoBackground"
 			/>
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.HeroinfoActivity" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.MonsterInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.ItemInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.LevelUpActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.MonsterEncounterActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.ConversationActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.ShopActivity" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.AboutActivity" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.LoadingActivity" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.Preferences" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.LoadSaveActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.ActorConditionInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.BulkSelectionInterface" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.SkillInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail.activity.DisplayWorldMapActivity" />
+		<activity android:name=".activity.HeroinfoActivity" />
+		<activity android:name=".activity.MonsterInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.ItemInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.LevelUpActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.MonsterEncounterActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.ConversationActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.ShopActivity" />
+		<activity android:name=".activity.AboutActivity" />
+		<activity android:name=".activity.LoadingActivity" />
+		<activity android:name=".activity.Preferences" />
+		<activity android:name=".activity.LoadSaveActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.ActorConditionInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.BulkSelectionInterface" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.SkillInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.DisplayWorldMapActivity" />
 
         <provider
-        android:name="androidx.core.content.FileProvider"
-        android:authorities="${applicationId}.fileprovider"
+        android:name="android.support.v4.content.FileProvider"
+        android:authorities="com.gpl.rpg.AndorsTrail_beta2.fileprovider"
         android:grantUriPermissions="true"
         android:exported="false">
         <meta-data

AndorsTrail/app/src/main/assets/translation/.gitignore

@@ -0,0 +1,20 @@
+# Android ignores
+gen/
+bin/
+target/
+local.properties
+
+#IntelliJ
+.idea/
+out/production/
+out/test/
+*.iws
+*.ipr
+
+# Other
+.metadata
+.svn/
+
+#/AndorsTrail/app/build/*
+#/AndorsTrail/app/release/*
+#/AndorsTrail/.gradle/*

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java

@@ -1,514 +0,0 @@
-package com.gpl.rpg.AndorsTrail.activity;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.R;
-import com.gpl.rpg.AndorsTrail.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.controller.Constants;
-import com.gpl.rpg.AndorsTrail.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail.model.map.MapObject;
-import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail.view.MainView;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.RelativeLayout;
-import android.widget.Toast;
-
-public final class DebugInterface {
-	private final ControllerContext controllerContext;
-	private final MainActivity mainActivity;
-	private final Resources res;
-	private final WorldContext world;
-
-	private DebugButton[] buttons;
-	private List<DebugButton> tpButtons  = new ArrayList<DebugButton>();
-	private List<DebugButton> tpButtons2 = new ArrayList<DebugButton>();
-	private List<DebugButton> tpButtons3 = new ArrayList<DebugButton>();
-
-	public DebugInterface(ControllerContext controllers, WorldContext world, MainActivity mainActivity) {
-		this.controllerContext = controllers;
-		this.world = world;
-		this.res = mainActivity.getResources();
-		this.mainActivity = mainActivity;
-	}
-
-	public void addDebugButtons() {
-		if (!AndorsTrailApplication.DEVELOPMENT_DEBUGBUTTONS) return;
-
-		List<DebugButton> buttonList = new ArrayList<DebugButton>();
-		buttonList.addAll(Arrays.asList(new DebugButton[] {
-				new DebugButton("dbg", new OnClickListener() {
-					boolean hidden = false;
-					@Override
-					public void onClick(View arg0) {
-						hidden = !hidden;
-						for (int i = 1; i < buttons.length; i++) {
-							buttons[i].b.setVisibility(hidden ? View.GONE : View.VISIBLE);
-						}
-						for (DebugButton b : tpButtons) {
-							b.b.setVisibility(View.GONE);
-						}
-						for (DebugButton b : tpButtons2) {
-							b.b.setVisibility(View.GONE);
-						}
-						for (DebugButton b : tpButtons3) {
-							b.b.setVisibility(View.GONE);
-						}
-					}
-				})
-				,new DebugButton("teleport", new OnClickListener() {
-			public void onClick(View arg0) {
-				for (int i = 0; i < buttons.length; i++) {
-					buttons[i].b.setVisibility(View.GONE);
-				}
-				for (DebugButton tpButton : tpButtons) {
-					tpButton.b.setVisibility(View.VISIBLE);
-				}
-			}
-		})
-				,new DebugButton("dmg", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				world.model.player.damagePotential.set(500, 500);
-				world.model.player.attackChance = 500;
-				world.model.player.attackCost = 1;
-				showToast(mainActivity, "DEBUG: damagePotential=500, chance=500%, cost=1", Toast.LENGTH_SHORT);
-			}
-		})
-				/*,new DebugButton("dmg=1", new OnClickListener() {
-                    @Override
-                    public void onClick(View arg0) {
-                        world.model.player.damagePotential.set(1, 1);
-                        showToast(mainActivity, "DEBUG: damagePotential=1", Toast.LENGTH_SHORT);
-                    }
-                })*/
-				,new DebugButton("itm", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				for (ItemType item : world.itemTypes.UNITTEST_getAllItemTypes().values()) {
-					world.model.player.inventory.addItem(item, 10);
-				}
-				world.model.player.inventory.gold += 50000;
-				showToast(mainActivity, "DEBUG: added items", Toast.LENGTH_SHORT);
-			}
-		})
-				,new DebugButton("xp", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.actorStatsController.addExperience(10000);
-				showToast(mainActivity, "DEBUG: given 10000 exp", Toast.LENGTH_SHORT);
-			}
-		})
-				,new DebugButton("rst", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				for(PredefinedMap map : world.maps.getAllMaps()) {
-					map.resetTemporaryData();
-				}
-				showToast(mainActivity, "DEBUG: maps respawned", Toast.LENGTH_SHORT);
-			}
-		})
-				,new DebugButton("hp", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				world.model.player.baseTraits.maxHP = 500;
-				world.model.player.health.max = world.model.player.baseTraits.maxHP;
-				controllerContext.actorStatsController.setActorMaxHealth(world.model.player);
-				world.model.player.conditions.clear();
-				showToast(mainActivity, "DEBUG: hp set to max", Toast.LENGTH_SHORT);
-			}
-		})
-				,new DebugButton("skl", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				world.model.player.availableSkillIncreases += 10;
-				showToast(mainActivity, "DEBUG: 10 skill points", Toast.LENGTH_SHORT);
-			}
-		})
-				,new DebugButton("spd", new OnClickListener() {
-			boolean fast = Constants.MINIMUM_INPUT_INTERVAL == Constants.MINIMUM_INPUT_INTERVAL_FAST;
-			@Override
-			public void onClick(View arg0) {
-				fast = !fast;
-				if (fast) {
-					Constants.MINIMUM_INPUT_INTERVAL = Constants.MINIMUM_INPUT_INTERVAL_FAST;
-				} else {
-					Constants.MINIMUM_INPUT_INTERVAL = Constants.MINIMUM_INPUT_INTERVAL_STD;
-				}
-				MainView.SCROLL_DURATION = Constants.MINIMUM_INPUT_INTERVAL;
-				AndorsTrailApplication.getApplicationFromActivity(mainActivity).getControllerContext().movementController.resetMovementHandler();
-			}
-		})
-				,new DebugButton("map", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				showToast(mainActivity, "DEBUG: map=" + world.model.currentMaps.map.name , Toast.LENGTH_SHORT);
-			}
-		})
-				,new DebugButton("tim", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				world.model.worldData.tickWorldTime(10);
-			}
-		})
-		}));
-
-		tpButtons.addAll(Arrays.asList(new DebugButton[] {
-				new DebugButton("teleport", new OnClickListener() {
-					@Override
-					public void onClick(View arg0) {
-						for (DebugButton tpButton : tpButtons2) {
-							tpButton.b.setVisibility(View.VISIBLE);
-						}
-						for (DebugButton tpButton : tpButtons) {
-							tpButton.b.setVisibility(View.GONE);
-						}
-					}
-				})
-				,new DebugButton("cg", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "crossglen", "hall", 0, 0);
-			}
-		})
-				,new DebugButton("vg", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "vilegard_s", "tavern", 0, 0);
-			}
-		})
-				,new DebugButton("cr", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "crossroads", "middle", 0, 0);
-			}
-		})
-				,new DebugButton("lf", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "loneford9", "south", 0, 0);
-			}
-		})
-				,new DebugButton("fh", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "fallhaven_ne", "clothes", 0, 0);
-			}
-		})
-				,new DebugButton("prm", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "blackwater_mountain29", "south", 0, 0);
-			}
-		})
-				,new DebugButton("bwm", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "blackwater_mountain43", "south", 0, 0);
-			}
-		})
-				,new DebugButton("rmg", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "remgard0", "east", 0, 0);
-			}
-		})
-				,new DebugButton("chr", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "waytolostmine2", "minerhouse4", 0, 0);
-			}
-		})
-				,new DebugButton("ldr", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "lodarhouse0", "lodarhouse", 0, 0);
-			}
-		})
-				,new DebugButton("sf", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "wild20", "south2", 0, 0);
-			}
-		})
-				,new DebugButton("gm", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "guynmart_wood_1", "farmhouse", 0, 0);
-			}
-		})
-		}));
-		buttonList.addAll(tpButtons);
-
-		tpButtons2.addAll(Arrays.asList(new DebugButton[] {
-				new DebugButton("teleport", new OnClickListener() {
-					@Override
-					public void onClick(View arg0) {
-						for (DebugButton tpButton : tpButtons3) {
-							tpButton.b.setVisibility(View.VISIBLE);
-						}
-						for (DebugButton tpButton : tpButtons2) {
-							tpButton.b.setVisibility(View.GONE);
-						}
-					}
-				})
-				,new DebugButton("brv", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "brimhaven4", "south2", 0, 0);
-			}
-		})
-				,new DebugButton("aru", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "mountainlake5", "north", 0, 0);
-			}
-		})
-				,new DebugButton("ws", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "woodsettlement0", "east", 0, 0);
-			}
-		})
-				,new DebugButton("sul", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "sullengard2", "south", 0, 0);
-			}
-		})
-				,new DebugButton("gal", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "galmore_19", "south", 0, 0);
-			}
-		})
-
-				,new DebugButton("apl", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "sullengard_apple_farm_east", "house", 0, 0);
-			}
-		})
-
-				,new DebugButton("wch", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "lake_shore_road_0", "west", 0, 0);
-			}
-		})
-
-				,new DebugButton("la1", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "laerothisland2", "south2", 0, 0);
-			}
-		})
-
-				,new DebugButton("la2", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "island3", "cave", 0, 0);
-			}
-		})
-
-				,new DebugButton("wx", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "wexlow_village", "north", 0, 0);
-			}
-		})
-
-				,new DebugButton("fey", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "guynmart_wood_17", "north", 0, 0);
-			}
-		})
-
-
-		}));
-		buttonList.addAll(tpButtons2);
-
-		tpButtons3.addAll(Arrays.asList(new DebugButton[] {
-				new DebugButton("teleport", new OnClickListener() {
-					@Override
-					public void onClick(View arg0) {
-						for (int i = 0; i < buttons.length; i++) {
-							buttons[i].b.setVisibility(View.VISIBLE);
-						}
-						for (DebugButton tpButton : tpButtons) {
-							tpButton.b.setVisibility(View.GONE);
-						}
-						for (DebugButton tpButton : tpButtons2) {
-							tpButton.b.setVisibility(View.GONE);
-						}
-						for (DebugButton tpButton : tpButtons3) {
-							tpButton.b.setVisibility(View.GONE);
-						}
-					}
-				})
-				,new DebugButton("#1", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "lake_shore_road_9", "north", 5, 0);
-			}
-		})
-
-				,new DebugButton("#2", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "waytolake12", "tower_door", 0, 0);
-			}
-		})
-
-
-				,new DebugButton("#3", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "galmore_cavea", "up", 0, 0);
-			}
-		})
-
-				,new DebugButton("#4", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "galmore_35", "south", 11, 0);
-			}
-		})
-
-				,new DebugButton("#5", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "way_to_sullengard_west_5", "east", 0, 5);
-			}
-		})
-
-				,new DebugButton("#6", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "galmore_32", "south", 19, 0);
-			}
-		})
-
-				,new DebugButton("#7", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "cabin_norcity_road1", "north", 5, 0);
-			}
-		})
-
-				,new DebugButton("#8", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "wayto_feygard_duleian_2", "south", 0, 5);
-			}
-		})
-
-				,new DebugButton("#9", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "galmore_58", "north", 0, 0);
-			}
-		})
-
-				,new DebugButton("#10", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "moesforest_03", "north1", 0, 0);
-			}
-		})
-
-				,new DebugButton("#11", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "galmore_17", "outside", 0, 0);
-			}
-		})
-
-				,new DebugButton("#12", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "galmore_48", "west", 0, 10);
-			}
-		})
-
-				,new DebugButton("#13", new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "wild18", "south", 6, 0);
-			}
-		})
-
-		}));
-		buttonList.addAll(tpButtons3);
-
-		buttons = buttonList.toArray(new DebugButton[buttonList.size()]);
-		addDebugButtons(buttons);
-
-		for (DebugButton b : tpButtons) {
-			b.b.setVisibility(View.GONE);
-		}
-		for (DebugButton b : tpButtons2) {
-			b.b.setVisibility(View.GONE);
-		}
-		for (DebugButton b : tpButtons3) {
-			b.b.setVisibility(View.GONE);
-		}
-	}
-
-	private void showToast(Context context, String msg, int duration) {
-		Toast.makeText(context, msg, duration).show();
-	}
-
-	private static class DebugButton {
-		public final String text;
-		public final OnClickListener listener;
-		public Button b = null;
-		public DebugButton(String text, OnClickListener listener) {
-			this.text = text;
-			this.listener = listener;
-		}
-		public void makeButton(Context c, int id) {
-			b = new Button(c);
-			b.setText(text);
-			b.setTextSize(10);//res.getDimension(R.dimen.actionbar_text));
-			b.setId(id);
-			b.setOnClickListener(listener);
-		}
-	}
-
-	private void addDebugButton(DebugButton button, int id, RelativeLayout layout) {
-		if (!AndorsTrailApplication.DEVELOPMENT_DEBUGBUTTONS) return;
-
-		RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, res.getDimensionPixelSize(R.dimen.smalltext_buttonheight));
-		if (id == 1)
-			lp.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
-		else
-			lp.addRule(RelativeLayout.RIGHT_OF, id - 1);
-		lp.addRule(RelativeLayout.ABOVE, R.id.main_statusview);
-		button.makeButton(mainActivity, id);
-		button.b.setLayoutParams(lp);
-		layout.addView(button.b);
-	}
-
-	private void addDebugButtons(DebugButton[] buttons) {
-		if (!AndorsTrailApplication.DEVELOPMENT_DEBUGBUTTONS) return;
-
-		if (buttons == null || buttons.length <= 0) return;
-		RelativeLayout layout = (RelativeLayout) mainActivity.findViewById(R.id.main_container);
-
-		int id = 1;
-		for (DebugButton b : buttons) {
-			addDebugButton(b, id, layout);
-			++id;
-		}
-	}
-}

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java

@@ -1,876 +0,0 @@
-package com.gpl.rpg.AndorsTrail.activity;
-
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-
-import android.Manifest;
-import android.app.Activity;
-import android.content.ClipData;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import androidx.annotation.RequiresApi;
-import androidx.documentfile.provider.DocumentFile;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.view.ViewGroup.LayoutParams;
-import android.widget.Button;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail.R;
-import com.gpl.rpg.AndorsTrail.controller.Constants;
-import com.gpl.rpg.AndorsTrail.model.ModelContainer;
-import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
-import com.gpl.rpg.AndorsTrail.savegames.Savegames;
-import com.gpl.rpg.AndorsTrail.savegames.Savegames.FileHeader;
-import com.gpl.rpg.AndorsTrail.util.AndroidStorage;
-import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
-import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
-import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory.CustomDialog;
-
-public final class LoadSaveActivity extends AndorsTrailBaseActivity implements OnClickListener {
-    private boolean isLoading = true;
-    //region special slot numbers
-    private static final int SLOT_NUMBER_CREATE_NEW_SLOT = -1;
-    public static final int SLOT_NUMBER_EXPORT_SAVEGAMES = -2;
-    public static final int SLOT_NUMBER_IMPORT_SAVEGAMES = -3;
-    public static final int SLOT_NUMBER_IMPORT_WORLDMAP = -4;
-    private static final int SLOT_NUMBER_FIRST_SLOT = 1;
-    //endregion
-    private ModelContainer model;
-    private TileManager tileManager;
-    private AndorsTrailPreferences preferences;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        setTheme(ThemeHelper.getDialogTheme());
-        super.onCreate(savedInstanceState);
-
-        final AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-        app.setWindowParameters(this);
-        this.model = app.getWorld().model;
-        this.preferences = app.getPreferences();
-        this.tileManager = app.getWorld().tileManager;
-
-        String loadsave = getIntent().getData().getLastPathSegment();
-        isLoading = (loadsave.equalsIgnoreCase("load"));
-
-        setContentView(R.layout.loadsave);
-
-        TextView tv = (TextView) findViewById(R.id.loadsave_title);
-        if (isLoading) {
-            tv.setCompoundDrawablesWithIntrinsicBounds(android.R.drawable.ic_menu_search, 0, 0, 0);
-            tv.setText(R.string.loadsave_title_load);
-        } else {
-            tv.setCompoundDrawablesWithIntrinsicBounds(android.R.drawable.ic_menu_save, 0, 0, 0);
-            tv.setText(R.string.loadsave_title_save);
-        }
-
-        ViewGroup slotList = (ViewGroup) findViewById(R.id.loadsave_slot_list);
-        Button slotTemplateButton = (Button) findViewById(R.id.loadsave_slot_n);
-        LayoutParams params = slotTemplateButton.getLayoutParams();
-        slotList.removeView(slotTemplateButton);
-
-        ViewGroup newSlotContainer = (ViewGroup) findViewById(R.id.loadsave_save_to_new_slot_container);
-        Button createNewSlot = (Button) findViewById(R.id.loadsave_save_to_new_slot);
-
-        Button exportSaves = (Button) findViewById(R.id.loadsave_export_save);
-        Button importSaves = (Button) findViewById(R.id.loadsave_import_save);
-        Button importWorldmap = (Button) findViewById(R.id.loadsave_import_worldmap);
-
-        exportSaves.setTag(SLOT_NUMBER_EXPORT_SAVEGAMES);
-        importSaves.setTag(SLOT_NUMBER_IMPORT_SAVEGAMES);
-        importWorldmap.setTag(SLOT_NUMBER_IMPORT_WORLDMAP);
-
-        ViewGroup exportImportContainer = (ViewGroup) findViewById(R.id.loadsave_export_import_save_container);
-
-
-        addSavegameSlotButtons(slotList, params, Savegames.getUsedSavegameSlots(this));
-
-        checkAndRequestPermissions();
-
-        if (!isLoading) {
-            createNewSlot.setTag(SLOT_NUMBER_CREATE_NEW_SLOT);
-            createNewSlot.setOnClickListener(this);
-            newSlotContainer.setVisibility(View.VISIBLE);
-            exportImportContainer.setVisibility(View.GONE);
-        } else {
-            newSlotContainer.setVisibility(View.GONE);
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                exportSaves.setOnClickListener(this);
-                importSaves.setOnClickListener(this);
-                importWorldmap.setOnClickListener(this);
-                exportImportContainer.setVisibility(View.VISIBLE);
-
-                boolean hasSavegames = !Savegames.getUsedSavegameSlots(this).isEmpty();
-                exportSaves.setEnabled(hasSavegames);
-            } else {
-                exportImportContainer.setVisibility(View.GONE);
-            }
-        }
-    }
-
-    private static final int READ_EXTERNAL_STORAGE_REQUEST = 1;
-    private static final int WRITE_EXTERNAL_STORAGE_REQUEST = 2;
-
-    private void checkAndRequestPermissions() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
-            && Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
-            if (getApplicationContext().checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE)
-                != PackageManager.PERMISSION_GRANTED) {
-                this.requestPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE},
-                                        READ_EXTERNAL_STORAGE_REQUEST);
-            }
-            if (getApplicationContext().checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                != PackageManager.PERMISSION_GRANTED) {
-                this.requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
-                                        WRITE_EXTERNAL_STORAGE_REQUEST);
-            }
-        }
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-        if (grantResults.length > 0 && grantResults[0] != PackageManager.PERMISSION_GRANTED) {
-            Toast.makeText(this, R.string.storage_permissions_mandatory, Toast.LENGTH_LONG).show();
-            ((AndorsTrailApplication) getApplication()).discardWorld();
-            finish();
-        }
-    }
-
-    private void addSavegameSlotButtons(ViewGroup parent,
-                                        LayoutParams params,
-                                        List<Integer> usedSavegameSlots) {
-        int unused = 1;
-        for (int slot : usedSavegameSlots) {
-            final FileHeader header = Savegames.quickload(this, slot);
-            if (header == null) {
-                continue;
-            }
-
-            while (unused < slot) {
-                Button b = new Button(this);
-                b.setLayoutParams(params);
-                b.setTag(unused);
-                b.setOnClickListener(this);
-                b.setText(getString(R.string.loadsave_empty_slot, unused));
-                tileManager.setImageViewTileForPlayer(getResources(), b, header.iconID);
-                parent.addView(b, params);
-                unused++;
-            }
-            unused++;
-
-            Button b = new Button(this);
-            b.setLayoutParams(params);
-            b.setTag(slot);
-            b.setOnClickListener(this);
-            b.setText(slot + ". " + header.describe());
-            tileManager.setImageViewTileForPlayer(getResources(), b, header.iconID);
-            parent.addView(b, params);
-        }
-    }
-
-    private void cancelLoadSaveActivity(int slot) {
-        completeLoadSaveActivity(slot, false);
-    }
-
-    private void completeLoadSaveActivity(int slot) {
-        completeLoadSaveActivity(slot, true);
-    }
-
-    private void completeLoadSaveActivity(int slot, boolean success) {
-        Intent i = new Intent();
-        if (slot == SLOT_NUMBER_CREATE_NEW_SLOT) {
-            slot = getFirstFreeSlot();
-        } else if (slot == SLOT_NUMBER_EXPORT_SAVEGAMES
-                   || slot == SLOT_NUMBER_IMPORT_SAVEGAMES
-                   || slot == SLOT_NUMBER_IMPORT_WORLDMAP) {
-            i.putExtra("import_export", true);
-
-            if (slot == SLOT_NUMBER_IMPORT_WORLDMAP) {
-                i.putExtra("import_worldmap", true);
-            }
-            if (slot == SLOT_NUMBER_IMPORT_SAVEGAMES) {
-                i.putExtra("import_savegames", true);
-            }
-            if (slot == SLOT_NUMBER_EXPORT_SAVEGAMES) {
-                i.putExtra("export", true);
-            }
-
-        } else if (slot < SLOT_NUMBER_FIRST_SLOT) {
-            slot = SLOT_NUMBER_FIRST_SLOT;
-        }
-
-        i.putExtra("slot", slot);
-        if (success) {
-            setResult(Activity.RESULT_OK, i);
-        } else {
-            setResult(Activity.RESULT_CANCELED, i);
-        }
-        LoadSaveActivity.this.finish();
-    }
-
-    private int getFirstFreeSlot() {
-        int slot;
-        List<Integer> usedSlots = Savegames.getUsedSavegameSlots(this);
-        if (usedSlots.isEmpty()) {
-            slot = SLOT_NUMBER_FIRST_SLOT;
-        } else {
-            slot = Collections.max(usedSlots) + 1;
-        }
-        return slot;
-    }
-
-    private String getConfirmOverwriteQuestion(int slot) {
-        if (isLoading) {
-            return null;
-        }
-
-        return getConfirmOverwriteQuestionIgnoringLoading(slot);
-    }
-
-    private String getConfirmOverwriteQuestionIgnoringLoading(int slot) {
-        if (slot == SLOT_NUMBER_CREATE_NEW_SLOT) {
-            return null;//creating a new savegame
-        }
-
-        if (!Savegames.getSlotFile(slot, this).exists()) {
-            return null;//nothing in slot to overwrite
-        }
-
-        if (preferences.displayOverwriteSavegame
-            == AndorsTrailPreferences.CONFIRM_OVERWRITE_SAVEGAME_ALWAYS) {
-            return getString(R.string.loadsave_save_overwrite_confirmation_all);
-        }
-        if (preferences.displayOverwriteSavegame == AndorsTrailPreferences.CONFIRM_OVERWRITE_SAVEGAME_NEVER) {
-            return null;
-        }
-
-        final String currentPlayerName = model.player.getName();
-        final FileHeader header = Savegames.quickload(this, slot);
-        if (header == null) {
-            return null;
-        }
-
-        final String savedPlayerName = header.playerName;
-        if (currentPlayerName.equals(savedPlayerName)) {
-            return null; //if the names match
-        }
-
-        return getString(R.string.loadsave_save_overwrite_confirmation, savedPlayerName, currentPlayerName);
-    }
-
-    @Override
-    public void onClick(View view) {
-        final int slot = (Integer) view.getTag();
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            switch (slot) {
-                case SLOT_NUMBER_IMPORT_WORLDMAP:
-                    clickImportWorldmap();
-                    return;
-                case SLOT_NUMBER_IMPORT_SAVEGAMES:
-                    clickImportSaveGames();
-                    return;
-                case SLOT_NUMBER_EXPORT_SAVEGAMES:
-                    clickExportSaveGames();
-                    return;
-            }
-        }
-        if (!isLoading
-            && slot != SLOT_NUMBER_CREATE_NEW_SLOT
-            && AndorsTrailApplication.CURRENT_VERSION
-               == AndorsTrailApplication.DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION) {
-            if (!isOverwriteTargetInIncompatibleVersion(slot)) {
-                saveOrOverwriteSavegame(slot);
-            }
-        } else if (isLoading) {
-            loadSaveGame(slot);
-        } else {
-            saveOrOverwriteSavegame(slot);
-        }
-    }
-
-    private void saveOrOverwriteSavegame(int slot) {
-        final String message = getConfirmOverwriteQuestion(slot);
-        if (message != null) {
-            showConfirmOverwriteQuestion(slot, message);
-        } else {
-            completeLoadSaveActivity(slot);
-        }
-    }
-
-    private boolean isOverwriteTargetInIncompatibleVersion(int slot) {
-        final FileHeader header = Savegames.quickload(this, slot);
-        if (header != null
-            && header.fileversion != AndorsTrailApplication.DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION) {
-            final CustomDialog d = CustomDialogFactory.createErrorDialog(this,
-                                                                         "Overwriting not allowed",
-                                                                         "You are currently using a development version of Andor's trail. Overwriting a regular savegame is not allowed in development mode.");
-            CustomDialogFactory.show(d);
-            return true;
-        }
-        return false;
-    }
-
-    //region Imports/Exports
-
-    //region Export
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void exportSaveGames(Intent data) {
-        Uri uri = data.getData();
-
-        Context context = getApplicationContext();
-        ContentResolver resolver = AndorsTrailApplication.getApplicationFromActivity(this)
-                                                         .getContentResolver();
-
-        File storageDir = AndroidStorage.getStorageDirectory(context,
-                                                             Constants.FILENAME_SAVEGAME_DIRECTORY);
-        DocumentFile target = DocumentFile.fromTreeUri(context, uri);
-        if (target == null) {
-            return;
-        }
-
-        File[] files = storageDir.listFiles();
-        if (files == null) {
-            showErrorExportingSaveGamesUnknown();
-            return;
-        }
-
-        boolean hasExistingFiles = false;
-        for (File file : files) {
-            String fileName = file.getName();
-
-            DocumentFile existingFile = target.findFile(fileName);
-            if (existingFile != null) {
-                hasExistingFiles = true;
-                break;
-            }
-        }
-
-        if (hasExistingFiles) {
-            showConfirmOverwriteByExportQuestion(resolver, target, files);
-        } else {
-            exportSaveGamesFolderContentToFolder(target, files);
-        }
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void exportSaveGamesFolderContentToFolder(DocumentFile target, File[] files) {
-        DocumentFile[] sourceFiles = new DocumentFile[files.length];
-
-        File[] worldmapFiles = null;
-
-        for (int i = 0; i < files.length; i++) {
-            File file = files[i];
-            if (file.isFile()) {
-                sourceFiles[i] = DocumentFile.fromFile(file);
-            } else if (file.isDirectory() && Objects.equals(file.getName(),
-                                                            Constants.FILENAME_WORLDMAP_DIRECTORY)) {
-                worldmapFiles = file.listFiles();
-            }
-        }
-        Context context = this;
-        File[] finalWorldmapFiles = worldmapFiles;
-        CopyFilesToExternalFolder(target, sourceFiles, context, finalWorldmapFiles);
-
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void CopyFilesToExternalFolder(DocumentFile target,
-                                           DocumentFile[] sourceFiles,
-                                           Context context,
-                                           File[] finalWorldmapFiles) {
-        AndroidStorage.copyDocumentFilesToDirAsync(sourceFiles,
-                                                   context,
-                                                   target,
-                                                   getString(R.string.loadsave_exporting_savegames),
-                                                   (success) -> {
-                                                       if (success) {
-                                                           CopyWorldmapFilesAsZip(target,
-                                                                                  context,
-                                                                                  finalWorldmapFiles);
-                                                       } else {
-                                                           completeLoadSaveActivity(
-                                                                   SLOT_NUMBER_EXPORT_SAVEGAMES,
-                                                                   false);
-                                                       }
-                                                   });
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void CopyWorldmapFilesAsZip(DocumentFile target,
-                                        Context context,
-                                        File[] finalWorldmapFiles) {
-        AndroidStorage.createZipDocumentFileFromFilesAsync(finalWorldmapFiles,
-                                                           context,
-                                                           target,
-                                                           Constants.FILENAME_WORLDMAP_DIRECTORY,
-                                                           getString(R.string.loadsave_exporting_worldmap),
-                                                           (successWorldmap) -> completeLoadSaveActivity(
-                                                                   SLOT_NUMBER_EXPORT_SAVEGAMES,
-                                                                   successWorldmap));
-    }
-
-    //endregion
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void importSaveGames(Intent data) {
-        Uri uri = data.getData();
-        ClipData uris = data.getClipData();
-
-        if (uri == null && uris == null) {
-            //no file was selected
-            return;
-        }
-
-        Context context = getApplicationContext();
-        ContentResolver resolver = AndorsTrailApplication.getApplicationFromActivity(this)
-                .getContentResolver();
-
-        File storageDir = AndroidStorage.getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY);
-        DocumentFile appSavegameFolder = DocumentFile.fromFile(storageDir);
-
-        List<Uri> uriList = new ArrayList<>();
-        if (uri != null) {
-            uriList.add(uri);
-        } else {
-            for (int i = 0; i < uris.getItemCount(); i++) {
-                uriList.add(uris.getItemAt(i).getUri());
-            }
-        }
-        importSaveGamesFromUris(context, resolver, appSavegameFolder, uriList);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void importSaveGamesFromUris(Context context,
-                                         ContentResolver resolver,
-                                         DocumentFile appSavegameFolder,
-                                         List<Uri> uriList) {
-        int count = uriList.size();
-
-        ArrayList<DocumentFile> alreadyExistingFiles = new ArrayList<>();
-        ArrayList<DocumentFile> newFiles = new ArrayList<>();
-
-        for (int i = 0; i < count; i++) {
-            Uri item = uriList.get(i);
-            DocumentFile itemFile = DocumentFile.fromSingleUri(context, item);
-            boolean fileAlreadyExists = getExistsSavegameInOwnFiles(itemFile, appSavegameFolder);
-            if (fileAlreadyExists) {
-                alreadyExistingFiles.add(itemFile);
-            } else {
-                newFiles.add(itemFile);
-            }
-        }
-
-        if (alreadyExistingFiles.size() > 0) {
-            showConfirmOverwriteByImportQuestion(resolver, appSavegameFolder, alreadyExistingFiles, newFiles);
-        } else {
-            importSaveGames(resolver, appSavegameFolder, newFiles);
-        }
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void importSaveGames(ContentResolver resolver,
-                                 DocumentFile appSavegameFolder,
-                                 List<DocumentFile> saveFiles) {
-        int size = saveFiles.size();
-        DocumentFile[] sources = new DocumentFile[size];
-        DocumentFile[] targets = new DocumentFile[size];
-
-        boolean saveAsNew = false;
-        for (int i = 0; i < size; i++) {
-            DocumentFile file = saveFiles.get(i);
-            if (file == null) {//null is value a marker that the next should be saved as new
-                saveAsNew = true;
-                continue;
-            }
-
-            int slot = getSlotFromSavegameFileName(file.getName());
-            if (slot == -1) {
-                //invalid file name
-                continue;
-            }
-
-            if (saveAsNew) {
-                slot = getFirstFreeSlot();
-                saveAsNew = false;
-            }
-
-            String targetName = Savegames.getSlotFileName(slot);
-            sources[i] = file;
-            targets[i] = getOrCreateDocumentFile(appSavegameFolder, targetName);
-        }
-
-        AndroidStorage.copyDocumentFilesFromToAsync(sources,
-                                                    this,
-                                                    targets,
-                                                    getString(R.string.loadsave_importing_savegames),
-                                                    (sucess) -> completeLoadSaveActivity(
-                                                            SLOT_NUMBER_IMPORT_SAVEGAMES,
-                                                            sucess));
-    }
-
-    private boolean getExistsSavegameInOwnFiles(DocumentFile savegameFile, DocumentFile appSavegameFolder) {
-        if (savegameFile == null) {
-            return false;
-        }
-
-        DocumentFile foundFile = appSavegameFolder.findFile(Objects.requireNonNull(savegameFile.getName()));
-        return foundFile != null && foundFile.exists();
-    }
-
-    private int getSlotFromSavegameFileName(String fileName) {
-        if (fileName == null || !fileName.startsWith(Constants.FILENAME_SAVEGAME_FILENAME_PREFIX)) {
-            return -1;
-        }
-        String slotStr = fileName.substring(Constants.FILENAME_SAVEGAME_FILENAME_PREFIX.length());
-
-        int slot;
-        try {
-            slot = Integer.parseInt(slotStr);
-            return slot;
-        } catch (NumberFormatException e) {
-            return -1;
-        }
-    }
-
-    private DocumentFile getOrCreateDocumentFile(DocumentFile folder, String targetName) {
-        DocumentFile targetFile = folder.findFile(targetName);//try finding the file
-        if (targetFile == null)//no file found, creating new one
-        {
-            targetFile = folder.createFile(Constants.NO_FILE_EXTENSION_MIME_TYPE, targetName);
-        }
-        return targetFile;
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void importWorldmap(Intent data) {
-        Uri uri = data.getData();
-
-        Context context = AndorsTrailApplication.getApplicationFromActivity(this).getApplicationContext();
-
-        DocumentFile chosenZip = DocumentFile.fromSingleUri(context, uri);
-        if (chosenZip == null || !chosenZip.isFile()) {
-            showErrorImportingWorldmapWrongDirectory();
-            return;
-        }
-        String chosenZipName = chosenZip.getName();
-        if (!chosenZipName.startsWith(Constants.FILENAME_WORLDMAP_DIRECTORY)) {
-            showErrorImportingWorldmapWrongDirectory();
-            return;
-        }
-
-        File ownWorldmapFolder = getOwnWorldmapFolder(context);
-
-
-        AndroidStorage.unzipDocumentFileToDirectoryAsync(chosenZip,
-                                                         this,
-                                                         ownWorldmapFolder,
-                                                         false,
-                                                         getString(R.string.loadsave_importing_worldmap),
-                                                         (success) -> completeLoadSaveActivity(
-                                                                 SLOT_NUMBER_IMPORT_WORLDMAP,
-                                                                 success));
-    }
-
-    private File getOwnWorldmapFolder(Context context) {
-        File storageDir = AndroidStorage.getStorageDirectory(context, Constants.FILENAME_SAVEGAME_DIRECTORY);
-        File ownWorldmapFolder = null;
-        for (File f : storageDir.listFiles()) {
-            if (f.getName().equals(Constants.FILENAME_WORLDMAP_DIRECTORY)) {
-                ownWorldmapFolder = f;
-                break;
-            }
-        }
-        if (ownWorldmapFolder == null) {
-            ownWorldmapFolder = new File(storageDir, Constants.FILENAME_WORLDMAP_DIRECTORY);
-            ownWorldmapFolder.mkdir();
-        }
-        return ownWorldmapFolder;
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void clickExportSaveGames() {
-        showStartExportInfo(view -> startActivityForResult(AndroidStorage.getNewOpenDirectoryIntent(),
-                                                           -SLOT_NUMBER_EXPORT_SAVEGAMES));
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void clickImportSaveGames() {
-        showStartImportSavesInfo(view -> startActivityForResult(AndroidStorage.getNewSelectMultipleSavegameFilesIntent(),
-                                                                -SLOT_NUMBER_IMPORT_SAVEGAMES));
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void clickImportWorldmap() {
-        showStartImportWorldmapInfo(view -> startActivityForResult(AndroidStorage.getNewSelectZipIntent(),
-                                                                   -SLOT_NUMBER_IMPORT_WORLDMAP));
-
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void showConfirmOverwriteByExportQuestion(ContentResolver resolver,
-                                                      DocumentFile targetFolder,
-                                                      File[] files) {
-        final CustomDialog d = CustomDialogFactory.createDialog(this,
-                                                                getString(R.string.loadsave_export_overwrite_confirmation_title),
-                                                                getResources().getDrawable(android.R.drawable.ic_dialog_alert),
-                                                                getString(R.string.loadsave_export_overwrite_confirmation),
-                                                                null,
-                                                                true);
-
-        CustomDialogFactory.addButton(d,
-                                      android.R.string.yes,
-                                      v -> exportSaveGamesFolderContentToFolder(targetFolder, files));
-        CustomDialogFactory.addDismissButton(d, android.R.string.no);
-
-        CustomDialogFactory.show(d);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void showConfirmOverwriteByImportQuestion(ContentResolver resolver,
-                                                      DocumentFile appSavegameFolder,
-                                                      List<DocumentFile> alreadyExistingFiles,
-                                                      List<DocumentFile> newFiles) {
-        final String title = getString(R.string.loadsave_import_overwrite_confirmation_title);
-        String message = getString(R.string.loadsave_import_file_exists_question);
-
-        StringBuilder sb = new StringBuilder();
-        sb.append('\n');
-        int amount = alreadyExistingFiles.size();
-
-        Context context = AndorsTrailApplication.getApplicationFromActivity(this).getApplicationContext();
-
-        ArrayList<CustomDialog> dialogs = new ArrayList<>(amount);
-
-        for (int i = 0; i < amount; i++) {
-            DocumentFile alreadyExistingFile = alreadyExistingFiles.get(i);
-            int slot = getSlotFromSavegameFileName(alreadyExistingFile.getName());
-            FileHeader existingFileHeader = Savegames.quickload(context, slot);
-            FileHeader importedFileHeader = null;
-            try (InputStream stream = resolver.openInputStream(alreadyExistingFile.getUri());
-                 DataInputStream dataStream = new DataInputStream(stream)) {
-                importedFileHeader = new FileHeader(dataStream, true);
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
-                continue;
-            } catch (IOException e) {
-                e.printStackTrace();
-                continue;
-            }
-
-            StringBuilder messageSb = new StringBuilder();
-            String existingFileDescription = getString(R.string.loadsave_import_existing_description,
-                                                       Integer.toString(slot),
-                                                       existingFileHeader.describe());
-            String importedFileDescription = getString(R.string.loadsave_import_imported_description,
-                                                       Integer.toString(slot),
-                                                       importedFileHeader.describe());
-            messageSb.append(getString(R.string.loadsave_import_file_exists_question,
-                                       existingFileDescription,
-                                       importedFileDescription));
-
-
-            String m = messageSb.toString();
-            CustomDialog dialog = CustomDialogFactory.createDialog(this,
-                                                                   title,
-                                                                   getResources().getDrawable(android.R.drawable.ic_dialog_alert),
-                                                                   m,
-                                                                   null,
-                                                                   true,
-                                                                   false,
-                                                                   true);
-
-            CustomDialogFactory.addButton(dialog, R.string.loadsave_import_option_keep_existing, v -> {
-                //do nothing
-                GoToNextConflictOrFinish(resolver, appSavegameFolder, newFiles, dialogs);
-            });
-
-            CustomDialogFactory.addButton(dialog, R.string.loadsave_import_option_keep_imported, v -> {
-                newFiles.add(alreadyExistingFile);
-                GoToNextConflictOrFinish(resolver, appSavegameFolder, newFiles, dialogs);
-            });
-
-            CustomDialogFactory.addButton(dialog, R.string.loadsave_import_option_add_as_new, v -> {
-                newFiles.add(null);//add a null element as marker to know later if the next file
-                // should be imported as new or overwrite the existing one
-                newFiles.add(alreadyExistingFile);
-                GoToNextConflictOrFinish(resolver, appSavegameFolder, newFiles, dialogs);
-            });
-
-            CustomDialogFactory.addCancelButton(dialog, android.R.string.cancel);
-            CustomDialogFactory.setCancelListener(dialog, v -> {
-                completeLoadSaveActivity(SLOT_NUMBER_IMPORT_SAVEGAMES, false);
-            });
-
-            dialogs.add(dialog);
-        }
-
-        GoToNextConflictOrFinish(resolver, appSavegameFolder, newFiles, dialogs);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void GoToNextConflictOrFinish(ContentResolver resolver,
-                                          DocumentFile appSavegameFolder,
-                                          List<DocumentFile> newFiles,
-                                          ArrayList<CustomDialog> dialogs) {
-        if (dialogs.stream().count() > 0) {
-            CustomDialog d = dialogs.remove(0);
-            CustomDialogFactory.show(d);
-        } else {
-            importSaveGames(resolver, appSavegameFolder, newFiles);
-        }
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if (resultCode != Activity.RESULT_OK) {
-            return;
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            switch (-requestCode) {
-                case SLOT_NUMBER_EXPORT_SAVEGAMES:
-                    exportSaveGames(data);
-                    return;
-                case SLOT_NUMBER_IMPORT_SAVEGAMES:
-                    importSaveGames(data);
-                    return;
-                case SLOT_NUMBER_IMPORT_WORLDMAP:
-                    importWorldmap(data);
-                    return;
-            }
-        }
-
-    }
-
-    //endregion
-
-    private void loadSaveGame(int slot) {
-        if (!Savegames.getSlotFile(slot, this).exists()) {
-            showErrorLoadingEmptySlot();
-        } else {
-            final FileHeader header = Savegames.quickload(this, slot);
-            if (header != null && !header.hasUnlimitedSaves) {
-                showSlotGetsDeletedOnLoadWarning(slot);
-            } else {
-                completeLoadSaveActivity(slot);
-            }
-        }
-    }
-
-    //region show Dialogs
-
-    //region Import/Export
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void showStartExportInfo(OnClickListener onOk) {
-        final CustomDialog d = CustomDialogFactory.createDialog(this,
-                                                                getString(R.string.loadsave_export),
-                                                                getResources().getDrawable(android.R.drawable.ic_dialog_info),
-                                                                getString(R.string.loadsave_export_info),
-                                                                null,
-                                                                true);
-        CustomDialogFactory.addButton(d, android.R.string.yes, onOk);
-        CustomDialogFactory.addDismissButton(d, android.R.string.no);
-        CustomDialogFactory.show(d);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void showStartImportSavesInfo(OnClickListener onOk) {
-        final CustomDialog d = CustomDialogFactory.createDialog(this,
-                                                                getString(R.string.loadsave_import_save),
-                                                                getResources().getDrawable(android.R.drawable.ic_dialog_info),
-                                                                getString(R.string.loadsave_import_save_info),
-                                                                null,
-                                                                true);
-        CustomDialogFactory.addButton(d, android.R.string.yes, onOk);
-        CustomDialogFactory.addDismissButton(d, android.R.string.no);
-        CustomDialogFactory.show(d);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.P)
-    private void showStartImportWorldmapInfo(OnClickListener onOk) {
-        final CustomDialog d = CustomDialogFactory.createDialog(this,
-                                                                getString(R.string.loadsave_import_worldmap),
-                                                                getResources().getDrawable(android.R.drawable.ic_dialog_info),
-                                                                getString(R.string.loadsave_import_worldmap_info),
-                                                                null,
-                                                                true);
-        CustomDialogFactory.addButton(d, android.R.string.yes, onOk);
-        CustomDialogFactory.addDismissButton(d, android.R.string.no);
-        CustomDialogFactory.show(d);
-    }
-
-    private void showErrorImportingWorldmapWrongDirectory() {
-        final CustomDialog d = CustomDialogFactory.createErrorDialog(this,
-                                                                     getString(R.string.loadsave_import_worldmap_unsuccessfull),
-                                                                     getString(R.string.loadsave_import_worldmap_wrong_file));
-        CustomDialogFactory.show(d);
-    }
-
-    private void showErrorExportingSaveGamesUnknown() {
-        final CustomDialog d = CustomDialogFactory.createErrorDialog(this,
-                                                                     getString(R.string.loadsave_export_unsuccessfull),
-                                                                     getString(R.string.loadsave_export_error_unknown));
-        CustomDialogFactory.show(d);
-    }
-
-    //endregion
-
-    private void showErrorLoadingEmptySlot() {
-        final CustomDialog d = CustomDialogFactory.createErrorDialog(this,
-                                                                     getString(R.string.startscreen_error_loading_game),
-                                                                     getString(R.string.startscreen_error_loading_empty_slot));
-        CustomDialogFactory.show(d);
-    }
-
-    private void showSlotGetsDeletedOnLoadWarning(final int slot) {
-        final CustomDialog d = CustomDialogFactory.createDialog(this,
-                                                                getString(R.string.startscreen_attention_slot_gets_delete_on_load),
-                                                                getResources().getDrawable(android.R.drawable.ic_dialog_alert),
-                                                                getString(R.string.startscreen_attention_message_slot_gets_delete_on_load),
-                                                                null,
-                                                                true);
-        CustomDialogFactory.addButton(d, android.R.string.ok, v -> completeLoadSaveActivity(slot));
-        CustomDialogFactory.show(d);
-    }
-
-    private void showConfirmOverwriteQuestion(final int slot, String message) {
-		final String title = getString(R.string.loadsave_save_overwrite_confirmation_title) + ' '
-							 + getString(R.string.loadsave_save_overwrite_confirmation_slot, slot);
-        final CustomDialog d = CustomDialogFactory.createDialog(this,
-                                                                title,
-                                                                getResources().getDrawable(android.R.drawable.ic_dialog_alert),
-                                                                message,
-                                                                null,
-                                                                true);
-
-        CustomDialogFactory.addButton(d, android.R.string.yes, v -> completeLoadSaveActivity(slot));
-        CustomDialogFactory.addDismissButton(d, android.R.string.no);
-        CustomDialogFactory.show(d);
-    }
-
-    //endregion
-
-}