Skip to content

Commit 76fd752

Browse files
ELY3MELY3M
committed
55975-elys
1 parent 004ea25 commit 76fd752

53 files changed

Lines changed: 180 additions & 940 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎DOC/Todo.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
# TODOs
22

3-
Sep 2025
4-
MyApp - radar pref init should handle color init, not 2 calls from myapp
3+
## Sep 2025
4+
getter/setter consistency
55
ObjectLocation fix handling of notif vars
66
UtilityStorePreferences.setDefaults use Utility.writePref
77
If Settings - Colors visited, refresh main screen (for Nexrad)
8-
remove RadarPreferences.blackBg
98
better way to handle text color in ViewColorLegend
109

1110
## Bugs

‎app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2424
xmlns:tools="http://schemas.android.com/tools"
25-
android:versionCode="55973"
26-
android:versionName="55973-elys">
25+
android:versionCode="55975"
26+
android:versionName="55975-elys">
2727

2828
<uses-permission android:name="android.permission.INTERNET" />
2929
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

‎app/src/main/java/joshuatee/wx/audio/AudioPlayActivity.kt‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ abstract class AudioPlayActivity : AppCompatActivity() {
4545
protected lateinit var objectToolbar: ObjectToolbar
4646
protected lateinit var objectToolbarBottom: ObjectToolbar
4747
private lateinit var pause: MenuItem
48-
49-
// private var ttsProd = ""
50-
// private var ttsTxt = ""
5148
private lateinit var view: View
5249
private var pausePressedIcon = 0
5350
protected var tabletInLandscape = false
@@ -77,10 +74,6 @@ abstract class AudioPlayActivity : AppCompatActivity() {
7774
tabletInLandscape = UtilityUI.isTablet() && UtilityUI.isLandScape(this)
7875
}
7976

80-
// fun setTitle(s: String) {
81-
// title = s
82-
// }
83-
8477
fun setTitle(s: String, sub: String) {
8578
title = s
8679
toolbar.subtitle = sub
@@ -103,8 +96,6 @@ abstract class AudioPlayActivity : AppCompatActivity() {
10396
prod: String,
10497
playlistToken: String
10598
): Boolean {
106-
// ttsProd = prod
107-
// ttsTxt = txt
10899
when (item) {
109100
R.id.action_read_aloud -> {
110101
UtilityTts.synthesizeTextAndPlay(this, txt, prod)

‎app/src/main/java/joshuatee/wx/models/ModelsGenericActivity.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,6 @@ class ModelsGenericActivity : VideoRecordActivity(), OnMenuItemClickListener {
420420
when (item.itemId) {
421421
R.id.action_region -> ObjectDialogue.generic(this, om.sectors, ::getContent) {
422422
om.sector = om.sectors[it]
423-
// om.sectorInt = it
424423
om.displayData.image.forEach { touchImage -> touchImage.resetZoom() }
425424
}
426425

‎app/src/main/java/joshuatee/wx/models/ObjectModel.kt‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ class ObjectModel(val activity: Activity, var prefModel: String, numPanesStr: St
4242
var currentParam = ""
4343
var numPanes = 1
4444
var model = "WRF"
45-
46-
// var sectorInt = 0
4745
var curImg = 0
4846
var modelType = ModelType.NSSL
4947
var startStep = 0
@@ -78,14 +76,9 @@ class ObjectModel(val activity: Activity, var prefModel: String, numPanesStr: St
7876
var groups = SparseArray<Group>()
7977
var routeFn: (Context) -> Unit = {}
8078

81-
//
8279
private var defaultModel = ""
8380
var spinnerTimeValue = 0
84-
85-
// var animRan = false
8681
var firstRun = false
87-
88-
// var imageLoaded = false
8982
lateinit var miStatusParam1: MenuItem
9083
lateinit var miStatusParam2: MenuItem
9184
var fab1: Fab? = null

‎app/src/main/java/joshuatee/wx/nhc/NHCStormActivity.kt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ class NhcStormActivity : BaseActivity() {
5858
}
5959

6060
private lateinit var stormData: NhcStormDetails
61-
62-
// private var product = ""
6361
private var bitmapsAttr = mutableListOf<BitmapAttr>()
6462
private lateinit var cardText: CardText
6563
private lateinit var box: VBox
@@ -113,7 +111,6 @@ class NhcStormActivity : BaseActivity() {
113111
boxText = VBox(this)
114112
box.addLayout(boxImage)
115113
box.addLayout(boxText)
116-
// product = "MIATCP${stormData.binNumber}"
117114
textProductUrl = stormData.advisoryNumber
118115
if (textProductUrl.startsWith("HFO")) {
119116
office = "HFO"
@@ -141,7 +138,6 @@ class NhcStormActivity : BaseActivity() {
141138
imageUrls.forEach {
142139
var url = stormData.baseUrl
143140
if (it == "WPCQPF_sm2.gif" || it == "WPCERO_sm2.gif") {
144-
// url = url.dropLast(2)
145141
url =
146142
url.replace(ObjectDateTime.getYearString(), ObjectDateTime.getYearShortString())
147143
}

‎app/src/main/java/joshuatee/wx/nhc/Nhc.kt‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ class Nhc(val context: Context, box: VBox) {
143143
for (adv in publicAdvisories) {
144144
val productToken = adv.split("/").last().replace(".shtml", "")
145145
val text = DownloadText.byProduct(context, productToken)
146-
// val status = text.replace("\n", " ").parseFirst("(\\.\\.\\..*?\\.\\.\\.)")
147146
val status = text.replace("\n", " ")
148147
.parseFirst("BULLETIN.*?" + ObjectDateTime.getYearString() + " (.*?)SUMMARY OF ")
149148
statusList.add(status)
@@ -164,12 +163,8 @@ class Nhc(val context: Context, box: VBox) {
164163
longitudes[index],
165164
intensities[index],
166165
Utility.safeGet(statusList, index),
167-
// statusList[index],
168166
Utility.safeGet(publicAdvisories, index),
169-
Utility.safeGet(publicAdvisoriesNumbers, index),
170-
// Utility.safeGet(forecastAdvisories, index),
171-
// Utility.safeGet(forecastDiscussions, index),
172-
// Utility.safeGet(windSpeedProbabilities, index),
167+
Utility.safeGet(publicAdvisoriesNumbers, index)
173168
)
174169
nhcStormDetailsList.add(objectNhc)
175170
}

‎app/src/main/java/joshuatee/wx/nhc/NhcRegionSummary.kt‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ class NhcRegionSummary(region: NhcOceanEnum) {
2828
var urls: List<String>
2929
var titles: List<String>
3030

31-
// var bitmaps = listOf<Bitmap>()
32-
// private var replaceString: String
33-
// private var baseUrl: String
34-
3531
init {
3632
when (region) {
3733
NhcOceanEnum.ATL -> {
@@ -45,8 +41,6 @@ class NhcRegionSummary(region: NhcOceanEnum) {
4541
"${GlobalVariables.NWS_NHC_WEBSITE_PREFIX}/xgtwo/two_atl_2d0.png",
4642
"${GlobalVariables.NWS_NHC_WEBSITE_PREFIX}/xgtwo/two_atl_7d0.png"
4743
)
48-
// replaceString = "NHC Atlantic Wallet"
49-
// baseUrl = "${GlobalVariables.NWS_NHC_WEBSITE_PREFIX}/nhc_at"
5044
}
5145

5246
NhcOceanEnum.EPAC -> {
@@ -60,8 +54,6 @@ class NhcRegionSummary(region: NhcOceanEnum) {
6054
"${GlobalVariables.NWS_NHC_WEBSITE_PREFIX}/xgtwo/two_pac_2d0.png",
6155
"${GlobalVariables.NWS_NHC_WEBSITE_PREFIX}/xgtwo/two_pac_7d0.png"
6256
)
63-
// replaceString = "NHC Eastern Pacific Wallet"
64-
// baseUrl = "${GlobalVariables.NWS_NHC_WEBSITE_PREFIX}/nhc_ep"
6557
}
6658

6759
NhcOceanEnum.CPAC -> {
@@ -75,8 +67,6 @@ class NhcRegionSummary(region: NhcOceanEnum) {
7567
"${GlobalVariables.NWS_NHC_WEBSITE_PREFIX}/xgtwo/two_cpac_2d0.png",
7668
"${GlobalVariables.NWS_NHC_WEBSITE_PREFIX}/xgtwo/two_cpac_7d0.png"
7769
)
78-
// replaceString = ""
79-
// baseUrl = ""
8070
}
8171
}
8272
}

‎app/src/main/java/joshuatee/wx/nhc/NhcStormDetails.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ class NhcStormDetails(
4242
var status: String,
4343
advisoryUrl: String,
4444
val advisoryIssuanceNumber: String,
45-
// var forecastAdvisoryUrl: String,
46-
// var forecastDiscussionUrl: String,
47-
// var windSpeedProbabilitiesUrl: String
4845
) : Serializable {
4946

5047
var center = "$lat $lon"

‎app/src/main/java/joshuatee/wx/notifications/NotificationMcd.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ internal object NotificationMcd {
8282
for (n in 1..Location.getNumberOfLocations()) {
8383
val locNum = n.toString()
8484
if (Location.locations.getOrNull(n - 1)?.notificationMcd == true) {
85-
// if (Location.locations[n - 1].notificationMcd) {
8685
// if location is watching for MCDs pull ib lat/lon and iterate over polygons
8786
// call secondary method to send notif if required
8887
if (polygonShape.contains(Location.getLatLon(n - 1).asPoint())) {

0 commit comments

Comments
 (0)