diff --git a/Sorce/.idea/deploymentTargetDropDown.xml b/Sorce/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..7a9289f --- /dev/null +++ b/Sorce/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Sorce/.idea/gradle.xml b/Sorce/.idea/gradle.xml index 02a60b0..0b0534c 100755 --- a/Sorce/.idea/gradle.xml +++ b/Sorce/.idea/gradle.xml @@ -4,16 +4,15 @@ diff --git a/Sorce/.idea/migrations.xml b/Sorce/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/Sorce/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/Sorce/.idea/vcs.xml b/Sorce/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/Sorce/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Sorce/app/src/main/java/com/main/alphaunit/MainActivity.java b/Sorce/app/src/main/java/com/main/alphaunit/MainActivity.java index d95cd87..4dc3573 100755 --- a/Sorce/app/src/main/java/com/main/alphaunit/MainActivity.java +++ b/Sorce/app/src/main/java/com/main/alphaunit/MainActivity.java @@ -159,7 +159,9 @@ public class MainActivity extends AppCompatActivity { } } - pointValue.setText(selectedUnitList.getPointCount()+"PV"); + if(selectedUnitList != null) { + pointValue.setText(selectedUnitList.getPointCount() + "PV"); + } tonnage.setText("Tonnage"); currentHight = (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 175f, getResources().getDisplayMetrics()); diff --git a/Sorce/build.gradle b/Sorce/build.gradle index 0ebef73..16626f5 100755 --- a/Sorce/build.gradle +++ b/Sorce/build.gradle @@ -1,5 +1,5 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.1.0' apply false - id 'com.android.library' version '8.1.0' apply false + id 'com.android.application' version '8.2.1' apply false + id 'com.android.library' version '8.2.1' apply false } \ No newline at end of file diff --git a/Sorce/gradle.properties b/Sorce/gradle.properties index 3a131ca..f511a31 100755 --- a/Sorce/gradle.properties +++ b/Sorce/gradle.properties @@ -19,5 +19,4 @@ android.useAndroidX=true # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library android.nonTransitiveRClass=true -android.defaults.buildfeatures.buildconfig=true android.nonFinalResIds=false \ No newline at end of file diff --git a/Sorce/gradle/wrapper/gradle-wrapper.properties b/Sorce/gradle/wrapper/gradle-wrapper.properties index 6075533..4cab0b6 100755 --- a/Sorce/gradle/wrapper/gradle-wrapper.properties +++ b/Sorce/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Aug 02 21:03:51 PDT 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME