Skip to content

Commit

Permalink
55940-elys
Browse files Browse the repository at this point in the history
  • Loading branch information
ELY M committed Feb 1, 2025
1 parent 7173495 commit 1ccec91
Show file tree
Hide file tree
Showing 12 changed files with 30 additions and 411 deletions.
7 changes: 2 additions & 5 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:versionCode="55939"
android:versionName="55939-elys">
android:versionCode="55940"
android:versionName="55940-elys">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
Expand Down Expand Up @@ -169,9 +169,6 @@
<activity
android:name=".misc.WebView"
android:parentActivityName="WX" />
<activity
android:name=".misc.WebViewTwitter"
android:parentActivityName="WX" />
<activity
android:name=".spc.SpcMcdWatchShowActivity"
android:parentActivityName="WX" />
Expand Down
211 changes: 0 additions & 211 deletions app/src/main/java/joshuatee/wx/common/GlobalArrays.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,217 +81,6 @@ object GlobalArrays {
"AURORA: Aurora Forecast"
)

// val radars = listOf(
// "ABC: AK, Bethel",
// "APD: AK, Fairbanks/Pedro Dome",
// "AHG: AK, Kenai",
// "AKC: AK, King Salmon",
// "AIH: AK, Middleton Island",
// "AEC: AK, Nome",
// "ACG: AK, Sitka/Biorka Island",
// "BMX: AL, Birmingham",
// "EOX: AL, Fort Rucker",
// "HTX: AL, Huntsville",
// "MXX: AL, Maxwell AFB",
// "MOB: AL, Mobile",
// "SRX: AR, Fort Smith",
// "LZK: AR, Little Rock",
// "FSX: AZ, Flagstaff",
// "IWA: AZ, Phoenix",
// "EMX: AZ, Tucson",
// "YUX: AZ, Yuma",
// "BBX: CA, Beale AFB",
// "EYX: CA, Edwards AFB",
// "BHX: CA, Eureka",
// "VTX: CA, Los Angeles",
// "DAX: CA, Sacramento",
// "NKX: CA, San Diego",
// "MUX: CA, San Francisco",
// "HNX: CA, San Joaquin Valley",
// "SOX: CA, Santa Ana Mountains",
// "VBX: CA, Vandenberg AFB",
// "FTG: CO, Denver",
// "GJX: CO, Grand Junction",
// "PUX: CO, Pueblo",
// "DOX: DE, Dover AFB",
// "EVX: FL, Eglin AFB",
// "JAX: FL, Jacksonville",
// "BYX: FL, Key West",
// "MLB: FL, Melbourne",
// "AMX: FL, Miami",
// "TLH: FL, Tallahassee",
// "TBW: FL, Tampa",
// "FFC: GA, Atlanta",
// "VAX: GA, Moody AFB",
// "JGX: GA, Robins AFB",
// "GUA: GU, Andersen AFB",
// "HKI: HI, Kauai",
// "HKM: HI, Kohala",
// "HMO: HI, Molokai",
// "HWA: HI, South Shore",
// "DVN: IA, Davenport",
// "DMX: IA, Des Moines",
// "CBX: ID, Boise",
// "SFX: ID, Pocatello/Idaho Falls",
// "LOT: IL, Chicago",
// "ILX: IL, Lincoln",
// "VWX: IN, Evansville",
// "IND: IN, Indianapolis",
// "IWX: IN, North Webster",
// "DDC: KS, Dodge City",
// "GLD: KS, Goodland",
// "TWX: KS, Topeka",
// "ICT: KS, Wichita",
// "HPX: KY, Fort Campbell",
// "JKL: KY, Jackson",
// "LVX: KY, Louisville",
// "PAH: KY, Paducah",
// "POE: LA, Fort Polk",
// "HDC: LA, Hammond", // to Begin NEXRAD Level III Product Dissemination on or around March 31, 2024 Service Change Notice 24-11
// "LCH: LA, Lake Charles",
// "LIX: LA, New Orleans", // GONE as of late 2023
// "SHV: LA, Shreveport",
// "BOX: MA, Boston",
// "CBW: ME, Loring AFB",
// "GYX: ME, Portland",
// "DTX: MI, Detroit/Pontiac",
// "APX: MI, Gaylord",
// "GRR: MI, Grand Rapids",
// "MQT: MI, Marquette",
// "DLH: MN, Duluth",
// "MPX: MN, Minneapolis/St. Paul",
// "EAX: MO, Kansas City",
// "SGF: MO, Springfield",
// "LSX: MO, St. Louis",
// "DGX: MS, Brandon/Jackson",
// "GWX: MS, Columbus AFB",
// "BLX: MT, Billings",
// "GGW: MT, Glasgow",
// "TFX: MT, Great Falls",
// "MSX: MT, Missoula",
// "KSG: NA, Camp Humphreys, South Korea",
// "ODN: NA, Kadena Air Base, Japan",
// "KJK: NA, Kunsan Air Base, South Korea",
// "PLA: NA, Lajes Field, Azores",
// "MHX: NC, Morehead City",
// "RAX: NC, Raleigh/Durham",
// "LTX: NC, Wilmington",
// "BIS: ND, Bismarck",
// "MVX: ND, Grand Forks (Mayville)",
// "MBX: ND, Minot AFB",
// "UEX: NE, Grand Island/Hastings",
// "LNX: NE, North Platte",
// "OAX: NE, Omaha",
// "ABX: NM, Albuquerque",
// "FDX: NM, Cannon AFB",
// "HDX: NM, Holloman AFB",
// "LRX: NV, Elko",
// "ESX: NV, Las Vegas",
// "RGX: NV, Reno",
// "ENX: NY, Albany",
// "BGM: NY, Binghamton",
// "BUF: NY, Buffalo",
// "TYX: NY, Montague",
// "OKX: NY, New York City",
// "CLE: OH, Cleveland",
// "ILN: OH, Wilmington",
// "FDR: OK, Frederick",
// "TLX: OK, Oklahoma City",
// "INX: OK, Tulsa",
// "VNX: OK, Vance AFB",
// "MAX: OR, Medford",
// "PDT: OR, Pendleton",
// "RTX: OR, Portland",
// "DIX: PA, Philadelphia",
// "PBZ: PA, Pittsburgh",
// "CCX: PA, State College",
// "JUA: PR, San Juan",
// "CLX: SC, Charleston",
// "CAE: SC, Columbia",
// "GSP: SC, Greer",
// "ABR: SD, Aberdeen",
// "UDX: SD, Rapid City",
// "FSD: SD, Sioux Falls",
// "MRX: TN, Knoxville/Tri Cities",
// "NQA: TN, Memphis",
// "OHX: TN, Nashville",
// "AMA: TX, Amarillo",
// "EWX: TX, Austin/San Antonio",
// "BRO: TX, Brownsville",
// "CRP: TX, Corpus Christi",
// "FWS: TX, Dallas/Ft. Worth",
// "DYX: TX, Dyess AFB",
// "EPZ: TX, El Paso",
// "GRK: TX, Fort Hood",
// "HGX: TX, Houston/Galveston",
// "DFX: TX, Laughlin AFB",
// "LBB: TX, Lubbock",
// "MAF: TX, Midland/Odessa",
// "SJT: TX, San Angelo",
// "ICX: UT, Cedar City",
// "MTX: UT, Salt Lake City",
// "AKQ: VA, Norfolk/Richmond",
// "FCX: VA, Roanoke",
// "LWX: VA, Sterling",
// "CXX: VT, Burlington",
// "LGX: WA, Langley Hill",
// "ATX: WA, Seattle/Tacoma",
// "OTX: WA, Spokane",
// "GRB: WI, Green Bay",
// "ARX: WI, La Crosse",
// "MKX: WI, Milwaukee",
// "RLX: WV, Charleston",
// "CYS: WY, Cheyenne",
// "RIW: WY, Riverton"
// )

// val tdwrRadars = listOf(
// "TPHX: AZ, Phoenix",
// "TDEN: CO, Denver",
// "TFLL: FL, Fort Lauderdale",
// "TMIA: FL, Miami",
// "TMCO: FL, Orlando International",
// "TTPA: FL, Tampa Bay",
// "TPBI: FL, West Palm Beach",
// "TATL: GA, Atlanta",
// "TMDW: IL, Chicago Midway",
// "TORD: IL, Chicago O'Hare",
// "TIDS: IN, Indianapolis",
// "TICH: KS, Wichita",
// "TSDF: KY, Louisville",
// "TMSY: LA, New Orleans",
// "TBOS: MA, Boston",
// "TBWI: MD, Baltimore/Wash",
// "TDCA: MD, Washington National",
// "TDTW: MI, Detroit",
// "TMSP: MN, Minneapolis",
// "TMCI: MO, Kansas City",
// "TSTL: MO, St Louis",
// "TCLT: NC, Charlotte",
// "TRDU: NC, Raleigh Durham",
// "TEWR: NJ, Newark",
// "TLAS: NV, Las Vegas",
// "TJFK: NY, New York City",
// "TLVE: OH, Cleveland",
// "TCMH: OH, Columbus",
// "TCVG: OH, Covington",
// "TDAY: OH, Dayton",
// "TOKC: OK, Oklahoma City",
// "TTUL: OK, Tulsa",
// "TPHL: PA, Philadelphia",
// "TPIT: PA, Pittsburgh",
// "TSJU: PR, San Juan",
// "TMEM: TN, Memphis",
// "TBNA: TN, Nashville",
// "TDFW: TX, Dallas/Ft. Worth",
// "TDAL: TX, Dallas Love Field",
// "THOU: TX, Houston Hobby",
// "TIAH: TX, Houston International",
// "TSLC: UT, Salt Lake City",
// "TIAD: VA, Dulles",
// "TMKE: WI, Milwaukee"
// )

val states = listOf(
"AL: Alabama",
"AK: Alaska",
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/joshuatee/wx/common/GlobalVariables.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ object GlobalVariables {
const val NWS_AWC_WEBSITE_PREFIX = "https://www.aviationweather.gov"
const val NWS_GRAPHICAL_WEBSITE_PREFIX = "https://graphical.weather.gov"
const val NWS_CPC_NCEP_WEBSITE_PREFIX = "https://www.cpc.ncep.noaa.gov"
// const val NWS_GOES_WEBSITE_PREFIX = "https://www.goes.noaa.gov"
const val NWS_OPC_WEBSITE_PREFIX = "https://ocean.weather.gov"
const val NWS_NHC_WEBSITE_PREFIX = "https://www.nhc.noaa.gov"
const val NWS_MAG_NCEP_WEBSITE_PREFIX = "https://mag.ncep.noaa.gov"
Expand Down
25 changes: 7 additions & 18 deletions app/src/main/java/joshuatee/wx/fragments/MiscFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ import joshuatee.wx.settings.UIPreferences
import joshuatee.wx.misc.ImageCollectionActivity
import joshuatee.wx.misc.NwsObsSitesActivity
import joshuatee.wx.misc.USAlertsActivity
import joshuatee.wx.misc.WebView
import joshuatee.wx.misc.WebViewTwitter
import joshuatee.wx.models.ModelsGenericActivity
import joshuatee.wx.nhc.NhcActivity
import joshuatee.wx.radar.RadarMosaicActivity
Expand Down Expand Up @@ -130,19 +128,6 @@ class MiscFragment : Fragment() {
arrayOf(),
"wpcimages", "National Images"
)
//elys mod - keeping twitter
hm["twitter_state"] = TileObject(
R.drawable.twstate,
WebViewTwitter::class.java,
"",
arrayOf(),
"twitter_state", "Twitter state"
)
hm["twitter_tornado"] = TileObject(
R.drawable.twtornado, WebView::class.java, WebView.URL,
arrayOf("https://mobile.twitter.com/hashtag/tornado", "#tornado"),
"twitter_tornado", "Twitter tornado"
)
hm["opc"] = TileObject(
R.drawable.opc,
ImageCollectionActivity::class.java,
Expand Down Expand Up @@ -226,7 +211,7 @@ class MiscFragment : Fragment() {
"aurora", "Aurora Forecast"
)
//end
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:"
val tileOrder = "model_ncep:model_hrrr:model_ncar_ensemble:uswarn:wpctext:nhc:nwsmosaic:goes:lightning:wpcimages:opc:goesfulldisk:nwsobs:wxogl:wxoglquad:wpc_rainfall:"
var miscPref = Utility.readPref("FRAGMENT_MISC_ORDER", tileOrder)
if (!miscPref.contains("wxoglquad")) {
miscPref += "wxoglquad:"
Expand Down Expand Up @@ -266,7 +251,11 @@ class MiscFragment : Fragment() {
//end
val tiles = miscPref.split(":").dropLastWhile { it.isEmpty() }
return tiles
.filterNot { it.contains("model_cod") || it.contains("model_wrf") || it.contains("model_ncar_ensemble") }
.map { hm[it]!! }.toMutableList()
.filterNot {
it.contains("model_cod") || it.contains("model_wrf") || it.contains("model_ncar_ensemble") || it.contains(
"twitter"
)
}
.map { hm[it]!! }.toMutableList()
}
}
Loading

0 comments on commit 1ccec91

Please sign in to comment.