updated to use actual bogus fileversion numbers on BB port releases.

If version identifier in savegames equals 864 (bogus number to replace
by actual value used in BB release v0.7.0.1), the version number is
forcibly set to 39 (the number used in android version v0.7.0).

.gitignore

@@ -1,22 +0,0 @@
-# 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/

.travis.yml

@@ -1,14 +0,0 @@
-dist: bionic
-sudo: required
-cache:
-  directories:
-  - $HOME/pbuilder-bases
-matrix:
-  include:
-  - env: TARGET_OS=stretch
-before_install:
-- "$TRAVIS_BUILD_DIR/travis/$TRAVIS_OS_NAME.$TARGET_OS.before_install"
-install:
-- "$TRAVIS_BUILD_DIR/travis/$TRAVIS_OS_NAME.$TARGET_OS.install"
-script:
-- "$TRAVIS_BUILD_DIR/travis/$TRAVIS_OS_NAME.$TARGET_OS.script"

AndorsTrail/.classpath

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>

AndorsTrail/.gitignore

@@ -14,7 +14,3 @@ out/test/
 # Other
 .metadata
 .svn/
-
-#/AndorsTrail/app/build/*
-#/AndorsTrail/app/release/*
-#/AndorsTrail/.gradle/*

AndorsTrail/.project

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>AndorsTrail</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

AndorsTrail/AndorsTrail.iml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="EclipseModuleManager" forced_jdk="true">
+    <conelement value="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK" />
+    <conelement value="com.android.ide.eclipse.adt.LIBRARIES" />
+    <src_description expected_position="1">
+      <src_folder value="file://$MODULE_DIR$/src" expected_position="0" />
+      <src_folder value="file://$MODULE_DIR$/gen" expected_position="1" />
+    </src_description>
+  </component>
+  <component name="FacetManager">
+    <facet type="android" name="Android">
+      <configuration />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/bin/classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/libs/android-support-v4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+  </component>
+</module>
+

AndorsTrail/AndroidManifest.xml

@@ -2,14 +2,14 @@
 
 <manifest 
 	xmlns:android="http://schemas.android.com/apk/res/android" 
-	package="com.gpl.rpg.AndorsTrail_beta2"
-	android:versionCode="65"
-	android:versionName="0.8.1beta"
+	package="com.gpl.rpg.AndorsTrail"
+	android:versionCode="42"
+	android:versionName="0.7.1"
 	android:installLocation="auto"
 	>
 	<uses-sdk 
-		android:minSdkVersion="4"
-		android:targetSdkVersion="30"
+		android:minSdkVersion="4" 
+		android:targetSdkVersion="19"
 		/>
 	
 	<supports-screens
@@ -20,23 +20,19 @@
 		android:anyDensity="true"
 		/>
 	
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-
-
+	<uses-permission 
+	    android:name="android.permission.WRITE_EXTERNAL_STORAGE" 
+	    />
+		
 	<application 
-		android:name=".AndorsTrailApplication"
+		android:name=".AndorsTrailApplication" 
 		android:label="@string/app_name" 
-		android:icon="@drawable/icon_beta"
+		android:icon="@drawable/icon"
 		android:description="@string/app_description"
         android:allowBackup="true"
-        android:theme="@style/AndorsTrailTheme_Blue"
-		android:requestLegacyExternalStorage="true"
-		android:hasFragileUserData="true"
-		android:preserveLegacyExternalStorage="true"
 		>
 		<activity 
-		    android:name=".activity.StartScreenActivity"
+		    android:name=".activity.StartScreenActivity" 
 		    android:clearTaskOnLaunch="true"
 		    >
 			<intent-filter>
@@ -45,35 +41,25 @@
 			</intent-filter>
 		</activity>
    		<activity 
-			android:name=".activity.MainActivity"
+			android:name=".activity.MainActivity" 
 			android:label="@string/app_name" 
-			android:theme="@style/AndorsTrailTheme_Blue.NoBackground"
+			android:theme="@style/Theme.NoBackground"
 			/>
 		<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.MonsterInfoActivity" android:theme="@android:style/Theme.Dialog" />
+		<activity android:name=".activity.ItemInfoActivity" android:theme="@android:style/Theme.Dialog" />
+		<activity android:name=".activity.LevelUpActivity" android:theme="@android:style/Theme.Dialog" />
+		<activity android:name=".activity.MonsterEncounterActivity" android:theme="@android:style/Theme.Dialog" />
+		<activity android:name=".activity.ConversationActivity" android:theme="@android:style/Theme.Dialog" />
 		<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.LoadSaveActivity" android:theme="@android:style/Theme.Dialog" />
+		<activity android:name=".activity.ActorConditionInfoActivity" android:theme="@android:style/Theme.Dialog" />
+		<activity android:name=".activity.BulkSelectionInterface" android:theme="@android:style/Theme.Dialog" />
+		<activity android:name=".activity.SkillInfoActivity" android:theme="@android:style/Theme.Dialog" />
 		<activity android:name=".activity.DisplayWorldMapActivity" />
-
-        <provider
-        android:name="android.support.v4.content.FileProvider"
-        android:authorities="com.gpl.rpg.AndorsTrail_beta2.fileprovider"
-        android:grantUriPermissions="true"
-        android:exported="false">
-        <meta-data
-            android:name="android.support.FILE_PROVIDER_PATHS"
-            android:resource="@xml/fileprovider" />
-		</provider>
 	</application>
 	
 </manifest>

AndorsTrail/app/build.gradle

@@ -1,23 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
-
-    defaultConfig {
-        applicationId "com.gpl.rpg.AndorsTrail_beta2"
-        minSdkVersion 14
-        targetSdkVersion 30
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-        }
-    }
-}
-
-dependencies {
-    implementation 'com.android.support:support-v4:28.0.0'
-}

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/AndorsTrailApplication.java

@@ -1,169 +0,0 @@
-package com.gpl.rpg.AndorsTrail_beta2;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Locale;
-
-import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.controller.Constants;
-import com.gpl.rpg.AndorsTrail_beta2.util.AndroidStorage;
-import com.gpl.rpg.AndorsTrail_beta2.util.Pair;
-
-import android.app.Activity;
-import android.app.Application;
-import android.content.Context;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.os.Environment;
-import android.view.Window;
-import android.view.WindowManager;
-
-public final class AndorsTrailApplication extends Application {
-
-	public static final boolean DEVELOPMENT_DEBUGRESOURCES = false;
-	public static final boolean DEVELOPMENT_FORCE_STARTNEWGAME = false;
-	public static final boolean DEVELOPMENT_FORCE_CONTINUEGAME = false;
-	public static final boolean DEVELOPMENT_DEBUGBUTTONS = true;
-	public static final boolean DEVELOPMENT_FASTSPEED = false;
-	public static final boolean DEVELOPMENT_VALIDATEDATA = true;
-	public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;
-	public static final String CURRENT_VERSION_DISPLAY = "0.8.1beta2";
-	public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*");
-	public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS || DEVELOPMENT_FASTSPEED || !IS_RELEASE_VERSION;
-	public static final int DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION = 999;
-	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 65;
-
-	private final AndorsTrailPreferences preferences = new AndorsTrailPreferences();
-	private WorldContext world = new WorldContext();
-	private ControllerContext controllers = new ControllerContext(this, world);
-	private WorldSetup setup = new WorldSetup(world, controllers, this);
-	public WorldContext getWorld() { return world; }
-	public WorldSetup getWorldSetup() { return setup; }
-	public AndorsTrailPreferences getPreferences() { return preferences; }
-	public ControllerContext getControllerContext() { return controllers; }
-
-	public static AndorsTrailApplication getApplicationFromActivity(Activity activity) {
-		return ((AndorsTrailApplication) activity.getApplication());
-	}
-	public static AndorsTrailApplication getApplicationFromActivityContext(Context context) {
-		return getApplicationFromActivity(getActivityFromActivityContext(context));
-	}
-	private static Activity getActivityFromActivityContext(Context context) {
-		return (Activity) context;
-	}
-
-	public boolean isInitialized() { return world.model != null; }
-
-	public void setWindowParameters(Activity activity) {
-		activity.requestWindowFeature(Window.FEATURE_NO_TITLE);
-		if (preferences.fullscreen) {
-			activity.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-		} else {
-			activity.getWindow().setFlags(0, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-		}
-	}
-
-	//Get default locale at startup, as somehow it seems that changing the app's 
-	//configured locale impacts the value returned by Locale.getDefault() nowadays.
-	private final Locale defaultLocale = Locale.getDefault();
-
-	private Pair<String, Locale> lastLocale = null;
-
-	public boolean setLocale(Activity context) {
-		Resources res = context.getResources();
-		Configuration conf = res.getConfiguration();
-
-		Locale targetLocale;
-
-		if (lastLocale != null && lastLocale.first == preferences.language) {
-			targetLocale = lastLocale.second;
-		} else {
-			targetLocale = localeForLanguageTag(preferences.language);
-			lastLocale = new Pair<String, Locale>(preferences.language, targetLocale);
-		}
-
-		if (targetLocale.equals(conf.locale)) {
-			return false;
-		}
-
-		conf.locale = targetLocale;
-		res.updateConfiguration(conf, res.getDisplayMetrics());
-		this.getResources().updateConfiguration(conf, res.getDisplayMetrics());
-		
-		return true;
-	}
-
-	// Supports language or language_COUNTRY in short form e.g. "en" or "en_US"
-	private Locale localeForLanguageTag(String languageTag) {
-		Locale locale = null;
-		if (languageTag != null && !languageTag.equalsIgnoreCase("default")) {
-			final int pos = languageTag.indexOf('-');
-			if (pos == -1) {
-				locale = new Locale(languageTag);
-			}
-			else locale = new Locale(languageTag.substring(0, pos), languageTag.substring(pos+1));
-		}
-		if (locale == null) {
-			locale = defaultLocale;
-		}
-		return locale;
-	}
-
-	/**
-	 * Logging to text file system as found on https://stackoverflow.com/questions/19565685/saving-logcat-to-a-text-file-in-android-device
-	 */
-	
-	public void onCreate() {
-		super.onCreate();
-
-		if ( DEVELOPMENT_DEBUGMESSAGES && isExternalStorageWritable() ) {
-			File appDirectory = AndroidStorage.getStorageDirectory(getApplicationContext(), Constants.FILENAME_SAVEGAME_DIRECTORY);
-			File logDirectory = new File( appDirectory, "log" );
-			File logFile = new File( logDirectory, "logcat" + System.currentTimeMillis() + ".txt" );
-
-			// create app folder
-			if ( !appDirectory.exists() ) {
-				appDirectory.mkdir();
-			}
-
-			// create log folder
-			if ( !logDirectory.exists() ) {
-				logDirectory.mkdir();
-			}
-
-			// clear the previous logcat and then write the new one to the file
-			try {
-				Process process = Runtime.getRuntime().exec("logcat -c");
-				process = Runtime.getRuntime().exec("logcat -f " + logFile+" *:W");
-			} catch ( IOException e ) {
-				e.printStackTrace();
-			}
-
-		}
-	}
-
-	/* Checks if external storage is available for read and write */
-	public boolean isExternalStorageWritable() {
-		String state = Environment.getExternalStorageState();
-		if ( Environment.MEDIA_MOUNTED.equals( state ) ) {
-			return true;
-		}
-		return false;
-	}
-
-	/* Checks if external storage is available to at least read */
-	public boolean isExternalStorageReadable() {
-		String state = Environment.getExternalStorageState();
-		if ( Environment.MEDIA_MOUNTED.equals( state ) ||
-				Environment.MEDIA_MOUNTED_READ_ONLY.equals( state ) ) {
-			return true;
-		}
-		return false;
-	}
-	public void discardWorld() {
-		world = new WorldContext();
-		controllers = new ControllerContext(this, world);
-		setup = new WorldSetup(world, controllers, getApplicationContext());
-	}
-}