55932-elys

ELY3M · Jan 10, 2025 · dfb6ec2 · dfb6ec2
1 parent 3fe3dce
commit dfb6ec2
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git a/app/src/main/java/joshuatee/wx/misc/ImageShowActivity.kt b/app/src/main/java/joshuatee/wx/misc/ImageShowActivity.kt
@@ -29,11 +29,13 @@ import android.view.Menu
 import android.view.MenuItem
 import joshuatee.wx.R
 import joshuatee.wx.objects.FutureBytes
+import joshuatee.wx.objects.FutureVoid
 import joshuatee.wx.ui.BaseActivity
 import joshuatee.wx.ui.TouchImage
 import joshuatee.wx.util.UtilityIO
 import joshuatee.wx.util.UtilityImg
 import joshuatee.wx.util.UtilityShare
+import joshuatee.wx.util.WeatherStory
 
 class ImageShowActivity : BaseActivity() {
 
@@ -52,6 +54,7 @@ class ImageShowActivity : BaseActivity() {
 
     private var url = ""
     private var urls = listOf<String>()
+    private var weatherStoryUrl = ""
     private var shareTitle = ""
     private var needsWhiteBackground = false
     private lateinit var touchImage: TouchImage
@@ -63,7 +66,12 @@ class ImageShowActivity : BaseActivity() {
 
     @SuppressLint("MissingSuperCall")
     override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState, R.layout.activity_image_show, R.menu.image_show_activity, false)
+        super.onCreate(
+            savedInstanceState,
+            R.layout.activity_image_show,
+            R.menu.image_show_activity,
+            false
+        )
         val arguments = intent.getStringArrayExtra(URL)!!
         url = arguments[0]
         shareTitle = arguments[1]
@@ -84,6 +92,10 @@ class ImageShowActivity : BaseActivity() {
                 loadRawBitmap()
             }
 
+            url.contains("WEATHER_STORY:") -> {
+                loadWeatherStory()
+            }
+
             else -> getContent()
         }
     }
@@ -93,6 +105,14 @@ class ImageShowActivity : BaseActivity() {
         touchImage.set(bitmap)
     }
 
+    private fun loadWeatherStory() {
+        FutureVoid({ weatherStoryUrl = WeatherStory.getUrl() }, ::loadWeatherStoryUrl)
+    }
+
+    private fun loadWeatherStoryUrl() {
+        FutureBytes(weatherStoryUrl, ::showImage)
+    }
+
     override fun onRestart() {
         getContent()
         super.onRestart()

diff --git a/app/src/main/java/joshuatee/wx/settings/UtilityHomeScreen.kt b/app/src/main/java/joshuatee/wx/settings/UtilityHomeScreen.kt
@@ -189,9 +189,9 @@ internal object UtilityHomeScreen {
         classArgs["RAD_2KM"] = arrayOf("")
         classId["RAD_2KM"] = RadarMosaicActivity.URL
 
-//        classes["WEATHERSTORY"] = ImageShowActivity::class.java
-//        classArgs["WEATHERSTORY"] = arrayOf(DownloadImage.byProduct(context, "WEATHERSTORY"), "Weather Story")
-//        classId["WEATHERSTORY"] = ImageShowActivity.URL
+        classes["WEATHERSTORY"] = ImageShowActivity::class.java
+        classArgs["WEATHERSTORY"] = arrayOf("WEATHER_STORY::", "Weather Story")
+        classId["WEATHERSTORY"] = ImageShowActivity.URL
 
         listOf(
             "FMAP",

diff --git a/app/src/main/java/joshuatee/wx/util/WeatherStory.kt b/app/src/main/java/joshuatee/wx/util/WeatherStory.kt
@@ -32,7 +32,7 @@ object WeatherStory {
         val html = UtilityIO.getHtml(url)
         var scrapeUrl = UtilityString.parse(
             html,
-            "src=.(https://www.weather.gov//images/.../wxstory/Tab.FileL.png). "
+            "src=.(https://www.weather.gov/?/images/.../wxstory/Tab.FileL.png). "
         )
         if (scrapeUrl.isNotEmpty()) {
             productUrl = scrapeUrl

diff --git a/doc/ChangeLog.md b/doc/ChangeLog.md
@@ -4,7 +4,7 @@
 
 ## 55932 2025_01_10
 
-* [ADD]
+* [ADD] On homescreen if "Weather Story" is configured and you tap on it image is opened up in dedicated image viewer allowing you to share the image or zoom in with the full screen.
 
 ## 55931 2025_01_10
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
     ## 55932 2025_01_10
-    * [ADD]
+    * [ADD] On homescreen if "Weather Story" is configured and you tap on it image is opened up in dedicated image viewer allowing you to share the image or zoom in with the full screen.
     ## 55931 2025_01_10
@@ Expand Down @@