fixes and updates

ELY3M · Aug 28, 2020 · a3998a6 · a3998a6
1 parent 8341a93
commit a3998a6
Show file tree

Hide file tree

Showing 695 changed files with 18,422 additions and 27,224 deletions.
diff --git a/DOC/Bugs.txt b/DOC/Bugs.txt
diff --git a/DOC/ChangeLog.txt b/DOC/ChangeLog.txt
diff --git a/app/app.iml b/app/app.iml
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,10 +9,9 @@ android {
 
     defaultConfig {
         applicationId "joshuatee.wx"
-        minSdkVersion 16   // 4.1
+        minSdkVersion 21   // 5.0
         targetSdkVersion 29 // 8.1
         // Stops the Gradle plugin’s automatic rasterization of vectors (2016_02_25 add 23.2 )
-        //generatedDensities = []
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
     }
@@ -44,12 +43,10 @@ android {
 
     clean.dependsOn 'cleanNative'
 
-
     tasks.withType(JavaCompile) {
         compileTask -> compileTask.dependsOn buildNative
     }
 
-
     // Flag to tell aapt to keep the attribute ids around - (2016_02_25 add 23.2 )
     aaptOptions {
         additionalParameters "--no-version-vectors"
@@ -68,28 +65,45 @@ android {
         checkReleaseBuilds false
         abortOnError false
     }
+
+    // Enables Jetpack Compose for this module
+    /*buildFeatures {
+        compose true
+    }*/
+
+    compileOptions {
+        //encoding = 'UTF-8'
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
+    dexOptions {
+        javaMaxHeapSize "4g"
+    }
 }
 
 // https://developer.android.com/jetpack/androidx/versions
 dependencies {
 
     // Kotlin
-    api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.61"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
+    api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.0"
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7' // was 1.3.6
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.6'
 
     // Support libraries
     // https://developer.android.com/jetpack/androidx/versions
-    implementation 'com.google.android.material:material:1.1.0'
-    //implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.google.android.material:material:1.2.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.media:media:1.1.0'
-    implementation 'androidx.preference:preference:1.1.0'
+    implementation 'androidx.preference:preference:1.1.1'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
 
-    // Other
-    implementation "com.squareup.okhttp3:okhttp:3.12.8"
     implementation 'com.jjoe64:graphview:4.2.2'
+    implementation "com.squareup.okhttp3:okhttp:4.6.0"
     implementation 'com.intentfilter:android-permissions:0.1.7'
     implementation 'org.shredzone.commons:commons-suncalc:2.6'
 }

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -22,8 +22,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="joshuatee.wx"
-    android:versionCode="55379"
-    android:versionName="55379"
+    android:versionCode="55506"
+    android:versionName="55506"
     >
 
  <uses-permission android:name="android.permission.INTERNET" />
@@ -54,7 +54,7 @@
      android:icon="@mipmap/ic_launcher_elys"
      android:label="@string/app_name"
      android:largeHeap="true"
-     android:theme="@style/MyCustomTheme_ActionBar"
+     android:theme="@style/MyCustomTheme_NOAB"
      android:name="MyApplication"
      android:supportsRtl="false"
      android:resizeableActivity="true"
@@ -78,7 +78,7 @@
       android:name="joshuatee.wx.WX"
       android:label="@string/app_name"
       android:launchMode="singleTop"
-      android:theme="@style/MyCustomTheme_ActionBar"
+      android:theme="@style/MyCustomTheme_whiter_NOAB"
       >
   </activity>
   <activity
@@ -190,7 +190,7 @@
   </activity>
   <activity
       android:name=".radar.AwcRadarMosaicActivity"
-      android:label="AWC Radar Mosaics"
+      android:label=""
       android:parentActivityName="WX" >
   </activity>
   <activity
@@ -226,7 +226,7 @@
   </activity>
   <activity
       android:name=".spc.SpcStormReportsActivity"
-      android:label="@string/title_activity_storm_reports"
+      android:label=""
       android:parentActivityName="WX" >
   </activity>
   <activity
@@ -311,7 +311,7 @@
       android:parentActivityName="WX" >
   </activity>
   <activity
-      android:name=".activitiesmisc.AfdActivity"
+      android:name=".activitiesmisc.WfoTextActivity"
       android:label=""
       android:parentActivityName="WX" >
   </activity>
@@ -498,6 +498,11 @@
       android:label="@string/title_activity_settings_widgets"
       android:parentActivityName="WX" >
   </activity>
+  <activity
+      android:name=".settings.SettingsNavDrawerActivity"
+      android:label=""
+      android:parentActivityName="WX" >
+  </activity>
   <activity
       android:name=".canada.CanadaRadarActivity"
       android:parentActivityName="WX" >
@@ -561,6 +566,10 @@
       android:name=".radar.WXGLRadarActivityMultiPane"
       android:parentActivityName="WX" >
   </activity>
+  <activity
+         android:name=".radar.UtilityConusRadar"
+         android:parentActivityName="WX" >
+  </activity>
   <activity
       android:name=".spc.SpcSwoActivity"
       android:parentActivityName="WX" >
@@ -657,6 +666,5 @@
       android:permission="android.permission.BIND_JOB_SERVICE"
       android:exported="true"/>
 
-
  </application>
 </manifest>
diff --git a/app/src/main/java/joshuatee/wx/ColorPalettes.kt b/app/src/main/java/joshuatee/wx/ColorPalettes.kt
@@ -26,30 +26,30 @@ import joshuatee.wx.radarcolorpalettes.ObjectColorPalette
 
 internal object ColorPalettes {
 
-    fun init(context: Context) {
-        val colorMapIntArr = listOf(30, 56, 134, 135, 159, 161, 163, 165)
-        val cm94 = ObjectColorPalette(context, "94")
+    fun initialize(context: Context) {
+        val productCodes = listOf(30, 56, 134, 135, 159, 161, 163, 165)
+        val cm94 = ObjectColorPalette(context, 94)
         MyApplication.colorMap[94] = cm94
-        MyApplication.colorMap[94]!!.init()
+        MyApplication.colorMap[94]!!.initialize()
         MyApplication.colorMap[153] = cm94
         MyApplication.colorMap[180] = cm94
         MyApplication.colorMap[186] = cm94
-        val cm99 = ObjectColorPalette(context, "99")
+        val cm99 = ObjectColorPalette(context, 99)
         MyApplication.colorMap[99] = cm99
-        MyApplication.colorMap[99]!!.init()
+        MyApplication.colorMap[99]!!.initialize()
         MyApplication.colorMap[154] = cm99
         MyApplication.colorMap[182] = cm99
-        val cm172 = ObjectColorPalette(context, "172")
+        val cm172 = ObjectColorPalette(context, 172)
         MyApplication.colorMap[172] = cm172
-        MyApplication.colorMap[172]!!.init()
+        MyApplication.colorMap[172]!!.initialize()
         MyApplication.colorMap[170] = cm172
-        colorMapIntArr.forEach {
-            MyApplication.colorMap[it] = ObjectColorPalette(context, it.toString())
-            MyApplication.colorMap[it]!!.init()
+        productCodes.forEach {
+            MyApplication.colorMap[it] = ObjectColorPalette(context, it)
+            MyApplication.colorMap[it]!!.initialize()
         }
-        val cm19 = ObjectColorPalette(context, "19")
+        val cm19 = ObjectColorPalette(context, 19)
         MyApplication.colorMap[19] = cm19
-        MyApplication.colorMap[19]!!.init()
+        MyApplication.colorMap[19]!!.initialize()
         MyApplication.colorMap[181] = cm19
         // below 2 composite reflectivity
         MyApplication.colorMap[37] = cm19