Skip to content

Commit 6d1e7a8

Browse files
ELY3MELY3M
committed
55979-elys
1 parent ccae592 commit 6d1e7a8

File tree

11 files changed

+32
-63
lines changed

11 files changed

+32
-63
lines changed

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ dependencies {
9898
// https://developer.android.com/jetpack/androidx/versions
9999
implementation 'com.google.android.material:material:1.13.0'
100100
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
101-
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.3'
101+
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.4'
102102
implementation 'androidx.cardview:cardview:1.0.0'
103103
implementation 'androidx.core:core-ktx:1.17.0'
104104
implementation 'androidx.media:media:1.7.1'

‎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="55978"
26-
android:versionName="55978-elys">
25+
android:versionCode="55979"
26+
android:versionName="55979-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/externalGraphView/CursorMode.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -187,15 +187,15 @@ protected void drawLegend(Canvas canvas) {
187187
canvas.drawRoundRect(new RectF(lLeft, lTop, lRight, lBottom), 8, 8, mRectPaint);
188188

189189
mTextPaint.setFakeBoldText(true);
190-
canvas.drawText(mGraphView.getGridLabelRenderer().getLabelFormatter().formatLabel(mCurrentSelectionX, true), lLeft + mStyles.padding, lTop + mStyles.padding / 2 + mStyles.textSize, mTextPaint);
190+
canvas.drawText(mGraphView.getGridLabelRenderer().getLabelFormatter().formatLabel(mCurrentSelectionX, true), lLeft + mStyles.padding, lTop + (float) mStyles.padding / 2 + mStyles.textSize, mTextPaint);
191191

192192
mTextPaint.setFakeBoldText(false);
193193

194194
int i = 1;
195195
for (Map.Entry<BaseSeries, DataPointInterface> entry : mCurrentSelection.entrySet()) {
196196
mRectPaint.setColor(entry.getKey().getColor());
197197
canvas.drawRect(new RectF(lLeft + mStyles.padding, lTop + mStyles.padding + (i * (mStyles.textSize + mStyles.spacing)), lLeft + mStyles.padding + shapeSize, lTop + mStyles.padding + (i * (mStyles.textSize + mStyles.spacing)) + shapeSize), mRectPaint);
198-
canvas.drawText(getTextForSeries(entry.getKey(), entry.getValue()), lLeft + mStyles.padding + shapeSize + mStyles.spacing, lTop + mStyles.padding / 2 + mStyles.textSize + (i * (mStyles.textSize + mStyles.spacing)), mTextPaint);
198+
canvas.drawText(getTextForSeries(entry.getKey(), entry.getValue()), lLeft + mStyles.padding + shapeSize + mStyles.spacing, lTop + (float) mStyles.padding / 2 + mStyles.textSize + (i * (mStyles.textSize + mStyles.spacing)), mTextPaint);
199199
i++;
200200
}
201201
}
@@ -240,17 +240,17 @@ public void setBackgroundColor(int color) {
240240
mStyles.backgroundColor = color;
241241
}
242242

243-
public void setSpacing(int s) {
244-
mStyles.spacing = s;
245-
}
243+
// public void setSpacing(int s) {
244+
// mStyles.spacing = s;
245+
// }
246246

247247
public void setPadding(int s) {
248248
mStyles.padding = s;
249249
}
250250

251-
public void setMargin(int s) {
252-
mStyles.margin = s;
253-
}
251+
// public void setMargin(int s) {
252+
// mStyles.margin = s;
253+
// }
254254

255255
public void setWidth(int s) {
256256
mStyles.width = s;

‎app/src/main/java/joshuatee/wx/externalGraphView/GraphView.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
package joshuatee.wx.externalGraphView;
2323

2424
import android.content.Context;
25-
import android.graphics.Bitmap;
2625
import android.graphics.Canvas;
2726
import android.graphics.Color;
2827
import android.graphics.Paint;

‎app/src/main/java/joshuatee/wx/externalGraphView/GridLabelRenderer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1100,7 +1100,7 @@ protected void drawHorizontalAxisTitle(Canvas canvas) {
11001100
if (mHorizontalAxisTitle != null && !mHorizontalAxisTitle.isEmpty()) {
11011101
mPaintAxisTitle.setColor(getHorizontalAxisTitleColor());
11021102
mPaintAxisTitle.setTextSize(getHorizontalAxisTitleTextSize());
1103-
float x = canvas.getWidth() / 2;
1103+
float x = (float) canvas.getWidth() / 2;
11041104
float y = canvas.getHeight() - mStyles.padding;
11051105
canvas.drawText(mHorizontalAxisTitle, x, y, mPaintAxisTitle);
11061106
}

‎app/src/main/java/joshuatee/wx/externalGraphView/LegendRenderer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ public void draw(Canvas canvas) {
215215
lTop = mGraphView.getGraphContentTop() + mStyles.margin;
216216
break;
217217
case MIDDLE:
218-
lTop = mGraphView.getHeight() / 2 - legendHeight / 2;
218+
lTop = (float) mGraphView.getHeight() / 2 - legendHeight / 2;
219219
break;
220220
default:
221221
lTop = mGraphView.getGraphContentTop() + mGraphView.getGraphContentHeight() - mStyles.margin - legendHeight - 2 * mStyles.padding;

‎app/src/main/java/joshuatee/wx/externalGraphView/SecondScale.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ protected void drawVerticalAxisTitle(Canvas canvas) {
233233
mPaintAxisTitle.setColor(getVerticalAxisTitleColor());
234234
mPaintAxisTitle.setTextSize(getVerticalAxisTitleTextSize());
235235
float x = canvas.getWidth() - getVerticalAxisTitleTextSize() / 2;
236-
float y = canvas.getHeight() / 2;
236+
float y = (float) canvas.getHeight() / 2;
237237
canvas.save();
238238
canvas.rotate(-90, x, y);
239239
canvas.drawText(mVerticalAxisTitle, x, y, mPaintAxisTitle);

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -83,21 +83,8 @@ class NhcActivity : BaseActivity() {
8383
R.id.action_atl_twd -> showTextProduct("MIATWDAT")
8484
R.id.action_epac_two -> showTextProduct("MIATWOEP")
8585
R.id.action_epac_twd -> showTextProduct("MIATWDEP")
86-
// R.id.action_atl_tws -> showTextProduct("MIATWSAT")
87-
// R.id.action_epac_tws -> showTextProduct("MIATWSEP")
8886
R.id.action_cpac_two -> showTextProduct("HFOTWOCP")
8987
R.id.action_share -> UtilityShare.text(this, "NHC", "", nhc.bitmaps)
90-
// R.id.action_epac_daily -> Route.image(
91-
// this,
92-
// "https://www.ssd.noaa.gov/PS/TROP/DATA/RT/SST/PAC/20.jpg",
93-
// "EPAC Daily Analysis"
94-
// )
95-
96-
// R.id.action_atl_daily -> Route.image(
97-
// this,
98-
// "https://www.ssd.noaa.gov/PS/TROP/DATA/RT/SST/ATL/20.jpg",
99-
// "ATL Daily Analysis"
100-
// )
10188

10289
R.id.action_epac_7daily -> Route.image(
10390
this,

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

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ object RadarSites {
478478
"HKM" to "20.125",
479479

480480
"TDTW" to "42.11111", // Detroit (DTW), MI TDTW DTX 772
481-
"TADW" to "5", // Andrews Air Force Base (ADW), MD TADW LWX 346
481+
"TADW" to "38.695", // Andrews Air Force Base (ADW), MD TADW LWX 346
482482
"TATL" to "33.646193", // Atlanta (ATL), GA TATL FFC 1,075
483483
"TBNA" to "35.979079", // Nashville (BNA), TN TBNA OHX 817
484484
"TBOS" to "42.15806", // Boston (BOS), MA TBOS BOX 264
@@ -522,19 +522,6 @@ object RadarSites {
522522
"TSTL" to "38.804691", // St Louis (STL), MO TSTL LSX 647
523523
"TTPA" to "27.85867", // Tampa Bay (TPA), FL TTPA TBW 93
524524
"TTUL" to "36.070184", // Tulsa (TUL), OK TTUL TSA 823
525-
526-
// "latest" to "36.105", // nws conus
527-
// "centgrtlakes" to "42.127",
528-
// "uppermissvly" to "42.75",
529-
// "northrockies" to "42.75",
530-
// "northeast" to "42.425",
531-
// "pacnorthwest" to "42.425",
532-
// "pacsouthwest" to "35.15",
533-
// "southrockies" to "32.5",
534-
// "southplains" to "31.6",
535-
// "southmissvly" to "31.6",
536-
// "southeast" to "29.86",
537-
// "hawaii" to "19.91"
538525
)
539526

540527
private val lon = mapOf(
@@ -640,8 +627,6 @@ object RadarSites {
640627
"VAX" to "83.002",
641628
"MHX" to "76.876",
642629
"OHX" to "86.563",
643-
// "LIX" to "89.825",
644-
// "LIX" to "0.0",
645630
"OKX" to "72.864",
646631
"AEC" to "165.293",
647632
"AKQ" to "77.008",
@@ -699,7 +684,7 @@ object RadarSites {
699684
"HKM" to "155.778",
700685

701686
"TDTW" to "83.515",
702-
"TADW" to "5",
687+
"TADW" to "76.845",
703688
"TATL" to "84.262233",
704689
"TBNA" to "86.661691",
705690
"TBOS" to "70.93389",
@@ -742,20 +727,7 @@ object RadarSites {
742727
"TSLC" to "111.929722",
743728
"TSTL" to "90.488558",
744729
"TTPA" to "82.51755",
745-
"TTUL" to "95.826313",
746-
747-
// "latest" to "97.141",
748-
// "centgrtlakes" to "84.544",
749-
// "uppermissvly" to "97.10",
750-
// "northrockies" to "108.60",
751-
// "northeast" to "74.10",
752-
// "pacnorthwest" to "120.10",
753-
// "pacsouthwest" to "120.15",
754-
// "southrockies" to "110.50",
755-
// "southplains" to "100.00",
756-
// "southmissvly" to "90.00",
757-
// "southeast" to "82.658",
758-
// "hawaii" to "157.55"
730+
"TTUL" to "95.826313"
759731
)
760732

761733
val sites: Sites = Sites(names, lat, lon, false)

‎app/src/main/java/joshuatee/wx/ui/TouchImageView2.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ public PointF getScrollPosition() {
520520
int drawableWidth = drawable.getIntrinsicWidth();
521521
int drawableHeight = drawable.getIntrinsicHeight();
522522

523-
PointF point = transformCoordTouchToBitmap(viewWidth / 2, viewHeight / 2, true);
523+
PointF point = transformCoordTouchToBitmap((float) viewWidth / 2, (float) viewHeight / 2, true);
524524
point.x /= drawableWidth;
525525
point.y /= drawableHeight;
526526
return point;
@@ -1063,7 +1063,7 @@ public void onScaleEnd(@NonNull ScaleGestureDetector detector) {
10631063
}
10641064

10651065
if (animateToZoomBoundary) {
1066-
DoubleTapZoom doubleTap = new DoubleTapZoom(targetZoom, viewWidth / 2, viewHeight / 2, true);
1066+
DoubleTapZoom doubleTap = new DoubleTapZoom(targetZoom, (float) viewWidth / 2, (float) viewHeight / 2, true);
10671067
compatPostOnAnimation(doubleTap);
10681068
}
10691069
}
@@ -1128,7 +1128,7 @@ private class DoubleTapZoom implements Runnable {
11281128
// Used for translating image during scaling
11291129
//
11301130
startTouch = transformCoordBitmapToTouch(bitmapX, bitmapY);
1131-
endTouch = new PointF(viewWidth / 2, viewHeight / 2);
1131+
endTouch = new PointF((float) viewWidth / 2, (float) viewHeight / 2);
11321132
}
11331133

11341134
@Override

0 commit comments

Comments
 (0)