Skip to content

Commit 1ccec91

Browse files
author
ELY M
committed
55940-elys
1 parent 7173495 commit 1ccec91

12 files changed

Lines changed: 30 additions & 411 deletions

File tree

‎app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 5 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="55939"
26-
android:versionName="55939-elys">
25+
android:versionCode="55940"
26+
android:versionName="55940-elys">
2727

2828
<uses-permission android:name="android.permission.INTERNET" />
2929
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -169,9 +169,6 @@
169169
<activity
170170
android:name=".misc.WebView"
171171
android:parentActivityName="WX" />
172-
<activity
173-
android:name=".misc.WebViewTwitter"
174-
android:parentActivityName="WX" />
175172
<activity
176173
android:name=".spc.SpcMcdWatchShowActivity"
177174
android:parentActivityName="WX" />

‎app/src/main/java/joshuatee/wx/common/GlobalArrays.kt‎

Lines changed: 0 additions & 211 deletions
Original file line numberDiff line numberDiff line change
@@ -81,217 +81,6 @@ object GlobalArrays {
8181
"AURORA: Aurora Forecast"
8282
)
8383

84-
// val radars = listOf(
85-
// "ABC: AK, Bethel",
86-
// "APD: AK, Fairbanks/Pedro Dome",
87-
// "AHG: AK, Kenai",
88-
// "AKC: AK, King Salmon",
89-
// "AIH: AK, Middleton Island",
90-
// "AEC: AK, Nome",
91-
// "ACG: AK, Sitka/Biorka Island",
92-
// "BMX: AL, Birmingham",
93-
// "EOX: AL, Fort Rucker",
94-
// "HTX: AL, Huntsville",
95-
// "MXX: AL, Maxwell AFB",
96-
// "MOB: AL, Mobile",
97-
// "SRX: AR, Fort Smith",
98-
// "LZK: AR, Little Rock",
99-
// "FSX: AZ, Flagstaff",
100-
// "IWA: AZ, Phoenix",
101-
// "EMX: AZ, Tucson",
102-
// "YUX: AZ, Yuma",
103-
// "BBX: CA, Beale AFB",
104-
// "EYX: CA, Edwards AFB",
105-
// "BHX: CA, Eureka",
106-
// "VTX: CA, Los Angeles",
107-
// "DAX: CA, Sacramento",
108-
// "NKX: CA, San Diego",
109-
// "MUX: CA, San Francisco",
110-
// "HNX: CA, San Joaquin Valley",
111-
// "SOX: CA, Santa Ana Mountains",
112-
// "VBX: CA, Vandenberg AFB",
113-
// "FTG: CO, Denver",
114-
// "GJX: CO, Grand Junction",
115-
// "PUX: CO, Pueblo",
116-
// "DOX: DE, Dover AFB",
117-
// "EVX: FL, Eglin AFB",
118-
// "JAX: FL, Jacksonville",
119-
// "BYX: FL, Key West",
120-
// "MLB: FL, Melbourne",
121-
// "AMX: FL, Miami",
122-
// "TLH: FL, Tallahassee",
123-
// "TBW: FL, Tampa",
124-
// "FFC: GA, Atlanta",
125-
// "VAX: GA, Moody AFB",
126-
// "JGX: GA, Robins AFB",
127-
// "GUA: GU, Andersen AFB",
128-
// "HKI: HI, Kauai",
129-
// "HKM: HI, Kohala",
130-
// "HMO: HI, Molokai",
131-
// "HWA: HI, South Shore",
132-
// "DVN: IA, Davenport",
133-
// "DMX: IA, Des Moines",
134-
// "CBX: ID, Boise",
135-
// "SFX: ID, Pocatello/Idaho Falls",
136-
// "LOT: IL, Chicago",
137-
// "ILX: IL, Lincoln",
138-
// "VWX: IN, Evansville",
139-
// "IND: IN, Indianapolis",
140-
// "IWX: IN, North Webster",
141-
// "DDC: KS, Dodge City",
142-
// "GLD: KS, Goodland",
143-
// "TWX: KS, Topeka",
144-
// "ICT: KS, Wichita",
145-
// "HPX: KY, Fort Campbell",
146-
// "JKL: KY, Jackson",
147-
// "LVX: KY, Louisville",
148-
// "PAH: KY, Paducah",
149-
// "POE: LA, Fort Polk",
150-
// "HDC: LA, Hammond", // to Begin NEXRAD Level III Product Dissemination on or around March 31, 2024 Service Change Notice 24-11
151-
// "LCH: LA, Lake Charles",
152-
// "LIX: LA, New Orleans", // GONE as of late 2023
153-
// "SHV: LA, Shreveport",
154-
// "BOX: MA, Boston",
155-
// "CBW: ME, Loring AFB",
156-
// "GYX: ME, Portland",
157-
// "DTX: MI, Detroit/Pontiac",
158-
// "APX: MI, Gaylord",
159-
// "GRR: MI, Grand Rapids",
160-
// "MQT: MI, Marquette",
161-
// "DLH: MN, Duluth",
162-
// "MPX: MN, Minneapolis/St. Paul",
163-
// "EAX: MO, Kansas City",
164-
// "SGF: MO, Springfield",
165-
// "LSX: MO, St. Louis",
166-
// "DGX: MS, Brandon/Jackson",
167-
// "GWX: MS, Columbus AFB",
168-
// "BLX: MT, Billings",
169-
// "GGW: MT, Glasgow",
170-
// "TFX: MT, Great Falls",
171-
// "MSX: MT, Missoula",
172-
// "KSG: NA, Camp Humphreys, South Korea",
173-
// "ODN: NA, Kadena Air Base, Japan",
174-
// "KJK: NA, Kunsan Air Base, South Korea",
175-
// "PLA: NA, Lajes Field, Azores",
176-
// "MHX: NC, Morehead City",
177-
// "RAX: NC, Raleigh/Durham",
178-
// "LTX: NC, Wilmington",
179-
// "BIS: ND, Bismarck",
180-
// "MVX: ND, Grand Forks (Mayville)",
181-
// "MBX: ND, Minot AFB",
182-
// "UEX: NE, Grand Island/Hastings",
183-
// "LNX: NE, North Platte",
184-
// "OAX: NE, Omaha",
185-
// "ABX: NM, Albuquerque",
186-
// "FDX: NM, Cannon AFB",
187-
// "HDX: NM, Holloman AFB",
188-
// "LRX: NV, Elko",
189-
// "ESX: NV, Las Vegas",
190-
// "RGX: NV, Reno",
191-
// "ENX: NY, Albany",
192-
// "BGM: NY, Binghamton",
193-
// "BUF: NY, Buffalo",
194-
// "TYX: NY, Montague",
195-
// "OKX: NY, New York City",
196-
// "CLE: OH, Cleveland",
197-
// "ILN: OH, Wilmington",
198-
// "FDR: OK, Frederick",
199-
// "TLX: OK, Oklahoma City",
200-
// "INX: OK, Tulsa",
201-
// "VNX: OK, Vance AFB",
202-
// "MAX: OR, Medford",
203-
// "PDT: OR, Pendleton",
204-
// "RTX: OR, Portland",
205-
// "DIX: PA, Philadelphia",
206-
// "PBZ: PA, Pittsburgh",
207-
// "CCX: PA, State College",
208-
// "JUA: PR, San Juan",
209-
// "CLX: SC, Charleston",
210-
// "CAE: SC, Columbia",
211-
// "GSP: SC, Greer",
212-
// "ABR: SD, Aberdeen",
213-
// "UDX: SD, Rapid City",
214-
// "FSD: SD, Sioux Falls",
215-
// "MRX: TN, Knoxville/Tri Cities",
216-
// "NQA: TN, Memphis",
217-
// "OHX: TN, Nashville",
218-
// "AMA: TX, Amarillo",
219-
// "EWX: TX, Austin/San Antonio",
220-
// "BRO: TX, Brownsville",
221-
// "CRP: TX, Corpus Christi",
222-
// "FWS: TX, Dallas/Ft. Worth",
223-
// "DYX: TX, Dyess AFB",
224-
// "EPZ: TX, El Paso",
225-
// "GRK: TX, Fort Hood",
226-
// "HGX: TX, Houston/Galveston",
227-
// "DFX: TX, Laughlin AFB",
228-
// "LBB: TX, Lubbock",
229-
// "MAF: TX, Midland/Odessa",
230-
// "SJT: TX, San Angelo",
231-
// "ICX: UT, Cedar City",
232-
// "MTX: UT, Salt Lake City",
233-
// "AKQ: VA, Norfolk/Richmond",
234-
// "FCX: VA, Roanoke",
235-
// "LWX: VA, Sterling",
236-
// "CXX: VT, Burlington",
237-
// "LGX: WA, Langley Hill",
238-
// "ATX: WA, Seattle/Tacoma",
239-
// "OTX: WA, Spokane",
240-
// "GRB: WI, Green Bay",
241-
// "ARX: WI, La Crosse",
242-
// "MKX: WI, Milwaukee",
243-
// "RLX: WV, Charleston",
244-
// "CYS: WY, Cheyenne",
245-
// "RIW: WY, Riverton"
246-
// )
247-
248-
// val tdwrRadars = listOf(
249-
// "TPHX: AZ, Phoenix",
250-
// "TDEN: CO, Denver",
251-
// "TFLL: FL, Fort Lauderdale",
252-
// "TMIA: FL, Miami",
253-
// "TMCO: FL, Orlando International",
254-
// "TTPA: FL, Tampa Bay",
255-
// "TPBI: FL, West Palm Beach",
256-
// "TATL: GA, Atlanta",
257-
// "TMDW: IL, Chicago Midway",
258-
// "TORD: IL, Chicago O'Hare",
259-
// "TIDS: IN, Indianapolis",
260-
// "TICH: KS, Wichita",
261-
// "TSDF: KY, Louisville",
262-
// "TMSY: LA, New Orleans",
263-
// "TBOS: MA, Boston",
264-
// "TBWI: MD, Baltimore/Wash",
265-
// "TDCA: MD, Washington National",
266-
// "TDTW: MI, Detroit",
267-
// "TMSP: MN, Minneapolis",
268-
// "TMCI: MO, Kansas City",
269-
// "TSTL: MO, St Louis",
270-
// "TCLT: NC, Charlotte",
271-
// "TRDU: NC, Raleigh Durham",
272-
// "TEWR: NJ, Newark",
273-
// "TLAS: NV, Las Vegas",
274-
// "TJFK: NY, New York City",
275-
// "TLVE: OH, Cleveland",
276-
// "TCMH: OH, Columbus",
277-
// "TCVG: OH, Covington",
278-
// "TDAY: OH, Dayton",
279-
// "TOKC: OK, Oklahoma City",
280-
// "TTUL: OK, Tulsa",
281-
// "TPHL: PA, Philadelphia",
282-
// "TPIT: PA, Pittsburgh",
283-
// "TSJU: PR, San Juan",
284-
// "TMEM: TN, Memphis",
285-
// "TBNA: TN, Nashville",
286-
// "TDFW: TX, Dallas/Ft. Worth",
287-
// "TDAL: TX, Dallas Love Field",
288-
// "THOU: TX, Houston Hobby",
289-
// "TIAH: TX, Houston International",
290-
// "TSLC: UT, Salt Lake City",
291-
// "TIAD: VA, Dulles",
292-
// "TMKE: WI, Milwaukee"
293-
// )
294-
29584
val states = listOf(
29685
"AL: Alabama",
29786
"AK: Alaska",

‎app/src/main/java/joshuatee/wx/common/GlobalVariables.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ object GlobalVariables {
4040
const val NWS_AWC_WEBSITE_PREFIX = "https://www.aviationweather.gov"
4141
const val NWS_GRAPHICAL_WEBSITE_PREFIX = "https://graphical.weather.gov"
4242
const val NWS_CPC_NCEP_WEBSITE_PREFIX = "https://www.cpc.ncep.noaa.gov"
43-
// const val NWS_GOES_WEBSITE_PREFIX = "https://www.goes.noaa.gov"
4443
const val NWS_OPC_WEBSITE_PREFIX = "https://ocean.weather.gov"
4544
const val NWS_NHC_WEBSITE_PREFIX = "https://www.nhc.noaa.gov"
4645
const val NWS_MAG_NCEP_WEBSITE_PREFIX = "https://mag.ncep.noaa.gov"

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

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ import joshuatee.wx.settings.UIPreferences
3333
import joshuatee.wx.misc.ImageCollectionActivity
3434
import joshuatee.wx.misc.NwsObsSitesActivity
3535
import joshuatee.wx.misc.USAlertsActivity
36-
import joshuatee.wx.misc.WebView
37-
import joshuatee.wx.misc.WebViewTwitter
3836
import joshuatee.wx.models.ModelsGenericActivity
3937
import joshuatee.wx.nhc.NhcActivity
4038
import joshuatee.wx.radar.RadarMosaicActivity
@@ -130,19 +128,6 @@ class MiscFragment : Fragment() {
130128
arrayOf(),
131129
"wpcimages", "National Images"
132130
)
133-
//elys mod - keeping twitter
134-
hm["twitter_state"] = TileObject(
135-
R.drawable.twstate,
136-
WebViewTwitter::class.java,
137-
"",
138-
arrayOf(),
139-
"twitter_state", "Twitter state"
140-
)
141-
hm["twitter_tornado"] = TileObject(
142-
R.drawable.twtornado, WebView::class.java, WebView.URL,
143-
arrayOf("https://mobile.twitter.com/hashtag/tornado", "#tornado"),
144-
"twitter_tornado", "Twitter tornado"
145-
)
146131
hm["opc"] = TileObject(
147132
R.drawable.opc,
148133
ImageCollectionActivity::class.java,
@@ -226,7 +211,7 @@ class MiscFragment : Fragment() {
226211
"aurora", "Aurora Forecast"
227212
)
228213
//end
229-
val tileOrder = "model_ncep:model_hrrr:model_ncar_ensemble:uswarn:wpctext:nhc:nwsmosaic:goes:lightning:wpcimages:twitter_state:twitter_tornado:opc:goesfulldisk:nwsobs:wxogl:wxoglquad:wpc_rainfall:"
214+
val tileOrder = "model_ncep:model_hrrr:model_ncar_ensemble:uswarn:wpctext:nhc:nwsmosaic:goes:lightning:wpcimages:opc:goesfulldisk:nwsobs:wxogl:wxoglquad:wpc_rainfall:"
230215
var miscPref = Utility.readPref("FRAGMENT_MISC_ORDER", tileOrder)
231216
if (!miscPref.contains("wxoglquad")) {
232217
miscPref += "wxoglquad:"
@@ -266,7 +251,11 @@ class MiscFragment : Fragment() {
266251
//end
267252
val tiles = miscPref.split(":").dropLastWhile { it.isEmpty() }
268253
return tiles
269-
.filterNot { it.contains("model_cod") || it.contains("model_wrf") || it.contains("model_ncar_ensemble") }
270-
.map { hm[it]!! }.toMutableList()
254+
.filterNot {
255+
it.contains("model_cod") || it.contains("model_wrf") || it.contains("model_ncar_ensemble") || it.contains(
256+
"twitter"
257+
)
258+
}
259+
.map { hm[it]!! }.toMutableList()
271260
}
272261
}

0 commit comments

Comments
 (0)