Moving to newer SDK and build framework.

2021-09-21 22:51:49 +01:00
45 changed files with 614 additions and 508 deletions
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -0,0 +1 @@
+/build
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'com.android.application'
+plugins {
+    id 'com.android.application'
+}

 //
 //	Creates version.xml	
@@ -25,7 +27,7 @@ task createVersionXML {
 		versionFile.println( '<string name="git_version">' << version << '</string>' )
 		versionFile.println( '<string name="git_hash">' << githash << '</string>' )
 		versionFile.println( '<string name="build_date">' << builddate << '</string>' )
-		versionFile.println( '<string name="version_code">0x00010002</string>' )
+		versionFile.println( '<string name="version_code">0x00010001</string>' )
 		versionFile.println( '</resources>' )
 		versionFile.close()
 	}
@@ -35,72 +37,48 @@ preBuild.dependsOn createVersionXML
 //
 //	Convert SVG images from art directory into PNG files.
 //
-task generateDrawablesFromArt {
-
-	doLast {
-        def indir = "app/src/main/art"
-        def outdir = "../res"
-
-        String backslash= System.getProperty("file.separator")
-        def buildDir = (new File(project.buildDir,'art')).toString()
-        buildDir = buildDir.replace(backslash,"/")
-        def cmd = "make -C ${indir} RES=${outdir} TMP=${buildDir}"
-        println cmd
-        def p = cmd.execute()
-		p.consumeProcessOutput(System.err,System.err)
-		p.waitFor()
-		if ( p.exitValue() )
-			throw new GradleException("Generation of art failed.")
-	}
-}
-preBuild.dependsOn generateDrawablesFromArt
+//task generateDrawablesFromArt {
+//	doLast {
+//		def buildDir = (new File(project.buildDir,'art')).toString()
+//        def p = ('make -C app/src/main/art RES=../res TMP='+buildDir).execute()
+//		p.consumeProcessOutput()
+//		p.waitFor()
+//		if ( p.exitValue() )
+//			throw new GradleException("Generation of art failed.")
+//	}
+//}
+//preBuild.dependsOn generateDrawablesFromArt

 android {
-    compileSdkVersion 10
-    buildToolsVersion "21.1.1"
+    compileSdk 31

    defaultConfig {
-        applicationId "org.vostan.sokoban"
-        minSdkVersion 10
-        targetSdkVersion 14
+        applicationId "org.vostan.banvor"
+        minSdk 21
+        targetSdk 31
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
-    apply from: new File(getRootDir(),'/.secret.gradle')
+
    buildTypes {
        release {
-            runProguard true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.sokoban_release
-        }
-
-        debug {
-            applicationIdSuffix ".debug"
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
        }
    }
-
-    sourceSets {
-        /*
-        main {
-            java.srcDirs = ['src']
-
-            resources.srcDirs = ['src']
-            aidl.srcDirs = ['src']
-
-            renderscript.srcDirs = ['src']
-
-            res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
-
-        }
-        */
-        debug {
-            main.manifest.srcFile "src/main/AndroidManifest-debug.xml"
-        }
-        androidTest.setRoot("src/tests")
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
    }
 }

-//repositories {}
-
 dependencies {
-    compile 'com.android.support:support-v4:18.0.0'
+
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'com.google.android.material:material:1.4.0'
+    testImplementation 'junit:junit:4.+'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,17 +1,21 @@
 # Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in C:\Program Files (x86)\Android\android-sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html

-# Add any project specific keep options here:
-
 # If your project uses WebView with JS, uncomment the following
 # and specify the fully qualified class name to the JavaScript interface
 # class:
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
--- a/app/src/androidTest/java/org/vostan/banvor/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/org/vostan/banvor/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package org.vostan.banvor;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        assertEquals("org.vostan.banvor", appContext.getPackageName());
+    }
+}
--- a/app/src/main/AndroidManifest-debug.xml
+++ b/app/src/main/AndroidManifest-debug.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
      package="org.vostan.sokoban"
-      android:versionCode="0x00010002"
+      android:versionCode="@string/version_code"
      android:versionName="@string/git_version">
    <uses-sdk android:minSdkVersion="10" 
 			  android:targetSdkVersion="14"/>
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.vostan.sokoban"
-      android:versionCode="0x00010001"
+      package="org.vostan.banvor"
      android:versionName="@string/git_version">
-    <uses-sdk android:minSdkVersion="10" 
-			  android:targetSdkVersion="14"/>
+    <!--uses-sdk android:minSdkVersion="10"
+			  android:targetSdkVersion="14"/-->
    <application android:label="@string/app_name"
 				 android:icon="@drawable/icon"
-				 android:name="org.vostan.sokoban.App"
+				 android:roundIcon="@drawable/icon"
+				 android:name="org.vostan.banvor.App"
 				 android:theme="@android:style/Theme">
-        <activity	android:name="org.vostan.sokoban.menu.MainActivity"
+        <activity	android:name="org.vostan.banvor.menu.MainActivity"
 					android:label="@string/app_name"
 					android:configChanges="keyboardHidden|orientation"
-					android:screenOrientation="portrait" >
+					android:screenOrientation="portrait"
+					android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
-        <activity 	android:name="org.vostan.sokoban.play.PlayActivity"
+        <activity 	android:name="org.vostan.banvor.play.PlayActivity"
 					android:label="@string/play_activity"
 					android:configChanges="keyboardHidden|orientation"
 					android:screenOrientation="portrait" >
 	        <meta-data
 	            android:name="android.support.PARENT_ACTIVITY"
-	            android:value="org.vostan.sokoban.MainMenu" />
+	            android:value="org.vostan.banvor.MainMenu" />
        </activity>
    </application>
 </manifest> 
--- a/app/src/main/art/build.gradle
+++ b/app/src/main/art/build.gradle
@@ -1,107 +0,0 @@
-//apply plugin: 'com.android.application'
-
-class svg2png extends DefaultTask {
-
-	String input
-	String output
-	int width
-	int hight
-	def layers
-	
-	def layerOnOff( def layer ) {
-		def t = '-u "//*/svg:g[@inkscape:label=\\"'+layer.key+'\\"]/@style"'
-		if ( layer.value )
-			return t + ' -v display:inline'
-		else
-			return t + ' -v display:none'
-	}	
-
-	def configSVG( def svg, def layers ) {
-		def cfg = 'xmlstarlet ed -P -N svg=http://www.w3.org/2000/svg '
-		for ( layer in layers ) {
-			cfg += layerOnOff( layer ) + ' '
-		}
-		return cfg + svg
-	}
-
-	def configPNG( def png, def h, def w ) {
-		def cfg = 'imagemagick -background none -resize '+w+'x'+h+' - ' + png
-	}
-
-	def exportPNG( def svg, def svgLayerCfg, def png, def h, def w ) {
-		def svgProc = configSVG( svg, svgLayerCfg ).execute()
-		def pngProc =
-				configPNG( png, h, w ).
-					execute()
-		svgProc.pipeTo( pngProc )
-
-		pngProc.consumeProcessOutput()
-		pngProc.waitForOrKill(10000)
-		
-		if ( svgProc.exitValue() )
-			throw new GradleException("Failed to generate svg.")
-		if ( pngProc.exitValue() )
-			throw new GradleException("Failed to generate png.")
-	}
-
-	
-}
-
-sourceSet {
-	
-}
-
-//
-//	Creates version.xml	
-//
-task buildIcon {
-
-    //from(file('srcDir'))
-    //into(buildDir)
-
-	doLast {
-	
-		def sizes = [ 'ldpi':[36,36],
-					  'mdpi':[48,48],
-					  'hdpi':[72,72],
-					 'xhdpi':[96,96] ]
-
-		def sizes2= [ 'ldpi':[22,36],
-					  'mdpi':[29,48],
-					  'hdpi':[43,72],
-					 'xhdpi':[58,96] ]
-		
-		def sizes3= [ '':[500,500] ]
-
-/*
-		def files = [
-				( "icon.svg", "icon.png", [ 'Debug':false ], sizes ),
-				( "icon.svg", "icon_debug.png", [ 'Debug':true ], sizes ),
-				
-				( "buttons.svg", "reset.png", [ 'Reset Smooth':true ], sizes ),
-				( "buttons.svg", "undo.png", [ 'Undo Smooth':true ], sizes ),
-				( "buttons.svg", "next.png", [ 'Next Smooth':true ], sizes2 ),
-				( "buttons.svg", "prev.png", [ 'Prev Smooth':true ], sizes2 ),
-				
-				( "lock.svg", "lock.png", [ 'lock':true ], sizes2 ),
-				( "lock.svg", "unlock.png", [ 'unlock':true ], sizes2 ),
-				( "lock.svg", "unlocking.png", [ 'locking':true ], sizes2 ),
-				
-				( "bingo.svg", "bingo.png", [], sizes3 ),
-				( "box.svg", "box.png", [], sizes3 ),
-				( "floor.svg", "floor.png", [ 'Goal':false ], sizes3 ),
-				( "floor.svg", "goal.png", [ 'Goal':true ], sizes3 ),
-				( "wall.svg", "wall.png", [], sizes3 ),
-				( "worker.svg", "worker.png", [ 'Hands':false ], sizes3 ),
-				( "worker.svg", "worker_select.png", [ 'Hands':true ], sizes3 ),
-
-				( "splash.svg", "splash.png", [], ['':[500:800]] )
-		]
-*/
-//		for ( s in sizes ) {
-//			exportPNG( "icon.svg",icon,s.key+"_icon.png",s.value[0],s.value[1])
-//		}
-	}
-}
-
-
--- a/app/src/main/java/org/vostan/sokoban/App.java
+++ b/app/src/main/java/org/vostan/sokoban/App.java
@@ -1,4 +1,4 @@
-package org.vostan.sokoban;
+package org.vostan.banvor;

 import android.app.Application;
 import android.content.SharedPreferences;
@@ -32,7 +32,6 @@ public class App extends Application
 	    max_level = pc.getCount();
 		current_level = prefs.getInt("current_level", MIN_LEVEL);
 		achieved_level = prefs.getInt("achieved_level", MIN_LEVEL+10);
-        prefsEdit.apply();
 	}
 	//
 	//	This is a singleton object.
--- a/app/src/main/java/org/vostan/sokoban/Puzzle.java
+++ b/app/src/main/java/org/vostan/sokoban/Puzzle.java
@@ -1,4 +1,4 @@
-package org.vostan.sokoban;
+package org.vostan.banvor;

 //import java.lang.Exception;
 import java.io.*;
@@ -7,7 +7,7 @@ import android.util.Log;

 import java.util.LinkedList;

-import static org.vostan.sokoban.App.TAG;
+import static org.vostan.banvor.App.TAG;

 public class Puzzle
 {
--- a/app/src/main/java/org/vostan/sokoban/PuzzleContainer.java
+++ b/app/src/main/java/org/vostan/sokoban/PuzzleContainer.java
@@ -1,10 +1,10 @@
-package org.vostan.sokoban;
+package org.vostan.banvor;

 import java.io.InputStream;
 import java.io.IOException;
-import static org.vostan.sokoban.App.theApp;
+import static org.vostan.banvor.App.theApp;

-import org.vostan.sokoban.R;
+import org.vostan.banvor.R;

 public class PuzzleContainer
 {
--- a/app/src/main/java/org/vostan/sokoban/menu/MainActivity.java
+++ b/app/src/main/java/org/vostan/sokoban/menu/MainActivity.java
@@ -1,19 +1,22 @@
-package org.vostan.sokoban.menu;
+package org.vostan.banvor.menu;

-import org.vostan.sokoban.play.PlayActivity;
+import org.vostan.banvor.play.PlayActivity;

 import android.content.Intent;
 import android.view.View;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+//import androidx.fragment.app.Fragment;
+//support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 import android.view.Window;

-import org.vostan.sokoban.R;
-import static org.vostan.sokoban.App.theApp;
+import androidx.appcompat.app.AppCompatActivity;

-public class MainActivity extends FragmentActivity 
+import org.vostan.banvor.R;
+import static org.vostan.banvor.App.theApp;
+
+public class MainActivity extends AppCompatActivity
 {
 	protected final String TAG = "SokobanMenu";
 	protected final String LEVEL= "org.dyndns.vahagn.sokoban.LEVEL";
--- a/app/src/main/java/org/vostan/sokoban/menu/MainFragment.java
+++ b/app/src/main/java/org/vostan/sokoban/menu/MainFragment.java
@@ -2,17 +2,17 @@
 * To change this template, choose Tools | Templates
 * and open the template in the editor.
 */
-package org.vostan.sokoban.menu;
+package org.vostan.banvor.menu;

 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
-import static org.vostan.sokoban.App.theApp;
-import org.vostan.sokoban.R;
+import static org.vostan.banvor.App.theApp;
+import org.vostan.banvor.R;

 /**
 *
--- a/app/src/main/java/org/vostan/sokoban/menu/PuzzleListFragment.java
+++ b/app/src/main/java/org/vostan/sokoban/menu/PuzzleListFragment.java
@@ -2,7 +2,7 @@
 * To change this template, choose Tools | Templates
 * and open the template in the editor.
 */
-package org.vostan.sokoban.menu;
+package org.vostan.banvor.menu;

 import android.content.Context;
 import android.graphics.Bitmap;
@@ -12,7 +12,7 @@ import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.util.TypedValue;
 import android.view.GestureDetector;
 import android.view.LayoutInflater;
@@ -24,9 +24,9 @@ import android.widget.BaseAdapter;
 import android.widget.GridView;
 import android.widget.ImageView;

-import org.vostan.sokoban.R;
+import org.vostan.banvor.R;

-import static org.vostan.sokoban.App.theApp;
+import static org.vostan.banvor.App.theApp;

 /**
 *
--- a/app/src/main/java/org/vostan/sokoban/play/Animator.java
+++ b/app/src/main/java/org/vostan/sokoban/play/Animator.java
@@ -2,9 +2,9 @@
 * To change this template, choose Tools | Templates
 * and open the template in the editor.
 */
-package org.vostan.sokoban.play;
+package org.vostan.banvor.play;

-import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
 import java.util.LinkedList;

 /**
--- a/app/src/main/java/org/vostan/sokoban/play/PlayActivity.java
+++ b/app/src/main/java/org/vostan/sokoban/play/PlayActivity.java
@@ -1,11 +1,11 @@
-package org.vostan.sokoban.play;
+package org.vostan.banvor.play;

 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentActivity;
 import android.view.View;
 import android.view.Window;
 import android.view.animation.Animation;
@@ -13,11 +13,11 @@ import android.view.animation.AnimationUtils;
 import android.widget.FrameLayout;
 import android.widget.TextView;

-import org.vostan.sokoban.App;
+import org.vostan.banvor.App;

-import static org.vostan.sokoban.App.theApp;
-import org.vostan.sokoban.R;
-import org.vostan.sokoban.Puzzle;
+import static org.vostan.banvor.App.theApp;
+import org.vostan.banvor.R;
+import org.vostan.banvor.Puzzle;

 public class PlayActivity extends FragmentActivity
 							implements PuzzleControl.PuzzleControlLister
@@ -130,12 +130,12 @@ public class PlayActivity extends FragmentActivity
 		title_view.setVisibility(View.INVISIBLE);
 	}
 			
-	public void onReset( View v )
+	public boolean onReset( View v )
 	{
 		while ( puzzle.isUndoable() )
 			puzzle.restore();
 		puzzle_view.invalidate();
-		//return true;
+		return true;
 	}
 	//
 	//	Go to previouse puzzle.
@@ -175,16 +175,16 @@ public class PlayActivity extends FragmentActivity
 	//
 	//	Undo last action.
 	//
-	public void onUndo( View v )
+	public boolean onUndo( View v )
 	{
 		if ( puzzle.isUndoable() )
 		{
 			puzzle.restore();
 			puzzle_view.invalidate();
-		//	return true;
+			return true;
 		}
-		//else
-		//	return false;
+		else
+			return false;
 	}

 	private void loadCurrentPuzzle()
--- a/app/src/main/java/org/vostan/sokoban/play/PuzzleControl.java
+++ b/app/src/main/java/org/vostan/sokoban/play/PuzzleControl.java
@@ -2,14 +2,14 @@
 * To change this template, choose Tools | Templates
 * and open the template in the editor.
 */
-package org.vostan.sokoban.play;
+package org.vostan.banvor.play;

 import android.content.Context;
 import android.graphics.Point;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;
-import org.vostan.sokoban.Puzzle;
+import org.vostan.banvor.Puzzle;

 //import android.support.v4.view.GestureDetectorCompat;

--- a/app/src/main/java/org/vostan/sokoban/play/PuzzleLogic.java
+++ b/app/src/main/java/org/vostan/sokoban/play/PuzzleLogic.java
@@ -2,11 +2,11 @@
 * To change this template, choose Tools | Templates
 * and open the template in the editor.
 */
-package org.vostan.sokoban.play;
+package org.vostan.banvor.play;

 import static java.lang.Math.*;
 import java.util.Arrays;
-import org.vostan.sokoban.Puzzle;
+import org.vostan.banvor.Puzzle;

 /**
 *
--- a/app/src/main/java/org/vostan/sokoban/play/PuzzleView.java
+++ b/app/src/main/java/org/vostan/sokoban/play/PuzzleView.java
@@ -1,4 +1,4 @@
-package org.vostan.sokoban.play;
+package org.vostan.banvor.play;

 import android.content.Context;
 import android.graphics.Bitmap;
@@ -9,13 +9,13 @@ import android.graphics.Paint;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.RectF;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
 import android.view.View;
 import static java.lang.Math.*;

-import org.vostan.sokoban.Puzzle;
-import static org.vostan.sokoban.Puzzle.*;
-import org.vostan.sokoban.R;
+import org.vostan.banvor.Puzzle;
+import static org.vostan.banvor.Puzzle.*;
+import org.vostan.banvor.R;

 /**
 */
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
--- a/app/src/main/res/layout/puzzle_view_title.xml
+++ b/app/src/main/res/layout/puzzle_view_title.xml
@@ -22,7 +22,7 @@
  		android:layout_width="wrap_content"
  		android:layout_height="match_parent"
 		android:layout_weight="0"
-		android:textSize="40sp"
+		android:textSize="40dp"
 		android:paddingLeft="5dp"
 		android:textScaleX="1"
 		android:textColor="#FFE680"
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,16 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.Banvor" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/purple_200</item>
+        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorOnPrimary">@color/black</item>
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/teal_200</item>
+        <item name="colorSecondaryVariant">@color/teal_200</item>
+        <item name="colorOnSecondary">@color/black</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <!-- Customize your theme here. -->
+    </style>
+</resources>
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -20,4 +20,11 @@
 <resources>
    <color name="main_menu_btn_bg">#80404040</color>
    <color name="main_menu_btn_text">#C0C0C0C0</color>
+    <color name="purple_200">#FFBB86FC</color>
+    <color name="purple_500">#FF6200EE</color>
+    <color name="purple_700">#FF3700B3</color>
+    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_700">#FF018786</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
 </resources>
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -0,0 +1,16 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.Banvor" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/purple_500</item>
+        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorOnPrimary">@color/white</item>
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/teal_200</item>
+        <item name="colorSecondaryVariant">@color/teal_700</item>
+        <item name="colorOnSecondary">@color/black</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <!-- Customize your theme here. -->
+    </style>
+</resources>
--- a/app/src/test/java/org/vostan/banvor/ExampleUnitTest.java
+++ b/app/src/test/java/org/vostan/banvor/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package org.vostan.banvor;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
--- a/app/src/tests/java/org/vostan/sokoban/menu/MainActivityTest.java
+++ b/app/src/tests/java/org/vostan/sokoban/menu/MainActivityTest.java
@@ -1,115 +0,0 @@
-package org.vostan.sokoban.menu;
-
-import android.app.Activity;
-import android.test.ActivityInstrumentationTestCase2;
-import android.widget.Spinner;
-
-import org.vostan.sokoban.menu.MainActivity;
-import org.vostan.sokoban.R;
-
-/**
- * This is a simple framework for a test of an Application.  See
- * {@link android.test.ApplicationTestCase ApplicationTestCase} for more information on
- * how to write and extend Application tests.
- *
- * <p>To run this test, you can type:
- * adb shell am instrument -w \
- * -e class com.example.android.activityinstrumentation.MainActivityTest \
- * quux.tests/android.test.InstrumentationTestRunner
- *
- * <p>Individual tests are defined as any method beginning with 'test'.
- *
- * <p>ActivityInstrumentationTestCase2 allows these tests to run alongside a running
- * copy of the application under inspection. Calling getActivity() will return a
- * handle to this activity (launching it if needed).
- */
-public class MainActivityTest
-        extends ActivityInstrumentationTestCase2<MainActivity> {
-
-    MainActivity mActivity;
-
-    public MainActivityTest() {
-        super("org.vostan.sokoban.menu.MainActivity", MainActivity.class);
-    }
-
-    protected void setUp() throws Exception {
-        mActivity = getActivity();
-    }
-
-    /**
-     * Test to make sure that spinner values are persisted across activity restarts.
-     *
-     * <p>Launches the main activity, sets a spinner value, closes the activity, then relaunches
-     * that activity. Checks to make sure that the spinner values match what we set them to.
-     */
-    // BEGIN_INCLUDE (test_name)
-    public void testSpinnerValuePersistedBetweenLaunches() {
-/*
-        // END_INCLUDE (test_name)
-        final int TEST_SPINNER_POSITION_1 = MainActivity.WEATHER_PARTLY_CLOUDY;
-
-        // BEGIN_INCLUDE (launch_activity)
-        // Launch the activity
-        Activity activity = getActivity();
-        // END_INCLUDE (launch_activity)
-
-        // BEGIN_INCLUDE (write_to_ui)
-        // Set spinner to test position 1
-        final Spinner spinner1 = (Spinner) activity.findViewById(R.id.spinner);
-        activity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                // Attempts to manipulate the UI must be performed on a UI thread.
-                // Calling this outside runOnUiThread() will cause an exception.
-                //
-                // You could also use @UiThreadTest, but activity lifecycle methods
-                // cannot be called if this annotation is used.
-                spinner1.requestFocus();
-                spinner1.setSelection(TEST_SPINNER_POSITION_1);
-            }
-        });
-        // END_INCLUDE (write_to_ui)
-
-        // BEGIN_INCLUDE (relaunch_activity)
-        // Close the activity
-        activity.finish();
-        setActivity(null);  // Required to force creation of a new activity
-
-        // Relaunch the activity
-        activity = this.getActivity();
-        // END_INCLUDE (relaunch_activity)
-
-        // BEGIN_INCLUDE (check_results)
-        // Verify that the spinner was saved at position 1
-        final Spinner spinner2 = (Spinner) activity.findViewById(R.id.spinner);
-        int currentPosition = spinner2.getSelectedItemPosition();
-        assertEquals(TEST_SPINNER_POSITION_1, currentPosition);
-        // END_INCLUDE (check_results)
-
-        // Since this is a stateful test, we need to make sure that the activity isn't simply
-        // echoing a previously-stored value that (coincidently) matches position 1
-        final int TEST_SPINNER_POSITION_2 = MainActivity.WEATHER_SNOW;
-
-        // Set spinner to test position 2
-        activity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                spinner2.requestFocus();
-                spinner2.setSelection(TEST_SPINNER_POSITION_2);
-            }
-        });
-
-        // Close the activity
-        activity.finish();
-        setActivity(null);
-
-        // Relaunch the activity
-        activity = this.getActivity();
-
-        // Verify that the spinner was saved at position 2
-        final Spinner spinner3 = (Spinner) activity.findViewById(R.id.spinner);
-        currentPosition = spinner3.getSelectedItemPosition();
-        assertEquals(TEST_SPINNER_POSITION_2, currentPosition);
-*/
-    }
-}
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,17 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
    repositories {
-        jcenter()
+        google()
+        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:0.13.2'
+        classpath "com.android.tools.build:gradle:7.0.2"
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
    }
 }

-allprojects {
-    repositories {
-        jcenter()
-    }
+task clean(type: Delete) {
+    delete rootProject.buildDir
 }
--- a/gradle.properties
+++ b/gradle.properties
@@ -0,0 +1,19 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app"s APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Automatically convert third-party libraries to use AndroidX
+android.enableJetifier=true
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Mon Sep 20 22:54:36 BST 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip
+zipStoreBase=GRADLE_USER_HOME
--- a/113
+++ b/113
@@ -1,4 +1,20 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#

 ##############################################################################
 ##
@@ -6,12 +22,30 @@
 ##
 ##############################################################################

-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null

 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`

+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

@@ -30,6 +64,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
  CYGWIN* )
    cygwin=true
@@ -40,33 +75,14 @@ case "`uname`" in
  MINGW* )
    msys=true
    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac

-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -90,7 +106,7 @@ location of your Java installation."
 fi

 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
    MAX_FD_LIMIT=`ulimit -H -n`
    if [ $? -eq 0 ] ; then
        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -110,11 +126,13 @@ if $darwin; then
    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi

-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`

+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
    # We build the pattern for arguments to be converted via cygpath
    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
    SEP=""
@@ -138,27 +156,30 @@ if $cygwin ; then
        else
            eval `echo args$i`="\"$arg\""
        fi
-        i=$((i+1))
+        i=`expr $i + 1`
    done
    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
    esac
 fi

-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=`save "$@"`

-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@@ -8,20 +24,23 @@
@rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal

-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
@rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute

 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe

-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute

 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,34 +64,14 @@ echo location of your Java installation.

 goto fail

-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
 :execute
@rem Setup the command line

 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

+
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

 :end
@rem End local scope for the variables with windows NT shell
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,10 @@
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+        jcenter() // Warning: this repository is going to shut down soon
+    }
+}
+rootProject.name = "banvor"
 include ':app'