Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
ELY3M committed May 22, 2019
1 parent c95bc32 commit 41af32a
Show file tree
Hide file tree
Showing 54 changed files with 822 additions and 797 deletions.
11 changes: 7 additions & 4 deletions DOC/ChangeLog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,9 @@
// TODO color pal edit for SRM and L2 VEL/REF
// TODO don't display full precision in lat/lon in settings location edit
// TODO enhance formatting for NHC Storms
// TODO - bug , SPC Meso swipe left/right takes on extra to get started
// TODO - in settings homescreen remove 7DAY from choices
// TODO - nexrad radar on landscape - switch to dual pane is not centered
// TODO - in settings indicate minutes for various update options (widget/notification)
// TODO - update polygons when radar is open (in addition to background). Possibly use two sets of prefs , cloned at radar start
// TODO - color pal , allow cloning of a user created pal
// TODO - bug , SPC Meso swipe left/right takes on extra to get started

[ADD] - adding something new - method, file, etc. to the repo
[REM] - remove items
Expand All @@ -38,6 +35,12 @@
[REF] - refactor a method, group, variable, etc.
[MER] - merge

55194 2019_05_22 [FIX] at joshuatee.wx.radar.WXGLPolygonWarnings.addWarnings (WXGLPolygonWarnings.kt:139)
java.lang.IndexOutOfBoundsException:
55193 2019_05_22 [REF] various camelCase
[IMP] Better positioning support for single to dual pane transition in landscape
[IMP] In settings->homescreen remove legacy "7DAY: 7 Day Forecast" as an option
[IMP] In several spots in settings explicitly state "in minutes"
55192 2019_05_21 [IMP] Enhance storm card formatting in NHC main screen
[IMP] In nexrad radar if animating and tap stop icon - get most recent scan and display
[FIX] add a catch memory error in wxrender around line 180
Expand Down
2 changes: 1 addition & 1 deletion app/app.iml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<compilerSettings />
<compilerArguments>
<option name="destination" value="$MODULE_DIR$/build/tmp/kotlin-classes/debug" />
<option name="classpath" value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.31/e652770b6416c6d85934086899ffed3eccd35813/kotlin-stdlib-jdk7-1.3.31.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/64a7d1316993f1193c2b8e2f8dc7bd15/jars/classes.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-android-extensions-runtime/1.3.31/721b62ccbafe51a284ca0d1c5dcfdce8cedd4255/kotlin-android-extensions-runtime-1.3.31.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/com.beust/klaxon/5.0.1/4c1ffe12cd890eef021808dfb2fe2993dfeaf0c9/klaxon-5.0.1.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/96d212f1147b317060183475be662263/jetified-kotlinx-coroutines-android-1.0.0.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.0.0/a33c4bf7581f71f01d4ed660b09ca199abbb44da/kotlinx-coroutines-core-1.0.0.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/8d8ce15f00aec0e22db4267a5a9f82df/jetified-kotlin-reflect-1.2.60.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.31/11289d20fd95ae219333f3456072be9f081c30cc/kotlin-stdlib-1.3.31.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-common/1.0.0/5f7551ec1edc068deaa0397100a1f14f32270274/kotlinx-coroutines-core-common-1.0.0.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.31/20c34a04ea25cb1ef0139598bd67c764562cb170/kotlin-stdlib-common-1.3.31.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/6fd50f78bb2fa9704f1ee461e08fa93e/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/bde0273f2a6cf58e2635ada398004f97/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/f9161461afcbe982ce072a8a56b0ff22/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/dba05a9edad03baf0ef97fd4abab8616/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/720f6e51f22b369abec0f2792d727ec9/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/5f9019930fd2d89bdc9c3c768eb9da0b/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/d99688a969fb75ecf486d38662a209c4/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/8306d11d01379c44fa61cb957f98ae04/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/fc250d430715c0ccee5bcf67c9024342/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/bf58516ba103bb97b6299ed32d8f685a/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/c67f9d541bf32e8bbe5020a8a035f879/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/c1c821bca714908bd78a73bb875a5567/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/d7fb9f4e58eca52df5348552e921798b/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/866e2ed683bbd9aaab390342232254e1/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/207490e43b9cb094c0d25acb56f49f64/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/98e9fd37dd9bdaabb3d62928610737d7/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/74da2e3299b85cbecf2070c696d3a78a/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/8a660e091508ff80449e24616f515c64/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/e6c405b60dbc9d5364dd038a65d5479a/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/fc3b02c7d75f0f9e1c80545b53177426/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/29f8979a5de9f4ca8832072458081ba1/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/78a322f8a98daeabdc2084044336a3cb/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/3b484883b168ac14c18b45507c507341/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/be16ff82294b9e651331d28e7e6641b1/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/70dcd62ef8bc815e565e24f1734e0aa9/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/7d1c575d506c32393364f886626bf7b3/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/d1a1c13a931a260762c4bd42de4fa05c/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/f1499db3e49aada631db46c454f20a04/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/bf90ef7d3f6f93a052312ffeae8a9a6e/jars/classes.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.0.0/42858b26cafdaa69b6149f45dfc2894007bc2c7a/collection-1.0.0.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/e192cb4fb0e5d78560685c51e18ad8b1/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/c330f770601d788963819da2b4d9e40d/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/ff7bd241ce8dbabd2fefa287af704f79/jars/classes.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.0.0/e070ffae07452331bc5684734fce6831d531785c/lifecycle-common-2.0.0.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/8c296a4b8ba7bca85cd0acb69ad0b955/jars/classes.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.0.0/bb21b9a11761451b51624ac428d1f1bb5deeac38/core-common-2.0.0.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.0.1/2dfd8f6b2a8fc466a1ae4e329fb79cd580f6393f/annotation-1.0.1.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.12.0/b36f4a04584c0fb0d9af2d3401cdff8dacb1ea54/okhttp-3.12.0.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.15.0/bc28b5a964c8f5721eb58ee3f3c47a9bcbf4f4d8/okio-1.15.0.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/1b7ae16b47ac445d80ff8536cfd96b46/jars/classes.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/com.jayway.jsonpath/json-path/2.4.0/765a4401ceb2dc8d40553c2075eb80a8fa35c2ae/json-path-2.4.0.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/net.minidev/json-smart/2.3/7396407491352ce4fa30de92efb158adb76b5b/json-smart-2.3.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/net.minidev/accessors-smart/1.2/c592b500269bfde36096641b01238a8350f8aa31/accessors-smart-1.2.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm/5.0.4/da08b8cce7bbf903602a25a3a163ae252435795/asm-5.0.4.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar;D:/android-sdk/platforms/android-28/android.jar" />
<option name="classpath" value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.31/e652770b6416c6d85934086899ffed3eccd35813/kotlin-stdlib-jdk7-1.3.31.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/f83203b4943645c068b10618e2e8f679/jars/classes.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-android-extensions-runtime/1.3.31/721b62ccbafe51a284ca0d1c5dcfdce8cedd4255/kotlin-android-extensions-runtime-1.3.31.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/com.beust/klaxon/5.0.1/4c1ffe12cd890eef021808dfb2fe2993dfeaf0c9/klaxon-5.0.1.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/983f4f98b5dbe84567937b15ec4092cb/jetified-kotlinx-coroutines-android-1.0.0.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.0.0/a33c4bf7581f71f01d4ed660b09ca199abbb44da/kotlinx-coroutines-core-1.0.0.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/f3e81e39e28eeef14ccf340a48434616/jetified-kotlin-reflect-1.2.60.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.31/11289d20fd95ae219333f3456072be9f081c30cc/kotlin-stdlib-1.3.31.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-common/1.0.0/5f7551ec1edc068deaa0397100a1f14f32270274/kotlinx-coroutines-core-common-1.0.0.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.31/20c34a04ea25cb1ef0139598bd67c764562cb170/kotlin-stdlib-common-1.3.31.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/6a5d26d0130a8b429ca9bfca0e4474d1/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/d9cd0a4b9228e6fdf59f7884b600a69d/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/f9a5864b42ca60eaa28a27ba448b8d09/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/64f0cdfe437d72319dae4aff65b4d7c8/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/f85d6c5f4a9b274e104e14cc2b3b5b9a/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/7297cfec04a72318539bc50a608a60bd/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/12e006117ba24426e28af3f42a6f8c33/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/13d3f1fd9b9ab1aa75faa46907062da6/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/84d37e43e09f5b19b44969f7f39b30cc/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/644bde9d01907579d7c341bce0bb9252/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/4f8ed258c0298396f38503771c948f2d/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/0f52d730d3fe6f9ebfeec64953a37c3a/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/8ae5aed8d8cc7770d2682202c8380e3c/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/80137911874fb4e571c5bb1b9e233178/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/79db1260c9ba33dbf3601c11d429cca4/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/03fa84d544ab354ef6f8bc0258009d2d/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/1047f926c5ae89985fdc58a622c4400f/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/cb4ff8227f0940eae590dfc1449d00d0/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/2a092cdcf3fd86212ad4b0d43180c1c0/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/81418b3354f133c9dc1d2973567ea8d1/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/25f71ef1a4edf160a2ba5d4aba8533e1/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/08733d5e892dc5b2183125cf96801d9d/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/2da344536dc5020b4fcb274756a04c23/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/0800b038c57aaa6490f63bc7859e9a4e/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/c5fbad65cd2b20b0aad6f29f362d219b/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/1456343bd2f6dba815f2177ae628d66d/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/ecd7a8ac8b042d85441ae80cf975f2ed/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/c2d0dcea6fe8bc7bc263d8cce9b7ac08/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/d7d4d5bf3726eac55f499f24adf7987c/jars/classes.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.0.0/42858b26cafdaa69b6149f45dfc2894007bc2c7a/collection-1.0.0.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/ad5480aa5087e9f2bf0f43afa88d7780/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/63e638d2f8863216027be86d547ec6a3/jars/classes.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/332d303461525d8d1951f1c02dc6642b/jars/classes.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.0.0/e070ffae07452331bc5684734fce6831d531785c/lifecycle-common-2.0.0.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/738627b24657ec2c207c05eceefa1e7f/jars/classes.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.0.0/bb21b9a11761451b51624ac428d1f1bb5deeac38/core-common-2.0.0.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.0.1/2dfd8f6b2a8fc466a1ae4e329fb79cd580f6393f/annotation-1.0.1.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.12.0/b36f4a04584c0fb0d9af2d3401cdff8dacb1ea54/okhttp-3.12.0.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.15.0/bc28b5a964c8f5721eb58ee3f3c47a9bcbf4f4d8/okio-1.15.0.jar;C:/Users/103/.gradle/caches/transforms-2/files-2.1/1951942153575e8aba8fe48ac6c7ef08/jars/classes.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/com.jayway.jsonpath/json-path/2.4.0/765a4401ceb2dc8d40553c2075eb80a8fa35c2ae/json-path-2.4.0.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/net.minidev/json-smart/2.3/7396407491352ce4fa30de92efb158adb76b5b/json-smart-2.3.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/net.minidev/accessors-smart/1.2/c592b500269bfde36096641b01238a8350f8aa31/accessors-smart-1.2.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm/5.0.4/da08b8cce7bbf903602a25a3a163ae252435795/asm-5.0.4.jar;C:/Users/103/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar;D:/android-sdk/platforms/android-28/android.jar" />
<option name="noStdlib" value="true" />
<option name="noReflect" value="true" />
<option name="moduleName" value="app_debug" />
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="joshuatee.wx"
android:versionCode="55192"
android:versionName="55192"
android:versionCode="55194"
android:versionName="55194"
>

<uses-permission android:name="android.permission.INTERNET" />
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/joshuatee/wx/UtilityWidgetDownload.kt
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ import android.graphics.Bitmap
import joshuatee.wx.Extensions.getImage

import joshuatee.wx.canada.UtilityCanadaImg
import joshuatee.wx.nhc.UtilityNHC
import joshuatee.wx.nhc.UtilityNhc
import joshuatee.wx.objects.WidgetFile
import joshuatee.wx.objects.WidgetFile.*
import joshuatee.wx.settings.Location
import joshuatee.wx.util.*
import joshuatee.wx.wpc.UtilityWPCImages
import joshuatee.wx.wpc.UtilityWpcImages

internal object UtilityWidgetDownload {

Expand Down Expand Up @@ -168,14 +168,14 @@ internal object UtilityWidgetDownload {
}

private fun downloadWpcImage(context: Context, type: WidgetFile) {
val imgUrl = Utility.readPref(context, "WPG_IMG_FAV_URL", UtilityWPCImages.urls[0])
val imgUrl = Utility.readPref(context, "WPG_IMG_FAV_URL", UtilityWpcImages.urls[0])
val bitmap = imgUrl.getImage()
saveImage(context, bitmap, type.fileName)
}

private fun downloadNhc(context: Context, type: WidgetFile) {
val bitmap1 = UtilityNHC.widgetImageUrlBottom.getImage()
val bitmap2 = UtilityNHC.widgetImageUrlTop.getImage()
val bitmap1 = UtilityNhc.widgetImageUrlBottom.getImage()
val bitmap2 = UtilityNhc.widgetImageUrlTop.getImage()
saveImage(context, bitmap1, type.fileName + "0")
saveImage(context, bitmap2, type.fileName + "1")
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/joshuatee/wx/WX.kt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import android.view.View
import android.view.View.OnClickListener

import joshuatee.wx.fragments.ViewPagerAdapter
import joshuatee.wx.spc.UtilitySPC
import joshuatee.wx.spc.UtilitySpc
import joshuatee.wx.ui.ObjectFab
import joshuatee.wx.ui.UtilityTheme
import joshuatee.wx.ui.UtilityToolbar
Expand Down Expand Up @@ -128,7 +128,7 @@ class WX : CommonActionBarFragment() {

private fun refreshDynamicContent() {
if (!MyApplication.simpleMode) {
val tabStr = UtilitySPC.checkSpc(this)
val tabStr = UtilitySpc.checkSpc(this)
vpa.setTabTitles(1, tabStr[0])
vpa.setTabTitles(2, tabStr[1])
if (slidingTabLayout.tabCount > 2) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import joshuatee.wx.ui.ObjectCardImage
import joshuatee.wx.ui.ObjectCardText
import joshuatee.wx.spc.SPCMCDWShowActivity
import joshuatee.wx.spc.SPCStormReportsActivity
import joshuatee.wx.spc.UtilitySPC
import joshuatee.wx.spc.UtilitySpc
import joshuatee.wx.util.UtilityDownloadRadar
import joshuatee.wx.util.UtilityShare
import joshuatee.wx.util.UtilityShortcut
Expand Down Expand Up @@ -147,7 +147,7 @@ class SevereDashboardActivity : BaseActivity() {
snMcd.getBitmaps(UtilityDownloadRadar.getMcd())
snWat.getBitmaps(UtilityDownloadRadar.getWatch())
snMpd.getBitmaps(UtilityDownloadRadar.getMpd())
bitmapArrRep.add((UtilitySPC.getStormReportsTodayUrl()).getImage())
bitmapArrRep.add((UtilitySpc.getStormReportsTodayUrl()).getImage())
}
if (bitmapArrRep.size > 0) {
bitmapArrRep.indices.forEach {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ internal class SevereWarning(private val type: PolygonType) {

fun generateString(context: Context, textTor: String) {
var vtecComponents: List<String>
var wfo = ""
var wfo: String
var wfoLocation = ""
var label = ""
when (type) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ package joshuatee.wx.activitiesmisc

import joshuatee.wx.MyApplication

internal object UtilityOPCImages {
internal object UtilityOpcImages {

val labels = listOf(
"Atlantic Surface Analysis",
Expand Down
Loading

0 comments on commit 41af32a

Please sign in to comment.