Skip to content

Commit 36de9f5

Browse files
U-METAL103\103U-METAL103\103
U-METAL103\103
authored and
U-METAL103\103
committed
nhc url update
1 parent 4635f26 commit 36de9f5

27 files changed

+373
-582
lines changed

‎DOC/Todo.md

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ HREF - reset zoom when change sector
2828

2929
## Bugs
3030

31+
* [FIX] ChromeOS: with obs enabled, zoom out via kbd - obs don't update location and never hides
3132
* [FIX] nexrad crash with ConcurrentModificationException in NexradRender:
3233
data.wpcFrontBuffersList.forEach {
3334
* [FIX] nexrad with cities, zoom in on location and then long press to current radar - text objects

‎app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ dependencies {
9090
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
9191
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
9292
// https://developer.android.com/jetpack/androidx/versions
93-
implementation 'com.google.android.material:material:1.10.0'
93+
implementation 'com.google.android.material:material:1.9.0'
9494
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
9595
implementation 'androidx.cardview:cardview:1.0.0'
96-
implementation 'androidx.core:core-ktx:1.12.0'
96+
implementation 'androidx.core:core-ktx:1.10.0'
9797
implementation 'androidx.media:media:1.6.0'
9898
implementation 'androidx.preference:preference-ktx:1.2.1'
9999
implementation 'androidx.recyclerview:recyclerview:1.3.2'

‎app/src/main/AndroidManifest.xml

+18-20
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<!-- modded by ELY M. -->
2222

2323
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
24-
android:versionCode="55843"
25-
android:versionName="55843-elys">
24+
android:versionCode="55851"
25+
android:versionName="55851-elys">
2626

2727
<uses-permission android:name="android.permission.INTERNET" />
2828
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -108,24 +108,22 @@
108108
android:name=".activitiesmisc.RtmaActivity"
109109
android:label=""
110110
android:parentActivityName="WX" />
111-
<service
112-
android:name=".radar.SpotterNetworkPositionReportService"
113-
android:enabled="true" />
114-
<service
115-
android:name=".audio.StopAudioService"
116-
android:enabled="true" />
117-
<service
118-
android:name=".audio.PlayAudioService"
119-
android:enabled="true" />
120-
<service
121-
android:name=".audio.AudioServiceToggleState"
122-
android:enabled="true" />
123-
<service
124-
android:name=".audio.AudioServiceBack"
125-
android:enabled="true" />
126-
<service
127-
android:name=".audio.AudioServiceForward"
128-
android:enabled="true" />
111+
112+
<!-- <service-->
113+
<!-- android:name=".audio.StopAudioService"-->
114+
<!-- android:enabled="true" />-->
115+
<!-- <service-->
116+
<!-- android:name=".audio.PlayAudioService"-->
117+
<!-- android:enabled="true" />-->
118+
<!-- <service-->
119+
<!-- android:name=".audio.AudioServiceToggleState"-->
120+
<!-- android:enabled="true" />-->
121+
<!-- <service-->
122+
<!-- android:name=".audio.AudioServiceBack"-->
123+
<!-- android:enabled="true" />-->
124+
<!-- <service-->
125+
<!-- android:name=".audio.AudioServiceForward"-->
126+
<!-- android:enabled="true" />-->
129127

130128
<receiver
131129
android:name=".notifications.AlertReceiver"

‎app/src/main/java/joshuatee/wx/StartupActivity.kt

+2-13
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ class StartupActivity : Activity() {
5353
startInitialActivity()
5454
finish()
5555
}
56-
5756

5857
private fun initPreferences() {
5958
if (Utility.readPrefWithNull(this, "LOC1_LABEL", null) == null) {
@@ -65,20 +64,10 @@ class StartupActivity : Activity() {
6564

6665
private fun initBackgroundJobs() {
6766
UtilityWXJobService.startService(this)
68-
if (UIPreferences.mediaControlNotif) {
69-
UtilityNotification.createMediaControlNotification(applicationContext, "")
70-
}
7167
}
72-
68+
7369
private fun startInitialActivity() {
74-
if (Utility.readPref(this, "LAUNCH_TO_RADAR", "false") == "false") {
75-
Route(this, WX::class.java)
76-
} else {
77-
val wfo = Location.wfo
78-
val state = UtilityLocation.getWfoSiteName(wfo).split(",")[0]
79-
val radarSite = Location.getRid(this, Location.currentLocationStr)
80-
Route.radar(this, arrayOf(radarSite, state))
81-
}
70+
Route(this, WX::class.java)
8271
}
8372

8473
private fun askPerms() {

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

-10
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import androidx.core.app.ActivityCompat
3333
import joshuatee.wx.R
3434
import joshuatee.wx.settings.UIPreferences
3535
import joshuatee.wx.common.GlobalVariables
36-
import joshuatee.wx.notifications.UtilityNotification
3736
import joshuatee.wx.ui.ObjectToolbar
3837
import joshuatee.wx.ui.UtilityToolbar
3938
import joshuatee.wx.ui.UtilityUI
@@ -115,9 +114,6 @@ abstract class AudioPlayActivity : AppCompatActivity() {
115114
if (isStoragePermissionGranted) {
116115
UtilityTts.synthesizeTextAndPlay(this, txt, prod)
117116
pause.setIcon(GlobalVariables.ICON_PAUSE)
118-
if (UIPreferences.mediaControlNotif) {
119-
UtilityNotification.createMediaControlNotification(applicationContext, "")
120-
}
121117
} else {
122118
UtilityLog.d("wx", "perm to write to storage was not granted")
123119
}
@@ -132,9 +128,6 @@ abstract class AudioPlayActivity : AppCompatActivity() {
132128
} else {
133129
pause.setIcon(GlobalVariables.ICON_PAUSE)
134130
}
135-
if (UtilityTts.mediaPlayer != null && UtilityTts.mediaPlayer!!.isPlaying && UIPreferences.mediaControlNotif) {
136-
UtilityNotification.createMediaControlNotification(applicationContext, "")
137-
}
138131
}
139132

140133
R.id.action_playlist -> UtilityPlayList.add(this, view, playlistToken, txt)
@@ -177,9 +170,6 @@ abstract class AudioPlayActivity : AppCompatActivity() {
177170
if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
178171
UtilityTts.synthesizeTextAndPlay(applicationContext, ttsTxt, ttsProd)
179172
pause.setIcon(GlobalVariables.ICON_PAUSE)
180-
if (UIPreferences.mediaControlNotif) {
181-
UtilityNotification.createMediaControlNotification(applicationContext, "")
182-
}
183173
}
184174
}
185175
}

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

-36
This file was deleted.

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

-36
This file was deleted.

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

-36
This file was deleted.

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

-33
This file was deleted.

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

-7
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import androidx.core.app.ActivityCompat
3131
import java.util.Locale
3232
import joshuatee.wx.common.GlobalArrays
3333
import joshuatee.wx.settings.UIPreferences
34-
import joshuatee.wx.notifications.UtilityNotification
3534
import joshuatee.wx.objects.Route
3635
import joshuatee.wx.settings.BottomSheetFragment
3736
import joshuatee.wx.util.Utility
@@ -199,19 +198,13 @@ class SettingsPlaylistActivity : BaseActivity(), OnMenuItemClickListener {
199198
GlobalVariables.ICON_PAUSE
200199
}
201200
fabPause.set(icon)
202-
if (UtilityTts.mediaPlayer != null && UtilityTts.mediaPlayer!!.isPlaying && UIPreferences.mediaControlNotif) {
203-
UtilityNotification.createMediaControlNotification(applicationContext, "")
204-
}
205201
}
206202

207203
private fun playAll() {
208204
fabPause.set(GlobalVariables.ICON_PAUSE)
209205
if (isStoragePermissionGranted) {
210206
UtilityTts.synthesizeTextAndPlayPlaylist(this, 1)
211207
}
212-
if (UtilityTts.mediaPlayer != null && UtilityTts.mediaPlayer!!.isPlaying && UIPreferences.mediaControlNotif) {
213-
UtilityNotification.createMediaControlNotification(applicationContext, "")
214-
}
215208
}
216209

217210
private fun itemSelected(position: Int) {

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

-32
This file was deleted.

0 commit comments

Comments
 (0)