Merge pull request #220 from mjaun/feature/update_android

Update Android

Author: mjaun

.editorconfig

@@ -17,7 +17,7 @@ insert_final_newline = true
 charset = utf-8
 
 # Tab indentation
-[makefile,Makefile]
+[Makefile]
 indent_style = tab
 ## PEP 0008 https://www.python.org/dev/peps/pep-0008/
 [*.py]

.gitignore

@@ -12,7 +12,6 @@
 /local.properties
 /.idea/workspace.xml
 /.idea/libraries
-.DS_Store
 /build*
 
 app/*.apk

app/build.gradle

@@ -1,14 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 33
-
     defaultConfig {
         applicationId "ch.logixisland.anuto"
-        minSdkVersion 17
-        targetSdkVersion 33
-        versionCode 32
-        versionName "0.11"
+        compileSdk 34
+        minSdkVersion 23
+        targetSdkVersion 35
+        versionCode 33
+        versionName "0.12"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
@@ -30,6 +29,6 @@ android {
 
 dependencies {
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test:rules:1.5.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test:rules:1.6.1'
 }

app/src/androidTest/java/ch/logixisland/anuto/DefaultGameSimulator.java

@@ -125,7 +125,6 @@ private void tryEnhanceTower() {
 
         while (iterator.hasNext()) {
             Tower tower = iterator.next();
-            final int tier = mTowerTiers.getTowerTier(tower);
 
             // check if enhancing is possible
             if (!tower.isEnhanceable()) {

app/src/androidTest/java/ch/logixisland/anuto/IntegrationTest.java

@@ -1,7 +1,7 @@
 package ch.logixisland.anuto;
 
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.filters.LargeTest;
-import androidx.test.rule.ActivityTestRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Rule;
@@ -15,7 +15,7 @@
 public class IntegrationTest {
 
     @Rule
-    public ActivityTestRule<GameActivity> mActivityRule = new ActivityTestRule<>(GameActivity.class);
+    public ActivityScenarioRule<GameActivity> mActivityRule = new ActivityScenarioRule<>(GameActivity.class);
 
     @Test
     public void integrationTest() {

app/src/main/java/ch/logixisland/anuto/business/game/GameState.java

@@ -23,7 +23,7 @@ public interface Listener {
     private boolean mGameStarted = false;
     private int mFinalScore = 0;
 
-    private List<Listener> mListeners = new CopyOnWriteArrayList<>();
+    private final List<Listener> mListeners = new CopyOnWriteArrayList<>();
 
     public GameState(ScoreBoard scoreBoard, HighScores highScores, TowerSelector towerSelector) {
         mScoreBoard = scoreBoard;

app/src/main/java/ch/logixisland/anuto/business/game/MapInfo.java

@@ -2,9 +2,9 @@
 
 public class MapInfo {
 
-    private String mMapId;
-    private int mMapNameResId;
-    private int mMapDataResId;
+    private final String mMapId;
+    private final int mMapNameResId;
+    private final int mMapDataResId;
 
     MapInfo(String mapId, int mapNameResId, int mapDataResId) {
         mMapId = mapId;

app/src/main/java/ch/logixisland/anuto/business/game/SaveGameRepository.java

@@ -1,6 +1,5 @@
 package ch.logixisland.anuto.business.game;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -54,7 +53,6 @@ public List<SaveGameInfo> getSaveGameInfos() {
     public SaveGameInfo createSaveGame(Bitmap screenshot, int score, int wave, int lives) {
         Date date = new Date();
 
-        @SuppressLint("SimpleDateFormat")
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmssSSS");
         File folder = new File(mContext.getFilesDir() + File.separator
                 + "savegame" + File.separator

app/src/main/java/ch/logixisland/anuto/business/tower/TowerInfo.java

@@ -9,19 +9,19 @@
 
 public class TowerInfo {
 
-    private int mValue;
-    private int mLevel;
-    private int mLevelMax;
-    private boolean mEnhanceable;
-    private int mEnhanceCost;
-    private boolean mUpgradeable;
-    private int mUpgradeCost;
-    private boolean mSellable;
-    private boolean mCanLockTarget;
+    private final int mValue;
+    private final int mLevel;
+    private final int mLevelMax;
+    private final boolean mEnhanceable;
+    private final int mEnhanceCost;
+    private final boolean mUpgradeable;
+    private final int mUpgradeCost;
+    private final boolean mSellable;
+    private final boolean mCanLockTarget;
     private boolean mDoesLockTarget;
-    private boolean mHasStrategy;
+    private final boolean mHasStrategy;
     private TowerStrategy mStrategy;
-    private List<TowerInfoValue> mProperties;
+    private final List<TowerInfoValue> mProperties;
 
     public TowerInfo(Tower tower, int credits, boolean controlsEnabled) {
         mValue = tower.getValue();

app/src/main/java/ch/logixisland/anuto/business/tower/TowerInserter.java

@@ -31,7 +31,7 @@ public interface Listener {
 
     private Tower mInsertedTower;
     private Plateau mCurrentPlateau;
-    private Collection<Listener> mListeners = new CopyOnWriteArrayList<>();
+    private final Collection<Listener> mListeners = new CopyOnWriteArrayList<>();
 
     public TowerInserter(GameEngine gameEngine, GameState gameState, EntityRegistry entityRegistry,
                          TowerSelector towerSelector, TowerAging towerAging, ScoreBoard scoreBoard) {