banvor/android_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moving to newer SDK and build framework.

Browse Source
This commit is contained in:
Vahagn Khachatryan
2021-09-21 22:40:59 +01:00
parent 277ae712f2
commit ea0d6d5fa6
42 changed files with 616 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/androidTest/java/org/vostan/banvor/ExampleInstrumentedTest.java Normal file
View File

@@ -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());
}
}

21
app/src/main/AndroidManifest.xml
View File

@@ -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"/>
<application android:label="@string/app_name"
<!--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>

2
app/src/main/java/org/vostan/sokoban/App.java → app/src/main/java/org/vostan/banvor/App.java
View File

@@ -1,4 +1,4 @@
package org.vostan.sokoban;
package org.vostan.banvor;
import android.app.Application;
import android.content.SharedPreferences;

4
app/src/main/java/org/vostan/sokoban/Puzzle.java → app/src/main/java/org/vostan/banvor/Puzzle.java
View File

@@ -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
{

6
app/src/main/java/org/vostan/sokoban/PuzzleContainer.java → app/src/main/java/org/vostan/banvor/PuzzleContainer.java
View File

@@ -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
{

19
app/src/main/java/org/vostan/sokoban/menu/MainActivity.java → app/src/main/java/org/vostan/banvor/menu/MainActivity.java
View File

@@ -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";

8
app/src/main/java/org/vostan/sokoban/menu/MainFragment.java → app/src/main/java/org/vostan/banvor/menu/MainFragment.java
View File

@@ -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;
/**
*

8
app/src/main/java/org/vostan/sokoban/menu/PuzzleListFragment.java → app/src/main/java/org/vostan/banvor/menu/PuzzleListFragment.java
View File

@@ -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;
/**
*

4
app/src/main/java/org/vostan/sokoban/play/Animator.java → app/src/main/java/org/vostan/banvor/play/Animator.java
View File

@@ -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;
/**

14
app/src/main/java/org/vostan/sokoban/play/PlayActivity.java → app/src/main/java/org/vostan/banvor/play/PlayActivity.java
View File

@@ -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

4
app/src/main/java/org/vostan/sokoban/play/PuzzleControl.java → app/src/main/java/org/vostan/banvor/play/PuzzleControl.java
View File

@@ -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;

4
app/src/main/java/org/vostan/sokoban/play/PuzzleLogic.java → app/src/main/java/org/vostan/banvor/play/PuzzleLogic.java
View File

@@ -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;
/**
*

10
app/src/main/java/org/vostan/sokoban/play/PuzzleView.java → app/src/main/java/org/vostan/banvor/play/PuzzleView.java
View File

@@ -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;
/**
*/

30
app/src/main/res/drawable-v24/ic_launcher_foreground.xml Normal file
View File

@@ -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>

170
app/src/main/res/drawable/ic_launcher_background.xml Normal file
View File

@@ -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>

5
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml Normal file
View File

@@ -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>

5
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml Normal file
View File

@@ -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>

BIN
app/src/main/res/mipmap-hdpi/ic_launcher.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 982 B

BIN
app/src/main/res/mipmap-mdpi/ic_launcher_round.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.6 KiB

16
app/src/main/res/values-night/themes.xml Normal file
View File

@@ -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>

7
app/src/main/res/values/colors.xml
View File

@@ -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>

16
app/src/main/res/values/themes.xml Normal file
View File

@@ -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>

17
app/src/test/java/org/vostan/banvor/ExampleUnitTest.java Normal file
View File

@@ -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);
}
}