Skip to content

Commit 29eb801

Browse files
ELY3MELY3M
committed
55971-elys
1 parent 48f5627 commit 29eb801

Some content is hidden

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

52 files changed

+208
-374
lines changed

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ class MyApplication : Application() {
9898
appContext = applicationContext
9999
preferences = PreferenceManager.getDefaultSharedPreferences(this)
100100
editor = preferences.edit()
101-
// preferencesTelecine = getSharedPreferences("telecine", MODE_PRIVATE)
102-
// contentResolverLocal = contentResolver
103101
val res = resources
104102
dm = res.displayMetrics
105103
UIPreferences.deviceScale = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 1f, dm)
@@ -154,11 +152,9 @@ class MyApplication : Application() {
154152

155153
lateinit var preferences: SharedPreferences
156154

157-
// private lateinit var preferencesTelecine: SharedPreferences
158155
lateinit var editor: SharedPreferences.Editor
159156
lateinit var dm: DisplayMetrics
160157
lateinit var appContext: Context
161-
// var contentResolverLocal: ContentResolver? = null
162158

163159
fun initPreferences(context: Context) {
164160
RadarPreferences.initRadarPreferences()
@@ -177,12 +173,6 @@ class MyApplication : Application() {
177173
preferences.getInt("CARD_CORNER_RADIUS", 0).toFloat(),
178174
dm
179175
)
180-
// UIPreferences.telecineVideoSizePercentage =
181-
// preferencesTelecine.getInt("video-size", 100)
182-
// UIPreferences.telecineSwitchShowCountdown =
183-
// preferencesTelecine.getBoolean("show-countdown", false)
184-
// UIPreferences.telecineSwitchRecordingNotification =
185-
// preferencesTelecine.getBoolean("recording-notification", false)
186176
Location.currentLocationStr = getInitialPreferenceString("CURRENT_LOC_FRAGMENT", "1")
187177
PolygonWatch.load(context)
188178
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import joshuatee.wx.util.Utility
3232
object UtilityVoiceCommand {
3333

3434
fun processCommand(context: Context, vrStringOriginal: String): Boolean {
35-
var radarSite = Location.rid
35+
var radarSite = Location.radarSite
3636
var wfo = Location.wfo
3737
var gotHit = true
3838
val tokens = RegExp.space.split(vrStringOriginal)

‎app/src/main/java/joshuatee/wx/fragments/LocationFragment.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ class LocationFragment : Fragment() {
340340
// if radarForLocation is not equal to -1 it means the user has a radar for the current location (default)
341341
//if (radarForLocation != -1)
342342
if (radarForLocationIndex != -1 && !radarLocationChangedList[radarForLocationIndex]) {
343-
nexradState.wxglRenders[radarForLocationIndex].state.rid = Location.rid
343+
nexradState.wxglRenders[radarForLocationIndex].state.rid = Location.radarSite
344344
}
345345
nexradState.adjustForTdwr(idx)
346346
NexradDraw.initGeom(
@@ -441,7 +441,7 @@ class LocationFragment : Fragment() {
441441

442442
// main screen will not show GPS so if configured just show it off the screen
443443
// NOTE - this was backed out as it's not a good solution when user enables "center radar on location", removed private fun getLatLon() = LatLon(0.0, 0.0)
444-
private fun getLatLon() = LatLon(Location.x, Location.y)
444+
private fun getLatLon() = Location.latLon
445445

446446
override fun onPause() {
447447
if (glviewInitialized) {

‎app/src/main/java/joshuatee/wx/fragments/MiscFragment.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,15 +154,15 @@ class MiscFragment : Fragment() {
154154
R.drawable.wxogldualpane,
155155
WXGLRadarActivityMultiPane::class.java,
156156
WXGLRadarActivityMultiPane.RID,
157-
arrayOf(Location.rid, "", "2"),
157+
arrayOf(Location.radarSite, "", "2"),
158158
"wxogl", "Dual pane nexrad radar"
159159
)
160160
} else {
161161
hm["wxogl"] = TileObject(
162162
R.drawable.wxoglsinglepane,
163163
WXGLRadarActivity::class.java,
164164
WXGLRadarActivity.RID,
165-
arrayOf(Location.rid, ""),
165+
arrayOf(Location.radarSite, ""),
166166
"wxogl", "Single pane nexrad radar"
167167
)
168168
}
@@ -171,7 +171,7 @@ class MiscFragment : Fragment() {
171171
R.drawable.wxoglquadpane,
172172
WXGLRadarActivityMultiPane::class.java,
173173
WXGLRadarActivityMultiPane.RID,
174-
arrayOf(Location.rid, "", "4"),
174+
arrayOf(Location.radarSite, "", "4"),
175175
"wxoglquad", "Dual pane nexrad radar"
176176
)
177177
hm["model_nssl_wrf"] = TileObject(

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,19 @@ object NotificationLocal {
8181
locationIndex
8282
)
8383
) {
84-
val url2 = Location.getRid(locationIndex) + "US"
85-
val bitmap = UtilityImg.getNexradRefBitmap(context, Location.getRid(locationIndex))
84+
val url2 = Location.getRadarSite(locationIndex) + "US"
85+
val bitmap =
86+
UtilityImg.getNexradRefBitmap(context, Location.getRadarSite(locationIndex))
8687
val title =
87-
"(" + Location.getName(locationIndex) + ") " + Location.getRid(locationIndex) + " Radar"
88+
"(" + Location.getName(locationIndex) + ") " + Location.getRadarSite(
89+
locationIndex
90+
) + " Radar"
8891
val notifier2 =
8992
context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
9093
val resultIntent2 = Intent(context, WXGLRadarActivity::class.java)
9194
resultIntent2.putExtra(
9295
WXGLRadarActivity.RID,
93-
arrayOf(Location.getRid(locationIndex), "STATE NOT USED")
96+
arrayOf(Location.getRadarSite(locationIndex), "STATE NOT USED")
9497
)
9598
val stackBuilder2 = TaskStackBuilder.create(context)
9699
stackBuilder2.addParentStack(WX::class.java)

‎app/src/main/java/joshuatee/wx/objects/Route.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,9 @@ class Route() {
269269

270270
fun radarMainScreen(context: Context) {
271271
if (!UIPreferences.dualpaneRadarIcon) {
272-
radar(context, arrayOf(Location.rid, ""))
272+
radar(context, arrayOf(Location.radarSite, ""))
273273
} else {
274-
radarMultiPane(context, arrayOf(Location.rid, "STATE NOT USED", "2"))
274+
radarMultiPane(context, arrayOf(Location.radarSite, "STATE NOT USED", "2"))
275275
}
276276
}
277277

@@ -294,11 +294,11 @@ class Route() {
294294
}
295295

296296
fun radarMultiPane2(context: Context) {
297-
radarMultiPane(context, arrayOf(Location.rid, "STATE NOT USED", "2"))
297+
radarMultiPane(context, arrayOf(Location.radarSite, "STATE NOT USED", "2"))
298298
}
299299

300300
fun radarMultiPane4(context: Context) {
301-
radarMultiPane(context, arrayOf(Location.rid, "STATE NOT USED", "4"))
301+
radarMultiPane(context, arrayOf(Location.radarSite, "STATE NOT USED", "4"))
302302
}
303303

304304
fun radarMosaic(context: Context) {

‎app/src/main/java/joshuatee/wx/radar/CanvasCreate.kt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ object CanvasCreate {
4242
private const val CITY_SIZE = 18
4343

4444
fun layeredImage(context: Context, radarSiteArg: String, product: String): Bitmap {
45-
var radarSite = radarSiteArg
46-
var scaleType = ProjectionType.WX_RENDER
47-
if (NexradUtil.isProductTdwr(product)) {
48-
radarSite = NexradUtil.getTdwrFromRid(radarSite)
49-
scaleType = ProjectionType.WX_RENDER_48
50-
}
45+
val radarSite = radarSiteArg
46+
val scaleType = ProjectionType.WX_RENDER
47+
// if (NexradUtil.isProductTdwr(product)) {
48+
// radarSite = NexradUtil.getTdwrFromRid(radarSite)
49+
// scaleType = ProjectionType.WX_RENDER_48
50+
// }
5151
if (!product.contains("L2")) {
5252
val url = NexradDownload.getRadarFileUrl(radarSite, product)
5353
val inputStream = url.getInputStream()
@@ -98,12 +98,12 @@ object CanvasCreate {
9898
product: String,
9999
idxStr: String
100100
): Bitmap {
101-
var radarSite = radarSiteArg
102-
var scaleType = ProjectionType.WX_RENDER
103-
if (NexradUtil.isProductTdwr(product)) {
104-
radarSite = NexradUtil.getTdwrFromRid(radarSite)
105-
scaleType = ProjectionType.WX_RENDER_48
106-
}
101+
val radarSite = radarSiteArg
102+
val scaleType = ProjectionType.WX_RENDER
103+
// if (NexradUtil.isProductTdwr(product)) {
104+
// radarSite = NexradUtil.getTdwrFromRid(radarSite)
105+
// scaleType = ProjectionType.WX_RENDER_48
106+
// }
107107
val layers = mutableListOf<Drawable>()
108108
val colorDrawable = RadarPreferences.nexradBackgroundColor.toDrawable()
109109
var bitmapCanvas = createBitmap(IMAGE_WIDTH, IMAGE_HEIGHT)

‎app/src/main/java/joshuatee/wx/radar/CanvasDraw.kt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ import joshuatee.wx.objects.PolygonType
3737
import joshuatee.wx.objects.ProjectionType
3838
import joshuatee.wx.settings.RadarPreferences
3939
import joshuatee.wx.util.ProjectionNumbers
40-
import joshuatee.wx.util.To
4140
import joshuatee.wx.util.UtilityCanvasProjection
4241
import joshuatee.wx.util.UtilityCities
4342
import joshuatee.wx.util.UtilityLog
4443
import java.nio.ByteBuffer
44+
import kotlin.math.abs
4545

4646
internal object CanvasDraw {
4747

@@ -98,17 +98,17 @@ internal object CanvasDraw {
9898
}
9999
paint.textSize = textSize.toFloat()
100100
UtilityCities.list.forEach {
101-
val coordinates = Projection.computeMercatorNumbers(it.x, it.y, projectionNumbers)
101+
val coordinates = Projection.computeMercatorNumbersF(it.x, it.y, projectionNumbers)
102102
if (textSize > 0) {
103103
canvas.drawText(
104104
RegExp.comma.split(it.city)[0],
105-
coordinates[0].toFloat() + 4.0f,
106-
coordinates[1].toFloat() - 4.0f,
105+
coordinates[0] + 4.0f,
106+
coordinates[1] - 4.0f,
107107
paint
108108
)
109-
canvas.drawCircle(coordinates[0].toFloat(), coordinates[1].toFloat(), 2.0f, paint)
109+
canvas.drawCircle(coordinates[0], coordinates[1], 2.0f, paint)
110110
} else {
111-
canvas.drawCircle(coordinates[0].toFloat(), coordinates[1].toFloat(), 1.0f, paint)
111+
canvas.drawCircle(coordinates[0], coordinates[1], 1.0f, paint)
112112
}
113113
}
114114
}
@@ -128,18 +128,18 @@ internal object CanvasDraw {
128128
if (projectionType.needsCanvasShift) {
129129
canvas.translate(CanvasMain.xOffset, CanvasMain.yOffset)
130130
}
131-
val x = To.double(Location.x)
132-
val y = To.double(Location.y.replace("-", ""))
133-
val coordinates = Projection.computeMercatorNumbers(x, y, projectionNumbers)
131+
val x = Location.latLon.lat
132+
val y = abs(Location.latLon.lon)
133+
val coordinates = Projection.computeMercatorNumbersF(x, y, projectionNumbers)
134134
paint.color = RadarPreferences.colorLocdot
135135
//elys mod
136136
//custom locationdot//
137137
if (RadarPreferences.locationDotFollowsGps) {
138138
val locationicon: Bitmap = BitmapFactory.decodeFile(GlobalVariables.FilesPath + "location.png");
139139
val locationiconresized: Bitmap = Bitmap.createScaledBitmap(locationicon, RadarPreferences.locIconSize, RadarPreferences.locIconSize, false)
140-
canvas.drawBitmap(locationiconresized, coordinates[0].toFloat(), coordinates[1].toFloat(), null)
140+
canvas.drawBitmap(locationiconresized, coordinates[0], coordinates[1], null)
141141
} else {
142-
canvas.drawCircle(coordinates[0].toFloat(), coordinates[1].toFloat(), 2.0f, paint)
142+
canvas.drawCircle(coordinates[0], coordinates[1], 2.0f, paint)
143143
}
144144
}
145145
fun mcd(

‎app/src/main/java/joshuatee/wx/radar/CanvasLevel2.kt‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,8 @@ import android.graphics.Color
4545
import android.graphics.Paint
4646
import android.graphics.Path
4747
import android.graphics.Paint.Style
48-
import androidx.core.content.ContextCompat
49-
import joshuatee.wx.R
5048
import joshuatee.wx.radarcolorpalettes.ColorPalette
51-
import joshuatee.wx.util.Utility
49+
import joshuatee.wx.settings.RadarPreferences
5250
import joshuatee.wx.util.UtilityMath
5351

5452
// The code in this file is used exclusively by the code path that generates bitmaps ( ie not OpenGL radar )
@@ -68,11 +66,7 @@ internal object CanvasLevel2 {
6866
val numberOfRadials = 720
6967
val numberOfRangeBins = 916
7068
// 1832 vel 1192 vel
71-
val zeroColor = if (Utility.readPref(context, "NWS_RADAR_BG_BLACK", "") != "true") {
72-
ContextCompat.getColor(context, R.color.white)
73-
} else {
74-
ContextCompat.getColor(context, R.color.black)
75-
}
69+
val zeroColor = RadarPreferences.nexradBackgroundColor
7670
val radialStartAngle = ByteBuffer.allocateDirect(720 * 4)
7771
radialStartAngle.order(ByteOrder.nativeOrder())
7872
radialStartAngle.position(0)

‎app/src/main/java/joshuatee/wx/radar/CanvasRadial4Bit.kt‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,19 @@ import android.graphics.Canvas
3131
import android.graphics.Paint
3232
import android.graphics.Path
3333
import android.graphics.Paint.Style
34-
import androidx.core.content.ContextCompat
35-
import joshuatee.wx.R
3634
import joshuatee.wx.common.GlobalVariables
3735
import joshuatee.wx.objects.ObjectDateTime
38-
import joshuatee.wx.util.Utility
3936
import joshuatee.wx.util.UtilityLog
4037
import joshuatee.wx.util.UtilityMath
4138
import androidx.core.graphics.toColorInt
39+
import joshuatee.wx.settings.RadarPreferences
4240

4341
@Suppress("SpellCheckingInspection")
4442
internal object CanvasRadial4Bit {
4543

4644
fun decodeAndPlot(context: Context, bitmap: Bitmap, fileName: String, product: String) {
4745
val canvas = Canvas(bitmap)
48-
val nwsRadarBgBlack = Utility.readPref(context, "NWS_RADAR_BG_BLACK", "")
49-
val zeroColor = if (nwsRadarBgBlack != "true") {
50-
ContextCompat.getColor(context, R.color.white)
51-
} else {
52-
ContextCompat.getColor(context, R.color.black)
53-
}
46+
val zeroColor = RadarPreferences.nexradBackgroundColor
5447
val isVelocity = product.contains("S") || product.contains("V") || product.contains("U")
5548
val dis = try {
5649
val fis = context.openFileInput(fileName)
@@ -107,11 +100,11 @@ internal object CanvasRadial4Bit {
107100
radialAngleDelta[r] = dis.readUnsignedShort().toFloat()
108101
radialAngleDelta[r] = 1.0f
109102
var binCount = 0
110-
for (s in 0 until numberOfRleHalfwords[r] * 2) {
103+
repeat(numberOfRleHalfwords[r] * 2) {
111104
// old 4 bit
112105
val bin = dis.readUnsignedByte()
113106
val numOfBins = bin shr 4
114-
for (u in 0 until numOfBins) {
107+
repeat(numOfBins) {
115108
binWord[r][binCount] = bin % 16
116109
binCount += 1
117110
}

0 commit comments

Comments
 (0)