added radar show/hide function

DOC/ChangeLog.txt

@@ -28,7 +28,12 @@
 // TODO look into tornado instead of #tornado for twitter embedded widget
 // TODO resolve activityReference issue in LocationFragment
 // TODO camelCase Myapp vars wxglrender
+// TODO https://android-developers.googleblog.com/2019/03/introducing-new-google-play-app-and.html
 // TODO put more diagnostics in settings -> about including more download stats and also rolling buffer for stacktraces
+// TODO for imageMap see if can set attributes in code so as to remove redundant layout files
+// TODO make usalerts detail layout more dynamic
+// TODO scan all obs sites - https://w1.weather.gov/xml/current_obs/seek.php?state=nd&Find=Find
+// TODO                          https://tgftp.nws.noaa.gov/data/observations/metar/stations/
 
 [ADD] - adding something new - method, file, etc. to the repo
 [REM] - remove items
@@ -38,6 +43,17 @@
 [REF] - refactor a method, group, variable, etc.
 [MER] - merge
 
+55217 2019_06_06    [IMP] SDK platform tools updated to 29.0.0
+                    [REF] variable renaming cont.
+55216 2019_06_06    [FIX] remove obs site KIGX from stations_us4.txt and us_metar3.txt
+                    [REF] variable renaming cont.
+55215 2019_06_05    [REF] move to common xml layout files in several activities
+                    [REF] variable renaming cont.
+55214 2019_06_02    [IMP] add content description tags in fragment tiles to assist accessibility
+                    [FIX] "pin" a shortcut to desktop for WFO/AFD activity was causing crash and not working
+                    [REF] architectual simplification in WpcMpdShowSummaryActivity/SpcMcdWatchShowSummaryActivity
+55211 2019_06_01    [FIX] at joshuatee.wx.activitiesmisc.TextScreenActivity.onCreate (TextScreenActivity.kt:74)
+                    Caused by: kotlin.UninitializedPropertyAccessException:
 55210 2019_06_01    [FIX] in UtilityNotification change channel notification importance to NotificationManager.IMPORTANCE_HIGH (Android Q)
                     [REF] camelcase in some radar and notification files
 55209 2019_05_30    [IMP] add watch/mpd/mcd check in radar based off same code in severe dashboard

README.md

@@ -46,6 +46,7 @@ http://bmx3r.com/wx
 #
 ## DONE!
 ====================================   
+Added in function to enable and disable showing radar.  idea/request by Mike T. - very great idea!   The radar show/hide function is in menu in tools section.         
 reversed my old warning mod and cleaned up.   
 updated the code with Joshua many changes and added in zoom setting for conus radar to zoom out to (5-20-19) (Tornado day in OK!)   
 all watch crash bugs should be gone, hopefully!   

TODOs.md

@@ -24,6 +24,7 @@
 #
 ## DONE!
 ====================================   
+Added in function to enable and disable showing radar.  idea/request by Mike T. - very great idea!   The radar show/hide function is in menu in tools section.         
 reversed my old warning mod and cleaned up.   
 updated the code with Joshua many changes and added in zoom setting for conus radar to zoom out to (5-20-19) (Tornado day in OK!)   
 all watch crash bugs should be gone, hopefully!   

app/src/main/AndroidManifest.xml

@@ -22,8 +22,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="joshuatee.wx"
-    android:versionCode="55210"
-    android:versionName="55210"
+    android:versionCode="55217"
+    android:versionName="55217"
     >
 
  <uses-permission android:name="android.permission.INTERNET" />

app/src/main/java/joshuatee/wx/MyApplication.kt

@@ -745,6 +745,7 @@ class MyApplication : Application() {
         var radarSti: Boolean = false
         var radarHi: Boolean = false
         var radarTvs: Boolean = false
+        var radarShowRadar: Boolean = true
         var radarShowLegend: Boolean = false
         var radarShowLegendWidth: Int = 0
         var radarShowLegendTextSize: Int = 0
@@ -808,6 +809,7 @@ class MyApplication : Application() {
             radarCountyHires = getInitialPreference("RADAR_COUNTY_HIRES", "false")
             radarStateHires = getInitialPreference("RADAR_STATE_HIRES", "false")
             radarIconsLevel2 = getInitialPreference("WXOGL_ICONS_LEVEL2", "false")
+            radarShowRadar = getInitialPreference("RADAR_SHOW_RADAR", "false")
             radarShowLegend = getInitialPreference("RADAR_SHOW_LEGEND", "false")
             radarShowLegendWidth = getInitialPreference("RADAR_SHOW_LEGEND_WIDTH", 50)
             radarShowLegendTextSize = getInitialPreference("RADAR_SHOW_LEGEND_TEXTSIZE", 30)

app/src/main/java/joshuatee/wx/activitiesmisc/HourlyActivity.kt

@@ -40,7 +40,6 @@ import kotlinx.android.synthetic.main.activity_hourly.*
 import com.jjoe64.graphview.series.DataPoint
 import com.jjoe64.graphview.series.LineGraphSeries
 import com.jjoe64.graphview.DefaultLabelFormatter
-import joshuatee.wx.notifications.BackgroundFetch
 import kotlinx.coroutines.*
 
 class HourlyActivity : BaseActivity(), Toolbar.OnMenuItemClickListener {
@@ -55,8 +54,8 @@ class HourlyActivity : BaseActivity(), Toolbar.OnMenuItemClickListener {
 
     private val uiDispatcher: CoroutineDispatcher = Dispatchers.Main
     private var htmlShare = listOf<String>()
-    private lateinit var card: ObjectCard
-    private lateinit var textCard: ObjectCardVerticalText
+    private lateinit var objectCard: ObjectCard
+    private lateinit var objectCardVerticalText: ObjectCardVerticalText
     private var hourlyData = ObjectHourly()
     private var locationNumber = 0
 
@@ -70,15 +69,14 @@ class HourlyActivity : BaseActivity(), Toolbar.OnMenuItemClickListener {
         )
         toolbarBottom.setOnMenuItemClickListener(this)
         locationNumber = (intent.getStringExtra(LOC_NUM).toIntOrNull() ?: 0) - 1
-        card = ObjectCard(this, R.color.black, R.id.cv1)
+        objectCard = ObjectCard(this, R.color.black, R.id.cv1)
         cv1.visibility = View.GONE
-        textCard = ObjectCardVerticalText(this, 5, linearLayout, toolbar)
-        textCard.setOnClickListener(View.OnClickListener { sv.scrollTo(0,0)})
+        objectCardVerticalText = ObjectCardVerticalText(this, 5, linearLayout, toolbar)
+        objectCardVerticalText.setOnClickListener(View.OnClickListener { sv.scrollTo(0,0)})
         title = "Hourly Forecast"
         toolbar.subtitle = Location.getName(locationNumber)
         //UtilityLog.d("wx", UtilityTimeSunMoon.getSunTimesForHomescreen())
         //UtilityLog.d("wx", UtilityTimeSunMoon.getMoonTimesForHomescreen())
-        //BackgroundFetch(this).getContent()
         getContent()
     }
 
@@ -88,7 +86,7 @@ class HourlyActivity : BaseActivity(), Toolbar.OnMenuItemClickListener {
         val result2 = async(Dispatchers.IO) { UtilityUSHourly.getStringForActivity(htmlShare[1]) }
         hourlyData = result2.await()
         cv1.visibility = View.VISIBLE
-        textCard.setText(
+        objectCardVerticalText.setText(
             listOf(
                 hourlyData.time,
                 hourlyData.temp,

app/src/main/java/joshuatee/wx/activitiesmisc/LightningActivity.kt

@@ -49,27 +49,27 @@ class LightningActivity : VideoRecordActivity(), Toolbar.OnMenuItemClickListener
     private var period = "0.25"
     private var periodPretty = "15 MIN"
     private lateinit var img: ObjectTouchImageView
-    private lateinit var drw: ObjectNavDrawer
+    private lateinit var objectNavDrawer: ObjectNavDrawer
     private val prefTokenIdx = "LIGHTNING_SECTOR_IDX"
 
     @SuppressLint("MissingSuperCall")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(
-            savedInstanceState,
-            R.layout.activity_image_show_navdrawer_bottom_toolbar,
-            R.menu.lightning_activity,
-            iconsEvenlySpaced = true,
-            bottomToolbar = true
+                savedInstanceState,
+                R.layout.activity_image_show_navdrawer_bottom_toolbar,
+                R.menu.lightning_activity,
+                iconsEvenlySpaced = true,
+                bottomToolbar = true
         )
         toolbarBottom.setOnMenuItemClickListener(this)
         toolbar.setOnClickListener { toolbar.showOverflowMenu() }
-        drw = ObjectNavDrawer(this, UtilityLightning.labels, UtilityLightning.urls)
-        img = ObjectTouchImageView(this, this, toolbar, toolbarBottom, R.id.iv, drw, prefTokenIdx)
-        drw.index = Utility.readPref(this, prefTokenIdx, 0)
-        drw.setListener(::getContentFixThis)
+        objectNavDrawer = ObjectNavDrawer(this, UtilityLightning.labels, UtilityLightning.urls)
+        img = ObjectTouchImageView(this, this, toolbar, toolbarBottom, R.id.iv, objectNavDrawer, prefTokenIdx)
+        objectNavDrawer.index = Utility.readPref(this, prefTokenIdx, 0)
+        objectNavDrawer.setListener(::getContentFixThis)
         period = Utility.readPref(this, "LIGHTNING_PERIOD", period)
         periodPretty = UtilityLightning.getTimePretty(period)
-        toolbarBottom.setOnClickListener { drw.drawerLayout.openDrawer(drw.listView) }
+        toolbarBottom.setOnClickListener { objectNavDrawer.drawerLayout.openDrawer(objectNavDrawer.listView) }
         getContent()
     }
 
@@ -78,29 +78,29 @@ class LightningActivity : VideoRecordActivity(), Toolbar.OnMenuItemClickListener
     }
 
     private fun getContent() = GlobalScope.launch(uiDispatcher) {
-        title = "Lightning " + drw.getLabel()
+        title = "Lightning " + objectNavDrawer.getLabel()
         toolbar.subtitle = periodPretty
-        bitmap = withContext(Dispatchers.IO) { UtilityLightning.getImage(drw.getUrl(), period) }
+        bitmap = withContext(Dispatchers.IO) { UtilityLightning.getImage(objectNavDrawer.getUrl(), period) }
         img.setBitmap(bitmap)
         img.firstRunSetZoomPosn("LIGHTNING")
         Utility.writePref(this@LightningActivity, "LIGHTNING_PERIOD", period)
     }
 
     override fun onPostCreate(savedInstanceState: Bundle?) {
         super.onPostCreate(savedInstanceState)
-        drw.actionBarDrawerToggle.syncState()
+        objectNavDrawer.actionBarDrawerToggle.syncState()
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
-        drw.actionBarDrawerToggle.onConfigurationChanged(newConfig)
+        objectNavDrawer.actionBarDrawerToggle.onConfigurationChanged(newConfig)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean =
-        drw.actionBarDrawerToggle.onOptionsItemSelected(item) || super.onOptionsItemSelected(item)
+            objectNavDrawer.actionBarDrawerToggle.onOptionsItemSelected(item) || super.onOptionsItemSelected(item)
 
     override fun onMenuItemClick(item: MenuItem): Boolean {
-        if (drw.actionBarDrawerToggle.onOptionsItemSelected(item)) {
+        if (objectNavDrawer.actionBarDrawerToggle.onOptionsItemSelected(item)) {
             return true
         }
         when (item.itemId) {
@@ -109,9 +109,9 @@ class LightningActivity : VideoRecordActivity(), Toolbar.OnMenuItemClickListener
                     checkOverlayPerms()
                 } else {
                     UtilityShare.shareBitmap(
-                        this,
-                        "Lightning Strikes " + drw.getLabel() + " $periodPretty",
-                        bitmap
+                            this,
+                            "Lightning Strikes " + objectNavDrawer.getLabel() + " $periodPretty",
+                            bitmap
                     )
                 }
             }

app/src/main/java/joshuatee/wx/activitiesmisc/NWSObsSitesActivity.kt

@@ -44,7 +44,7 @@ class NwsObsSitesActivity : BaseActivity(), Toolbar.OnMenuItemClickListener {
     private val listSort = mutableListOf<String>()
     private var siteDisplay = false
     private var provSelected = ""
-    private lateinit var recyclerView: ObjectRecyclerView
+    private lateinit var objectRecyclerView: ObjectRecyclerView
     private val titleString = "Observation sites"
     val prefToken: String = "NWS_OBSSITE_LAST_USED"
     private lateinit var lastUsedMenuItem: MenuItem
@@ -61,7 +61,7 @@ class NwsObsSitesActivity : BaseActivity(), Toolbar.OnMenuItemClickListener {
         title = titleString
         updateButton()
         siteDisplay = false
-        recyclerView = ObjectRecyclerView(
+        objectRecyclerView = ObjectRecyclerView(
                 this,
                 this,
                 R.id.card_list,
@@ -84,7 +84,7 @@ class NwsObsSitesActivity : BaseActivity(), Toolbar.OnMenuItemClickListener {
         } else {
             when (position) {
                 0 -> {
-                    recyclerView.refreshList(GlobalArrays.states.toMutableList())
+                    objectRecyclerView.refreshList(GlobalArrays.states.toMutableList())
                     siteDisplay = false
                     title = titleString
                 }
@@ -124,7 +124,7 @@ class NwsObsSitesActivity : BaseActivity(), Toolbar.OnMenuItemClickListener {
             listCity.add(tmpArr[2] + ": " + tmpArr[1])
             listIds.add(tmpArr[2])
         }
-        recyclerView.refreshList(listCity)
+        objectRecyclerView.refreshList(listCity)
         siteDisplay = true
     }
 

app/src/main/java/joshuatee/wx/activitiesmisc/SpotterReportsActivity.kt

@@ -40,15 +40,15 @@ class SpotterReportsActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(
             savedInstanceState,
-            R.layout.activity_spotter_reports_recyclerview,
+            R.layout.activity_recyclerview_toolbar,
             null,
             false
         )
-        val recyclerView = ObjectRecyclerViewGeneric(this, this, R.id.card_list)
-        val ca = AdapterSpotterReports(UtilitySpotter.spotterReports)
-        recyclerView.recyclerView.adapter = ca
+        val objectRecyclerViewGeneric = ObjectRecyclerViewGeneric(this, this, R.id.card_list)
+        val adapterSpotterReports = AdapterSpotterReports(UtilitySpotter.spotterReports)
+        objectRecyclerViewGeneric.recyclerView.adapter = adapterSpotterReports
         title = UtilitySpotter.spotterReports.size.toString() + " Spotter reports " + UtilityTime.gmtTime("HH:mm")
-        ca.setOnItemClickListener(object : AdapterSpotterReports.MyClickListener {
+        adapterSpotterReports.setOnItemClickListener(object : AdapterSpotterReports.MyClickListener {
             override fun onItemClick(position: Int) {
                 itemSelected(position)
             }

app/src/main/java/joshuatee/wx/activitiesmisc/SunMoonActivity.kt

@@ -41,9 +41,8 @@ class SunMoonActivity : AudioPlayActivity(), OnMenuItemClickListener {
     private val uiDispatcher: CoroutineDispatcher = Dispatchers.Main
     private var content = ""
     private var contentFull = ""
-    private lateinit var textCard: ObjectCardText
-    private var dataA = ""
-    private var dataB = ""
+    private lateinit var objectCardText: ObjectCardText
+    private var data = listOf("", "")
 
     @SuppressLint("MissingSuperCall")
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -55,7 +54,7 @@ class SunMoonActivity : AudioPlayActivity(), OnMenuItemClickListener {
         toolbarBottom.setOnMenuItemClickListener(this)
         val menu = toolbarBottom.menu
         menu.findItem(R.id.action_playlist).isVisible = false
-        textCard = ObjectCardText(this, ll, toolbar, toolbarBottom)
+        objectCardText = ObjectCardText(this, ll, toolbar, toolbarBottom)
         getContent()
     }
 
@@ -64,19 +63,16 @@ class SunMoonActivity : AudioPlayActivity(), OnMenuItemClickListener {
             content = UtilitySunMoon.getExtendedData(Location.locationIndex)
             contentFull = UtilitySunMoon.getFullDates()
         }
-        // FIXME use a list
-        val (A, B) = UtilitySunMoon.parseData(content)
-        dataA = A
-        dataB = B
-        title = dataA
+        data = UtilitySunMoon.parseData(content)
+        title = data[0]
         toolbar.subtitle = Location.name
-        textCard.setText(dataB + MyApplication.newline + MyApplication.newline + contentFull)
+        objectCardText.setText(data[1] + MyApplication.newline + MyApplication.newline + contentFull)
     }
 
     override fun onMenuItemClick(item: MenuItem): Boolean {
-        if (audioPlayMenu(item.itemId, dataB, "sunmoon", "sunmoon")) return true
+        if (audioPlayMenu(item.itemId, data[1], "sunmoon", "sunmoon")) return true
         when (item.itemId) {
-            R.id.action_share -> UtilityShare.shareText(this, dataA, dataB)
+            R.id.action_share -> UtilityShare.shareText(this, data[0], data[1])
             else -> return super.onOptionsItemSelected(item)
         }
         return true

app/src/main/java/joshuatee/wx/activitiesmisc/TextScreenActivity.kt

@@ -66,11 +66,7 @@ class TextScreenActivity : AudioPlayActivity(), OnMenuItemClickListener {
         val playlistMi = menu.findItem(R.id.action_playlist)
         playlistMi.isVisible = false
         toolbarBottom.setOnMenuItemClickListener(this)
-        try {
-            activityArguments = intent.getStringArrayExtra(URL)
-        } catch (e: IllegalStateException) {
-            UtilityLog.handleException(e)
-        }
+        activityArguments = intent.getStringArrayExtra(URL)
         url = activityArguments[0]
         title = activityArguments[1]
         textCard = ObjectCardText(this, ll, toolbar, toolbarBottom)

app/src/main/java/joshuatee/wx/activitiesmisc/USWarningsImpactActivity.kt

@@ -42,7 +42,7 @@ class USWarningsImpactActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(
             savedInstanceState,
-            R.layout.activity_uswarningsimpact_recyclerview,
+            R.layout.activity_recyclerview_toolbar,
             null,
             false
         )