Skip to content

Commit

Permalink
fixes and updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@ELY3M
ELY3M committed Feb 2, 2020
1 parent 050bb5a commit 022ccb8
Show file tree
Hide file tree
Showing 81 changed files with 1,076 additions and 3,064 deletions.
26 changes: 23 additions & 3 deletions DOC/ChangeLog.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,33 @@
// TODO [ADD] line size - swo, wb, wb gusts, sti
// TODO [REF] OkHttp 3.13 Requires Android 5+ – Square Corner Blog – Medium https://medium.com/square-corner-blog/okhttp-3-13-requires-android-5-818bb78d07ce
// TODO [REF] move off rid/wfo/sounding lat/lon/name currently in pref should be in objects (like flutter/iOS)
// TODO NWS_LOCATION RID_LOC
// TODO [FIX] Canada - some radars have changed code names (need to change maps.xml as well)
// TODO [ADD] radar file class from flutter
// TODO [FIX] select radar from main screen via icon brings up zoomed out view UtilityLocationFragment
// TODO [FIX] roaming location needs background GPS perm for Android 10 (API 29)
// TODO [ADD] warning counts in nexrad
// TODO [ADD] textual obs in fixed radars on homescreen
// TODO [ADD] use ENUM instead of RID_FAV WFO_FAV SND_FAV (util/UtilityFavorites)
// TODO [FIX] dual/quad pane radar don't take up the entire screen on chomeOS
// TODO [REF] migrate off WebscreenABModels?

55341 2020_01_30
55349 2020_02_02 [REF] utilFav/SettingsHomeScreen refactoring
[REF] lint cleanup
55348 2020_02_02 [REF] utilFav/SettingsHomeScreen refactoring
55347 2020_02_01 [ADD] move to normal twitter w/o tokens
55346 2020_02_01 [REF] remove un-needed pref storage in util pref
[FIX] twitter activity wasn't going to state of current location
55345 2020_02_01 [REF] remove un-needed pref storage in util pref
55344 2020_02_01 [REF] remove un-needed pref storage in util pref
55343 2020_02_01 [ADD] in nexrad radar if show warnings show count in upper left, tap on count goes to severe dashboard - WIP
[FIX] non tst/tor/ffw warnings were not being downloaded outside of backgroundFetch
[REF] WIP - move off rid/wfo/sounding lat/lon/name currently in pref should be in objects (like flutter/iOS)
[REF] remove un-needed pref storage in util pref
55342 2020_01_31 [FIX] prelaunch report: at joshuatee.wx.models.UtilityModels.setSubtitleRestoreIMGXYZOOM(UtilityModels.kt:292)
java.lang.IndexOutOfBoundsException: Index: 0, Size: 0
[FIX] prelaunch report: at joshuatee.wx.models.UtilityModelEsrlInputOutput.getAnimation(UtilityModelEsrlInputOutput.kt:185)
java.lang.IndexOutOfBoundsException: Invalid index 37, size is 37 a
55341 2020_01_30 [ADD] additional graphics for SPC Convective Outlook Day 2
55340 2020_01_30 [REF] use methods in WXGLNexrad to read/write radar info in pref
[FIX] FragmentPagerAdapter deprecated in ViewPagerAdapter.kt
[REF] lint cleanup
Expand All @@ -24,7 +44,7 @@
55336 2020_01_27 [REF] lint cleanup
[ADD] fix radar legend pnd - LIFR was not pink
[ADD] RadarFileGeometry (wip)
[FIX] Obs not working multiplane
[FIX] Obs not working multipane
55335 2020_01_27 [FIX] hardcore hourly graph background
55334 2020_01_26 [REF] various code cleanup and var rename for readability
[ADD] change Hourly graph to a black line
Expand Down
4 changes: 2 additions & 2 deletions app/app.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
Expand Down Expand Up @@ -126,7 +126,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
<orderEntry type="jdk" jdkName="Android API 29 Platform (2)" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.multidex:multidex-instrumentation:2.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.61@jar" level="project" />
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/AndroidManifest.xml
View file
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="55341"
android:versionName="55341"
android:versionCode="55349"
android:versionName="55349"
>

<uses-permission android:name="android.permission.INTERNET" />
Expand Down Expand Up @@ -203,11 +203,11 @@
android:parentActivityName="WX" >
</activity>
<activity
android:name=".activitiesmisc.WebscreenAB"
android:name=".activitiesmisc.WebView"
android:parentActivityName="WX" >
</activity>
<activity
android:name=".activitiesmisc.WebscreenABState"
android:name=".activitiesmisc.WebViewTwitter"
android:parentActivityName="WX" >
</activity>
<activity
Expand Down
8 changes: 2 additions & 6 deletions app/src/main/java/joshuatee/wx/CommonActionBarFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ import joshuatee.wx.settings.SettingsMainActivity
import joshuatee.wx.audio.SettingsPlaylistActivity
import joshuatee.wx.objects.ObjectIntent
import joshuatee.wx.radar.AwcRadarMosaicActivity
import joshuatee.wx.settings.SettingsAboutActivity
import joshuatee.wx.spc.SpcSoundingsActivity
import joshuatee.wx.ui.UtilityUI
import joshuatee.wx.util.Utility
Expand Down Expand Up @@ -230,12 +231,7 @@ open class CommonActionBarFragment : AppCompatActivity(), OnMenuItemClickListene
}
}
//not removing about - ELY M.
R.id.action_about -> ObjectIntent(
this,
TextScreenActivity::class.java,
TextScreenActivity.URL,
arrayOf(UtilityAlertDialog.showVersion(this, this), "About wX")
)
R.id.action_about -> ObjectIntent(this, SettingsAboutActivity::class.java)
else -> return super.onOptionsItemSelected(item)
}
return true
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/joshuatee/wx/GlobalArrays.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ object GlobalArrays {
"LCH",
"LZK",
"MFR",
"MFL",
"MAF",
"BNA",
"MHX",
Expand Down
271 changes: 201 additions & 70 deletions app/src/main/java/joshuatee/wx/GlobalDictionaries.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,75 +22,206 @@

package joshuatee.wx

val NEXRAD_PRODUCT_STRING: Map<String, String> = mapOf(
"N0R" to "DS.p19r0",
"N1R" to "DS.p19r1",
"N2R" to "DS.p19r2",
"N3R" to "DS.p19r3",
"NSP" to "DS.p28sw",
"NSW" to "DS.p30sw",
"N0Q" to "DS.p94r0",
"N1Q" to "DS.p94r1",
"N2Q" to "DS.p94r2",
"N3Q" to "DS.p94r3",
"N0V" to "DS.p27v0",
"N1V" to "DS.p27v1",
"N2V" to "DS.p27v2",
"N3V" to "DS.p27v3",
object GlobalDictionaries {

"NCR" to "DS.p37cr",
"NCZ" to "DS.p38cr",
"ET" to "DS.p41et",
"N0U" to "DS.p99v0",
"N1U" to "DS.p99v1",
"N2U" to "DS.p99v2",
"N3U" to "DS.p99v3",
"N0S" to "DS.56rm0",
"N1S" to "DS.56rm1",
"N2S" to "DS.56rm2",
"N3S" to "DS.56rm3",
"VIL" to "DS.57vil",
"STI" to "DS.58sti",
"TVS" to "DS.61tvs",
"HI" to "DS.p59hi",
"DVL" to "DS.134il",
"EET" to "DS.135et",
"DSPFIXME" to "DS.138dp",
"MDA" to "DS.141md",
"TZ0" to "DS.180z0",
"TZ1" to "DS.180z1",
"TZ2" to "DS.180z2",
"TR0" to "DS.181r0",
"TR1" to "DS.181r1",
"TR2" to "DS.181r2",
"TR3" to "DS.181r3",
"TV0" to "DS.182v0",
"TV1" to "DS.182v1",
"TV2" to "DS.182v2",
"TV3" to "DS.182v3",
"TZL" to "DS.186zl",
"N1P" to "DS.78ohp",
"NTP" to "DS.80stp",
"NVL" to "DS.57vil",
"N0X" to "DS.159x0",
"N1X" to "DS.159x1",
"N2X" to "DS.159x2",
"N3X" to "DS.159x3",
"N0C" to "DS.161c0",
"N1C" to "DS.161c1",
"N2C" to "DS.161c2",
"N3C" to "DS.161c3",
"N0K" to "DS.163k0",
"N1K" to "DS.163k1",
"N2K" to "DS.163k2",
"N3K" to "DS.163k3",
"DAA" to "DS.170aa",
"DSA" to "DS.172dt",
"DSP" to "DS.172dt", // FIXME this should be 138
"H0C" to "DS.165h0",
"H1C" to "DS.165h1",
"H2C" to "DS.165h2",
"H3C" to "DS.165h3",
"VWP" to "DS.48vwp"
)
// FIXME rename
val NEXRAD_PRODUCT_STRING: Map<String, String> = mapOf(
"N0R" to "DS.p19r0",
"N1R" to "DS.p19r1",
"N2R" to "DS.p19r2",
"N3R" to "DS.p19r3",
"NSP" to "DS.p28sw",
"NSW" to "DS.p30sw",
"N0Q" to "DS.p94r0",
"N1Q" to "DS.p94r1",
"N2Q" to "DS.p94r2",
"N3Q" to "DS.p94r3",
"N0V" to "DS.p27v0",
"N1V" to "DS.p27v1",
"N2V" to "DS.p27v2",
"N3V" to "DS.p27v3",

"NCR" to "DS.p37cr",
"NCZ" to "DS.p38cr",
"ET" to "DS.p41et",
"N0U" to "DS.p99v0",
"N1U" to "DS.p99v1",
"N2U" to "DS.p99v2",
"N3U" to "DS.p99v3",
"N0S" to "DS.56rm0",
"N1S" to "DS.56rm1",
"N2S" to "DS.56rm2",
"N3S" to "DS.56rm3",
"VIL" to "DS.57vil",
"STI" to "DS.58sti",
"TVS" to "DS.61tvs",
"HI" to "DS.p59hi",
"DVL" to "DS.134il",
"EET" to "DS.135et",
"DSPFIXME" to "DS.138dp",
"MDA" to "DS.141md",
"TZ0" to "DS.180z0",
"TZ1" to "DS.180z1",
"TZ2" to "DS.180z2",
"TR0" to "DS.181r0",
"TR1" to "DS.181r1",
"TR2" to "DS.181r2",
"TR3" to "DS.181r3",
"TV0" to "DS.182v0",
"TV1" to "DS.182v1",
"TV2" to "DS.182v2",
"TV3" to "DS.182v3",
"TZL" to "DS.186zl",
"N1P" to "DS.78ohp",
"NTP" to "DS.80stp",
"NVL" to "DS.57vil",
"N0X" to "DS.159x0",
"N1X" to "DS.159x1",
"N2X" to "DS.159x2",
"N3X" to "DS.159x3",
"N0C" to "DS.161c0",
"N1C" to "DS.161c1",
"N2C" to "DS.161c2",
"N3C" to "DS.161c3",
"N0K" to "DS.163k0",
"N1K" to "DS.163k1",
"N2K" to "DS.163k2",
"N3K" to "DS.163k3",
"DAA" to "DS.170aa",
"DSA" to "DS.172dt",
"DSP" to "DS.172dt", // FIXME this should be 138
"H0C" to "DS.165h0",
"H1C" to "DS.165h1",
"H2C" to "DS.165h2",
"H3C" to "DS.165h3",
"VWP" to "DS.48vwp"
)

val wfoToRadarSite: Map<String, String> = mapOf(
"ABQ" to "ABX",
"ABR" to "ABR",
"AFC" to "AHG",
"AFG" to "APD",
"AJK" to "ACG",
"AKQ" to "AKQ",
"ALY" to "ENX",
"AMA" to "AMA",
"ANC" to "ANC",
"APX" to "APX",
"ARX" to "ARX",
"BGM" to "BGM",
"BIS" to "BIS",
"BMX" to "BMX",
"BOI" to "CBX",
"BOU" to "FTG",
"BOX" to "BOX",
"BRO" to "BRO",
"BTV" to "CXX",
"BUF" to "BUF",
"BYZ" to "BLX",
"CAE" to "CAE",
"CAR" to "CBW",
"CHS" to "CLX",
"CLE" to "CLE",
"CRP" to "CRP",
"CTP" to "CCX",
"CYS" to "CYS",
"DDC" to "DDC",
"DLH" to "DLH",
"DMX" to "DMX",
"DTX" to "DTX",
"DVN" to "DVN",
"EAX" to "EAX",
"EKA" to "BHX",
"EPZ" to "EPZ",
"EWX" to "EWX",
"FFC" to "FFC",
"FGF" to "MVX",
"FGZ" to "FSX",
"FSD" to "FSD",
"FWD" to "FWS",
"GGW" to "GGW",
"GID" to "UEX",
"GJT" to "GJX",
"GLD" to "GLD",
"GRB" to "GRB",
"GRR" to "GRR",
"GSP" to "GSP",
"GUM" to "GUA",
"GYX" to "GYX",
"HFO" to "HMO",
"HGX" to "HGX",
"HNX" to "HNX",
"HUN" to "HTX",
"ICT" to "ICT",
"ILM" to "LTX",
"ILN" to "ILN",
"ILX" to "ILX",
"IND" to "IND",
"IWX" to "IWX",
"JAN" to "DGX",
"JAX" to "JAX",
"JKL" to "JKL",
"KEY" to "BYX",
"LBF" to "LNX",
"LCH" to "LCH",
"LIX" to "LIX",
"LKN" to "LRX",
"LMK" to "LVX",
"LOT" to "LOT",
"LOX" to "VTX",
"LSX" to "LSX",
"LUB" to "LBB",
"LWX" to "LWX",
"LZK" to "LZK",
"MAF" to "MAF",
"MEG" to "NQA",
"MFL" to "AMX",
"MFR" to "MAX",
"MHX" to "MHX",
"MKX" to "MKX",
"MLB" to "MLB",
"MOB" to "MOB",
"MPX" to "MPX",
"MQT" to "MQT",
"MRX" to "MRX",
"MSO" to "MSX",
"MTR" to "MUX",
"OAX" to "OAX",
"OHX" to "OHX",
"OKX" to "OKX",
"OTX" to "OTX",
"OUN" to "TLX",
"PAH" to "PAH",
"PBZ" to "PBZ",
"PDT" to "PDT",
"PHI" to "DIX",
"PIH" to "SFX",
"PQR" to "RTX",
"PSR" to "IWA",
"PUB" to "PUX",
"RAH" to "RAX",
"REV" to "RGX",
"RIW" to "RIW",
"RLX" to "RLX",
"RNK" to "FCX",
"SEW" to "ATX",
"SGF" to "SGF",
"SGX" to "NKX",
"SHV" to "SHV",
"SJT" to "SJT",
"SJU" to "JUA",
"JSJ" to "JUA",
"SLC" to "MTX",
"STO" to "DAX",
"TAE" to "TLH",
"TBW" to "TBW",
"TFX" to "TFX",
"TOP" to "TWX",
"TSA" to "INX",
"TWC" to "EMX",
"UNR" to "UDX",
"VEF" to "ESX"
)
}

Loading

0 comments on commit 022ccb8

Please sign in to comment.