Merge pull request #319 from corenting/feat/add-python-mk-2

feat: version 2.30.2
corenting · Jun 22, 2024 · d95086b · d95086b
2 parents 797b45b + 5f5ba03
commit d95086b
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 36 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,3 +31,6 @@ project.properties
 gradle.properties
 target
 res/xml/tracker.xml
+
+# kotlin
+.kotlin/
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "fr.corenting.edcompanion"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 73
-        versionName "2.30.1"
+        versionCode 74
+        versionName "2.30.2"
         vectorDrawables.useSupportLibrary = true
 
         buildConfigField "String", "FRONTIER_AUTH_CLIENT_ID", '"' + FRONTIER_AUTH_CLIENT_ID + '"'
@@ -60,12 +60,12 @@ dependencies {
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
 
     // Lifecycle
-    def lifecycleVersion = '2.8.1'
+    def lifecycleVersion = '2.8.2'
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion"
 
     // Play services / Firebase
-    implementation platform('com.google.firebase:firebase-bom:33.1.0')
+    implementation platform('com.google.firebase:firebase-bom:33.1.1')
     implementation 'com.google.firebase:firebase-messaging-ktx'
     implementation 'com.google.android.gms:play-services-base:18.5.0'
 

diff --git a/app/src/main/java/fr/corenting/edcompanion/utils/InternalNamingUtils.java b/app/src/main/java/fr/corenting/edcompanion/utils/InternalNamingUtils.java
@@ -4,37 +4,39 @@
 
 public class InternalNamingUtils {
     public static String getShipName(String internalName) {
-        return switch (internalName) {
-            case "SideWinder" -> "Sidewinder Mk I";
-            case "Eagle" -> "Eagle Mk II";
-            case "Viper" -> "Viper Mk III";
-            case "CobraMkIII" -> "Cobra Mk III";
-            case "Type6" -> "Type-6 Transporter";
-            case "Type7" -> "Type-7 Transporter";
-            case "Asp" -> "Asp Explorer";
-            case "Empire_Trader" -> "Imperial Clipper";
-            case "Federation_Dropship" -> "Federal Dropship";
-            case "Type9" -> "Type-9 Heavy";
-            case "BelugaLiner" -> "Beluga Liner";
-            case "FerDeLance" -> "Fer-de-Lance";
-            case "Federation_Corvette" -> "Federal Corvette";
-            case "Cutter" -> "Imperial Cutter";
-            case "DiamondBack" -> "Diamondback Scout";
-            case "Empire_Courier" -> "Imperial Courier";
-            case "DiamondBackXL" -> "Diamondback Explorer";
-            case "Empire_Eagle" -> "Imperial Eagle";
-            case "Federation_Dropship_MkII" -> "Federal Assault Ship";
-            case "Federation_Gunship" -> "Federal Gunship";
-            case "Viper_MkIV" -> "Viper Mk IV";
-            case "CobraMkIV" -> "Cobra Mk IV";
-            case "Independant_Trader" -> "Keelback";
-            case "Asp_Scout" -> "Asp Scout";
-            case "Type9_Military" -> "Type-10 Defender";
-            case "Krait_MkII" -> "Krait Mk II";
-            case "TypeX" -> "Alliance Chieftain";
-            case "TypeX_2" -> "Alliance Crusader";
-            case "TypeX_3" -> "Alliance Challenger";
-            case "Krait_Light" -> "Krait Phantom";
+        String nameToMatch = internalName.toLowerCase();
+        return switch (nameToMatch) {
+            case "sidewinder" -> "Sidewinder Mk I";
+            case "eagle" -> "Eagle Mk II";
+            case "viper" -> "Viper Mk III";
+            case "cobramkiii" -> "Cobra Mk III";
+            case "type6" -> "Type-6 Transporter";
+            case "type7" -> "Type-7 Transporter";
+            case "asp" -> "Asp Explorer";
+            case "empire_trader" -> "Imperial Clipper";
+            case "federation_dropship" -> "Federal Dropship";
+            case "type9" -> "Type-9 Heavy";
+            case "belugaliner" -> "Beluga Liner";
+            case "ferdelance" -> "Fer-de-Lance";
+            case "federation_corvette" -> "Federal Corvette";
+            case "cutter" -> "Imperial Cutter";
+            case "diamondback" -> "Diamondback Scout";
+            case "empire_courier" -> "Imperial Courier";
+            case "diamondbackxl" -> "Diamondback Explorer";
+            case "empire_eagle" -> "Imperial Eagle";
+            case "federation_dropship_mkii" -> "Federal Assault Ship";
+            case "federation_gunship" -> "Federal Gunship";
+            case "viper_mkiv" -> "Viper Mk IV";
+            case "cobramkiv" -> "Cobra Mk IV";
+            case "independant_trader" -> "Keelback";
+            case "asp_scout" -> "Asp Scout";
+            case "type9_military" -> "Type-10 Defender";
+            case "krait_mkii" -> "Krait Mk II";
+            case "typex" -> "Alliance Chieftain";
+            case "typex_2" -> "Alliance Crusader";
+            case "typex_3" -> "Alliance Challenger";
+            case "krait_light" -> "Krait Phantom";
+            case "python_nx" -> "Python Mk II";
             default -> internalName;
         };
     }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -408,6 +408,10 @@
     <string name="changelog_title">Changelog</string>
     <string name="changelog_message">
         <![CDATA[
+            <b>Version 2.30.2</b><br />
+            <ul>
+                <li>Fix Python Mk II displayed as "Python_NX"</li><br />
+            </ul>
             <b>Version 2.30.1</b><br />
             <ul>
                 <li>Fix some issues displaying loadouts details</li><br />

diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.1'
+        classpath 'com.android.tools.build:gradle:8.4.2'
         classpath 'com.google.gms:google-services:4.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }