diff --git a/app/build.gradle b/app/build.gradle index d968bbe99..2d7e798d9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.example.weathermaster" minSdk 22 targetSdk 33 - versionCode 82 - versionName "1.8.8.2 (W)" + versionCode 84 + versionName "1.8.9 (W)" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index d12167f3d..5dc6c3225 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 82, - "versionName": "1.8.8.2 (W)", + "versionCode": 84, + "versionName": "1.8.9 (W)", "outputFile": "app-release.apk" } ], diff --git a/app/src/main/java/com/example/weathermaster/MainActivity.java b/app/src/main/java/com/example/weathermaster/MainActivity.java index c353bc6db..7600d1335 100644 --- a/app/src/main/java/com/example/weathermaster/MainActivity.java +++ b/app/src/main/java/com/example/weathermaster/MainActivity.java @@ -15,10 +15,7 @@ import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Looper; -import android.provider.Settings; import android.text.InputType; -import android.util.Log; -import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; @@ -31,7 +28,6 @@ import android.webkit.WebSettings; import android.webkit.WebView; import android.webkit.WebViewClient; import android.widget.EditText; -import android.widget.TextView; import android.widget.Toast; import androidx.annotation.NonNull; @@ -102,7 +98,7 @@ public class MainActivity extends AppCompatActivity { AndroidInterface androidInterface = new AndroidInterface(this); webview.addJavascriptInterface(androidInterface, "AndroidInterface"); webview.addJavascriptInterface(new ShowToastInterface(this), "ToastAndroidShow"); - webview.addJavascriptInterface(new UpdateNotificationInterface(this), "UpdateNotificationInterface"); + webview.addJavascriptInterface(new UpdateWidget1Interface(this), "UpdateWidget1Interface"); webview.addJavascriptInterface(new ShowSnackInterface(this), "ShowSnackMessage"); webview.setBackgroundColor(getResources().getColor(R.color.diffDefault)); webview.getSettings().setGeolocationEnabled(true); @@ -309,16 +305,23 @@ public class MainActivity extends AppCompatActivity { } - public class UpdateNotificationInterface { + public class UpdateWidget1Interface { private final Context mContext; - public UpdateNotificationInterface(Context context) { + public UpdateWidget1Interface(Context context) { this.mContext = context; } @JavascriptInterface - public void updateNotification(final String condition, final String locationWeather, final String mainTemp, final String iconData, final String highLow, final String hour_0_temp, final String hour_0_icon, final String hour_0_time, final String hour_1_temp, final String hour_1_icon, final String hour_1_time, final String hour_2_temp, final String hour_2_icon, final String hour_2_time, final String hour_3_temp, final String hour_3_icon, final String hour_3_time) { + public void UpdateWidget1(final String condition, final String locationWeather, final String mainTemp, final String iconData, final String highLow, final String hour_0_temp, final String hour_0_icon, final String hour_0_time, final String hour_1_temp, final String hour_1_icon, final String hour_1_time, final String hour_2_temp, final String hour_2_icon, final String hour_2_time, final String hour_3_temp, final String hour_3_icon, final String hour_3_time) { WeatherWidgetProvider.updateWeatherWidget(mContext, condition, locationWeather, mainTemp, iconData, highLow, hour_0_temp, hour_0_icon, hour_0_time, hour_1_temp, hour_1_icon, hour_1_time, hour_2_temp, hour_2_icon, hour_2_time, hour_3_temp, hour_3_icon, hour_3_time); + + WidgetProviderRound.updateWeatherWidgetRound(mContext, mainTemp, iconData); + + WidgetProviderPill.updateWeatherWidgetPill(mContext, mainTemp, iconData); + + WidgetProviderSquare.updateWeatherWidgetSquare(mContext, condition, locationWeather, mainTemp, iconData, highLow, hour_0_temp, hour_0_icon, hour_0_time, hour_1_temp, hour_1_icon, hour_1_time, hour_2_temp, hour_2_icon, hour_2_time, hour_3_temp, hour_3_icon, hour_3_time); + } } diff --git a/app/src/main/res/drawable/clear_night.png b/app/src/main/res/drawable/clear_night.png index 1e1d6e83b..9840be925 100644 Binary files a/app/src/main/res/drawable/clear_night.png and b/app/src/main/res/drawable/clear_night.png differ diff --git a/app/src/main/res/drawable/cloudy.png b/app/src/main/res/drawable/cloudy.png index cb8172d56..f4516fa57 100644 Binary files a/app/src/main/res/drawable/cloudy.png and b/app/src/main/res/drawable/cloudy.png differ diff --git a/app/src/main/res/drawable/drizzle.png b/app/src/main/res/drawable/drizzle.png index b26ad06e8..3bafbb547 100644 Binary files a/app/src/main/res/drawable/drizzle.png and b/app/src/main/res/drawable/drizzle.png differ diff --git a/app/src/main/res/drawable/flurries.png b/app/src/main/res/drawable/flurries.png index 86a6a551c..cabbc372c 100644 Binary files a/app/src/main/res/drawable/flurries.png and b/app/src/main/res/drawable/flurries.png differ diff --git a/app/src/main/res/drawable/haze_fog_dust_smoke.png b/app/src/main/res/drawable/haze_fog_dust_smoke.png index 537c2366a..0e21318c1 100644 Binary files a/app/src/main/res/drawable/haze_fog_dust_smoke.png and b/app/src/main/res/drawable/haze_fog_dust_smoke.png differ diff --git a/app/src/main/res/drawable/heavy_rain.png b/app/src/main/res/drawable/heavy_rain.png index c7f025c62..083868446 100644 Binary files a/app/src/main/res/drawable/heavy_rain.png and b/app/src/main/res/drawable/heavy_rain.png differ diff --git a/app/src/main/res/drawable/heavy_snow.png b/app/src/main/res/drawable/heavy_snow.png index 645bcc974..b7e648fcb 100644 Binary files a/app/src/main/res/drawable/heavy_snow.png and b/app/src/main/res/drawable/heavy_snow.png differ diff --git a/app/src/main/res/drawable/isolated_scattered_tstorms_day.png b/app/src/main/res/drawable/isolated_scattered_tstorms_day.png index 252723ec9..6e9009034 100644 Binary files a/app/src/main/res/drawable/isolated_scattered_tstorms_day.png and b/app/src/main/res/drawable/isolated_scattered_tstorms_day.png differ diff --git a/app/src/main/res/drawable/isolated_scattered_tstorms_night.png b/app/src/main/res/drawable/isolated_scattered_tstorms_night.png index 1e8a341bd..6e9009034 100644 Binary files a/app/src/main/res/drawable/isolated_scattered_tstorms_night.png and b/app/src/main/res/drawable/isolated_scattered_tstorms_night.png differ diff --git a/app/src/main/res/drawable/mostly_clear_night.png b/app/src/main/res/drawable/mostly_clear_night.png index b35ee1357..306f8fb7d 100644 Binary files a/app/src/main/res/drawable/mostly_clear_night.png and b/app/src/main/res/drawable/mostly_clear_night.png differ diff --git a/app/src/main/res/drawable/mostly_cloudy_day.png b/app/src/main/res/drawable/mostly_cloudy_day.png index fb802a0b9..44e6df5f5 100644 Binary files a/app/src/main/res/drawable/mostly_cloudy_day.png and b/app/src/main/res/drawable/mostly_cloudy_day.png differ diff --git a/app/src/main/res/drawable/mostly_cloudy_night.png b/app/src/main/res/drawable/mostly_cloudy_night.png index b85064a5a..87c5beccc 100644 Binary files a/app/src/main/res/drawable/mostly_cloudy_night.png and b/app/src/main/res/drawable/mostly_cloudy_night.png differ diff --git a/app/src/main/res/drawable/mostly_sunny.png b/app/src/main/res/drawable/mostly_sunny.png index 3dc512d86..b5ccbb66c 100644 Binary files a/app/src/main/res/drawable/mostly_sunny.png and b/app/src/main/res/drawable/mostly_sunny.png differ diff --git a/app/src/main/res/drawable/partly_cloudy.png b/app/src/main/res/drawable/partly_cloudy.png index 3b4068a3d..44e6df5f5 100644 Binary files a/app/src/main/res/drawable/partly_cloudy.png and b/app/src/main/res/drawable/partly_cloudy.png differ diff --git a/app/src/main/res/drawable/partly_cloudy_night.png b/app/src/main/res/drawable/partly_cloudy_night.png index 62b0b8901..87c5beccc 100644 Binary files a/app/src/main/res/drawable/partly_cloudy_night.png and b/app/src/main/res/drawable/partly_cloudy_night.png differ diff --git a/app/src/main/res/drawable/scattered_showers_day.png b/app/src/main/res/drawable/scattered_showers_day.png index 9e3d5c4dc..538c44add 100644 Binary files a/app/src/main/res/drawable/scattered_showers_day.png and b/app/src/main/res/drawable/scattered_showers_day.png differ diff --git a/app/src/main/res/drawable/scattered_showers_night.png b/app/src/main/res/drawable/scattered_showers_night.png index 5612b2b2d..3bafbb547 100644 Binary files a/app/src/main/res/drawable/scattered_showers_night.png and b/app/src/main/res/drawable/scattered_showers_night.png differ diff --git a/app/src/main/res/drawable/showers_rain.png b/app/src/main/res/drawable/showers_rain.png index 2016e3541..4248dd420 100644 Binary files a/app/src/main/res/drawable/showers_rain.png and b/app/src/main/res/drawable/showers_rain.png differ diff --git a/app/src/main/res/drawable/sleet_hail.png b/app/src/main/res/drawable/sleet_hail.png index 8a2817e43..730dcd315 100644 Binary files a/app/src/main/res/drawable/sleet_hail.png and b/app/src/main/res/drawable/sleet_hail.png differ diff --git a/app/src/main/res/drawable/snow_showers_snow.png b/app/src/main/res/drawable/snow_showers_snow.png index 909cb134a..624feeb3f 100644 Binary files a/app/src/main/res/drawable/snow_showers_snow.png and b/app/src/main/res/drawable/snow_showers_snow.png differ diff --git a/app/src/main/res/drawable/strong_tstorms.png b/app/src/main/res/drawable/strong_tstorms.png index 894d1ea60..6e9009034 100644 Binary files a/app/src/main/res/drawable/strong_tstorms.png and b/app/src/main/res/drawable/strong_tstorms.png differ diff --git a/app/src/main/res/drawable/sunny.png b/app/src/main/res/drawable/sunny.png index bb9112dc3..bb9253365 100644 Binary files a/app/src/main/res/drawable/sunny.png and b/app/src/main/res/drawable/sunny.png differ diff --git a/app/src/main/res/drawable/tornado.png b/app/src/main/res/drawable/tornado.png index 829b7a8f8..f66ca7e63 100644 Binary files a/app/src/main/res/drawable/tornado.png and b/app/src/main/res/drawable/tornado.png differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e3598f37f..08d2905a7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,4 @@ Weather Master + Current and Hourly \ No newline at end of file