diff --git a/.github/workflows/gradle2.yml b/.github/workflows/gradle2.yml deleted file mode 100644 index 80c28a823..000000000 --- a/.github/workflows/gradle2.yml +++ /dev/null @@ -1,34 +0,0 @@ -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. -# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle - -name: Build Gradle - -on: workflow_dispatch - -permissions: - contents: read - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'temurin' - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v1.0.4 - - name: Make gradle wrapper executable - run: chmod +x ./AndorsTrail/gradlew - - name: Build with Gradle - uses: gradle/gradle-build-action@v2.3.2 - with: - arguments: build - build-root-directory: ./AndorsTrail diff --git a/AndorsTrail/.gradle/7.3.3/dependencies-accessors/dependencies-accessors.lock b/AndorsTrail/.gradle/7.3.3/dependencies-accessors/dependencies-accessors.lock new file mode 100644 index 000000000..b5cdb81e4 Binary files /dev/null and b/AndorsTrail/.gradle/7.3.3/dependencies-accessors/dependencies-accessors.lock differ diff --git a/AndorsTrail/.gradle/7.3.3/dependencies-accessors/gc.properties b/AndorsTrail/.gradle/7.3.3/dependencies-accessors/gc.properties new file mode 100644 index 000000000..e69de29bb diff --git a/AndorsTrail/.gradle/7.3.3/fileChanges/last-build.bin b/AndorsTrail/.gradle/7.3.3/fileChanges/last-build.bin new file mode 100644 index 000000000..f76dd238a Binary files /dev/null and b/AndorsTrail/.gradle/7.3.3/fileChanges/last-build.bin differ diff --git a/AndorsTrail/.gradle/7.3.3/gc.properties b/AndorsTrail/.gradle/7.3.3/gc.properties new file mode 100644 index 000000000..e69de29bb diff --git a/AndorsTrail/.gradle/vcs-1/gc.properties b/AndorsTrail/.gradle/vcs-1/gc.properties new file mode 100644 index 000000000..e69de29bb diff --git a/AndorsTrail/.idea/compiler.xml b/AndorsTrail/.idea/compiler.xml new file mode 100644 index 000000000..fb7f4a8a4 --- /dev/null +++ b/AndorsTrail/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/AndorsTrail/.idea/gradle.xml b/AndorsTrail/.idea/gradle.xml new file mode 100644 index 000000000..3a6d74877 --- /dev/null +++ b/AndorsTrail/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/AndorsTrail/.idea/jarRepositories.xml b/AndorsTrail/.idea/jarRepositories.xml new file mode 100644 index 000000000..a5f05cd8c --- /dev/null +++ b/AndorsTrail/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/AndorsTrail/.idea/misc.xml b/AndorsTrail/.idea/misc.xml new file mode 100644 index 000000000..5c9f89fee --- /dev/null +++ b/AndorsTrail/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/AndorsTrail/.idea/vcs.xml b/AndorsTrail/.idea/vcs.xml new file mode 100644 index 000000000..6c0b86358 --- /dev/null +++ b/AndorsTrail/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/AndorsTrail/app/build.gradle b/AndorsTrail/app/build.gradle index 6d2297577..0c2bfc772 100644 --- a/AndorsTrail/app/build.gradle +++ b/AndorsTrail/app/build.gradle @@ -1,10 +1,6 @@ apply plugin: 'com.android.application' android { - lintOptions{ - baseline file("lint.xml") - abortOnError true - } compileSdkVersion 30 buildToolsVersion "30.0.3" @@ -23,7 +19,7 @@ android { } dependencies { - implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'com.android.support:support-v4:28.0.0' } task copyRes(type: Copy) { diff --git a/AndorsTrail/app/lint.xml b/AndorsTrail/app/lint.xml index e9e279c96..014e35a4a 100644 --- a/AndorsTrail/app/lint.xml +++ b/AndorsTrail/app/lint.xml @@ -9,7 +9,5 @@ - - \ No newline at end of file diff --git a/AndorsTrail/app/src/main/AndroidManifest.xml b/AndorsTrail/app/src/main/AndroidManifest.xml index 394b0aa10..d1bcae863 100644 --- a/AndorsTrail/app/src/main/AndroidManifest.xml +++ b/AndorsTrail/app/src/main/AndroidManifest.xml @@ -66,7 +66,7 @@ diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/Dialogs.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/Dialogs.java index eadbf665f..a501b057d 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/Dialogs.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/Dialogs.java @@ -15,7 +15,7 @@ import android.content.pm.PackageManager; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import androidx.fragment.app.Fragment; +import android.support.v4.app.Fragment; import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/AndorsTrailBaseFragmentActivity.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/AndorsTrailBaseFragmentActivity.java index fc6f573f4..ffa75e837 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/AndorsTrailBaseFragmentActivity.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/AndorsTrailBaseFragmentActivity.java @@ -1,7 +1,7 @@ package com.gpl.rpg.AndorsTrail.activity; import android.os.Bundle; -import androidx.fragment.app.FragmentActivity; +import android.support.v4.app.FragmentActivity; import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java index ad4153624..b22e4bbf8 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java @@ -2,7 +2,7 @@ package com.gpl.rpg.AndorsTrail.activity; import android.content.res.Resources; import android.os.Bundle; -import androidx.fragment.app.FragmentTabHost; +import android.support.v4.app.FragmentTabHost; import android.view.LayoutInflater; import android.view.ViewGroup; import android.widget.ImageView; diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java index e1e76dbf8..22488483f 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java @@ -2,7 +2,7 @@ package com.gpl.rpg.AndorsTrail.activity; import android.content.res.Resources; import android.os.Bundle; -import androidx.fragment.app.FragmentTabHost; +import android.support.v4.app.FragmentTabHost; import android.view.LayoutInflater; import android.view.ViewGroup; import android.widget.ImageView; diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java index 29bcbcec3..cfddf7b10 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java @@ -20,8 +20,8 @@ import android.content.pm.PackageManager; import android.content.res.Resources; import android.graphics.drawable.AnimationDrawable; import android.os.Bundle; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager.OnBackStackChangedListener; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager.OnBackStackChangedListener; import android.view.KeyEvent; import android.view.View; import android.view.ViewTreeObserver; diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java index 40ec3287a..43f44e367 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java @@ -5,7 +5,7 @@ import java.util.Arrays; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import androidx.fragment.app.Fragment; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java index 0531f32d3..f4fe48b9a 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java @@ -8,7 +8,7 @@ import java.util.Map; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.fragment.app.Fragment; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Skills.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Skills.java index cfd8a31cf..1d6b6511f 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Skills.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Skills.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import androidx.fragment.app.Fragment; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java index 1a2baa429..2d7bcb221 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import android.content.Intent; import android.content.res.Resources; import android.os.Bundle; -import androidx.fragment.app.Fragment; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivityFragment.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivityFragment.java index e9312f9e8..fe317feae 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivityFragment.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivityFragment.java @@ -4,7 +4,7 @@ import java.util.HashSet; import android.content.res.Resources; import android.os.Bundle; -import androidx.fragment.app.Fragment; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java index f48865dd7..92385a563 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java @@ -12,7 +12,7 @@ import android.content.SharedPreferences.Editor; import android.content.pm.PackageManager; import android.os.Build; import android.os.Bundle; -import androidx.fragment.app.Fragment; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_NewGame.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_NewGame.java index 0705bce29..a401572bc 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_NewGame.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_NewGame.java @@ -3,7 +3,7 @@ package com.gpl.rpg.AndorsTrail.activity.fragment; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import androidx.fragment.app.Fragment; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/InputController.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/InputController.java index 0748b4c14..2ce960604 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/InputController.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/InputController.java @@ -2,7 +2,6 @@ package com.gpl.rpg.AndorsTrail.controller; import android.content.Context; import android.content.Intent; -import android.os.Build; import android.util.SparseIntArray; import android.view.KeyEvent; import android.view.View; @@ -99,36 +98,28 @@ public final class InputController implements OnClickListener, OnLongClickListen // Keys mapping to UP_LEFT key = KEY_MOVE_UP_LEFT; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - keyMap.put(KeyEvent.KEYCODE_DPAD_UP_LEFT, key); - } + keyMap.put(KeyEvent.KEYCODE_DPAD_UP_LEFT, key); keyMap.put(KeyEvent.KEYCODE_NUMPAD_7, key); keyMap.put(KeyEvent.KEYCODE_7, key); keyMap.put(KeyEvent.KEYCODE_MOVE_HOME, key); // Keys mapping to UP_RIGHT key = KEY_MOVE_UP_RIGHT; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - keyMap.put(KeyEvent.KEYCODE_DPAD_UP_RIGHT, key); - } + keyMap.put(KeyEvent.KEYCODE_DPAD_UP_RIGHT, key); keyMap.put(KeyEvent.KEYCODE_NUMPAD_9, key); keyMap.put(KeyEvent.KEYCODE_9, key); keyMap.put(KeyEvent.KEYCODE_PAGE_UP, key); // Keys mapping to DOWN_LEFT key = KEY_MOVE_DOWN_LEFT; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - keyMap.put(KeyEvent.KEYCODE_DPAD_DOWN_LEFT, key); - } + keyMap.put(KeyEvent.KEYCODE_DPAD_DOWN_LEFT, key); keyMap.put(KeyEvent.KEYCODE_NUMPAD_1, key); keyMap.put(KeyEvent.KEYCODE_1, key); keyMap.put(KeyEvent.KEYCODE_MOVE_END, key); // Keys mapping to DOWN_RIGHT key = KEY_MOVE_DOWN_RIGHT; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - keyMap.put(KeyEvent.KEYCODE_DPAD_DOWN_RIGHT, key); - } + keyMap.put(KeyEvent.KEYCODE_DPAD_DOWN_RIGHT, key); keyMap.put(KeyEvent.KEYCODE_NUMPAD_3, key); keyMap.put(KeyEvent.KEYCODE_3, key); keyMap.put(KeyEvent.KEYCODE_PAGE_DOWN, key); diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/GameStatistics.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/GameStatistics.java index fc2ed7721..938a949e9 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/GameStatistics.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/GameStatistics.java @@ -19,7 +19,6 @@ import com.gpl.rpg.AndorsTrail.model.actor.MonsterType; import com.gpl.rpg.AndorsTrail.model.item.ItemType; import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap; import com.gpl.rpg.AndorsTrail.model.quest.Quest; -import com.gpl.rpg.AndorsTrail.util.HashMapHelper; public final class GameStatistics { private int deaths = 0; @@ -37,10 +36,10 @@ public final class GameStatistics { public void addMonsterKill(MonsterType monsterType) { // Track monster kills by type ID, for savegame file - killedMonstersByTypeID.put(monsterType.id, getNumberOfKillsForMonsterType(monsterType.id) + 1); + killedMonstersByTypeID.put(monsterType.id, killedMonstersByTypeID.getOrDefault((monsterType.id), 0) + 1); // Also track by name, for statistics display (multiple IDs w/same name don't matter to player) - killedMonstersByName.put(monsterType.name, getNumberOfKillsForMonsterName(monsterType.name) + 1); + killedMonstersByName.put(monsterType.name, killedMonstersByName.getOrDefault(monsterType.name, 0) + 1); } public void addPlayerDeath(int lostExp) { @@ -51,7 +50,8 @@ public final class GameStatistics { } public void addItemUsage(ItemType type) { final String n = type.id; - usedItems.put(n, HashMapHelper.getOrDefault(usedItems, n,0) + 1); + if (!usedItems.containsKey(n)) usedItems.put(n, 1); + else usedItems.put(n, usedItems.get(n) + 1); } public int getDeaths() { @@ -73,11 +73,15 @@ public final class GameStatistics { public boolean isDead() { return !hasUnlimitedLives() && getLivesLeft() < 1; } public int getNumberOfKillsForMonsterType(String monsterTypeID) { - return HashMapHelper.getOrDefault(killedMonstersByTypeID, monsterTypeID, 0); + Integer v = killedMonstersByTypeID.get(monsterTypeID); + if (v == null) return 0; + return v; } public int getNumberOfKillsForMonsterName(String monsterName) { - return HashMapHelper.getOrDefault(killedMonstersByName, monsterName, 0); + Integer v = killedMonstersByName.get(monsterName); + if (v == null) return 0; + return v; } public String getTop5MostCommonlyKilledMonsters(WorldContext world, Resources res) { @@ -140,15 +144,20 @@ public final class GameStatistics { } public int getNumberOfUsedItems() { - return HashMapHelper.sumIntegerValues(usedItems); + int result = 0; + for (int v : usedItems.values()) result += v; + return result; } public int getNumberOfTimesItemHasBeenUsed(String itemId) { - return HashMapHelper.getOrDefault(usedItems, itemId, 0); + if (!usedItems.containsKey(itemId)) return 0; + return usedItems.get(itemId); } public int getNumberOfKilledMonsters() { - return HashMapHelper.sumIntegerValues(killedMonstersByTypeID); + int result = 0; + for (int v : killedMonstersByTypeID.values()) result += v; + return result; } private static final Comparator> descendingValueComparator = new Comparator>() { @@ -177,7 +186,7 @@ public final class GameStatistics { // Also track by name, for statistics display (multiple IDs w/same name don't matter to player) MonsterType t = world.monsterTypes.getMonsterType(id); - if (t != null) killedMonstersByName.put(t.name, getNumberOfKillsForMonsterName(t.name) + value); + if (t != null) killedMonstersByName.put(t.name, killedMonstersByName.getOrDefault(t.name, 0) + value); } if (fileversion <= 17) return; diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/util/AndroidStorage.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/util/AndroidStorage.java index 4fcfc09db..409023c60 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/util/AndroidStorage.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/util/AndroidStorage.java @@ -4,7 +4,7 @@ import android.content.Context; import android.net.Uri; import android.os.Build; import android.os.Environment; -import androidx.core.content.FileProvider; +import android.support.v4.content.FileProvider; import com.gpl.rpg.AndorsTrail.controller.Constants; diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/util/HashMapHelper.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/util/HashMapHelper.java deleted file mode 100644 index 54d679d52..000000000 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/util/HashMapHelper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.gpl.rpg.AndorsTrail.util; - -import java.util.HashMap; - -public final class HashMapHelper { - public static V getOrDefault(HashMap map, K key, V defaultValue) { - V v = map.get(key); - return v == null ? defaultValue : v; - } - public static Integer sumIntegerValues(HashMap map) { - int sum = 0; - for (Integer v : map.values()) sum += v; - return sum; - } - -} diff --git a/AndorsTrail/gradle.properties b/AndorsTrail/gradle.properties deleted file mode 100644 index 5465fec0e..000000000 --- a/AndorsTrail/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file diff --git a/AndorsTrail/local.properties b/AndorsTrail/local.properties new file mode 100644 index 000000000..6a96e3606 --- /dev/null +++ b/AndorsTrail/local.properties @@ -0,0 +1,7 @@ +## This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. +# +# Location of the SDK. This is only used by Gradle. +# +#Sun Sep 25 12:50:59 CEST 2022 +sdk.dir=C\:\\Users\\chris\\AppData\\Local\\Android\\Sdk