From 0256736c596bc7b4886309fca1fccd603ba0a6f0 Mon Sep 17 00:00:00 2001 From: woheller69 Date: Mon, 3 Nov 2025 08:38:06 +0100 Subject: [PATCH] V2.8 Add toggle button for sum --- app/build.gradle | 5 +++-- .../weather/activities/ForecastCityActivity.java | 13 +++++++++++++ .../weather/activities/NavigationActivity.java | 2 ++ app/src/main/res/drawable/ic_sum_24dp.xml | 9 +++++++++ app/src/main/res/menu/activity_forecast_city.xml | 7 +++++++ fastlane/metadata/android/en-US/changelogs/28.txt | 2 ++ 6 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 app/src/main/res/drawable/ic_sum_24dp.xml create mode 100644 fastlane/metadata/android/en-US/changelogs/28.txt diff --git a/app/build.gradle b/app/build.gradle index 47ad114..1f8a8fc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ android { applicationId "org.woheller69.solxpect" minSdkVersion 26 targetSdk 35 - versionCode 27 - versionName "2.7" + versionCode 28 + versionName "2.8" buildConfigField "String", "BASE_URL", "\"https://api.open-meteo.com/v1/\"" buildConfigField "String", "TILES_URL","\"https://tile.openstreetmap.org/\"" @@ -52,4 +52,5 @@ dependencies { implementation 'net.lingala.zip4j:zip4j:2.9.1' implementation 'com.github.woheller69:CompassView:948f3db329' implementation 'androidx.webkit:webkit:1.5.0' + implementation 'com.github.woheller69:FreeDroidWarn:V1.6' } \ No newline at end of file diff --git a/app/src/main/java/org/woheller69/weather/activities/ForecastCityActivity.java b/app/src/main/java/org/woheller69/weather/activities/ForecastCityActivity.java index 44c9124..230341a 100644 --- a/app/src/main/java/org/woheller69/weather/activities/ForecastCityActivity.java +++ b/app/src/main/java/org/woheller69/weather/activities/ForecastCityActivity.java @@ -174,6 +174,14 @@ public class ForecastCityActivity extends NavigationActivity implements IUpdatea refreshActionButton.getActionView().setOnClickListener(v -> m.performIdentifierAction(refreshActionButton.getItemId(), 0)); if (isRefreshing) startRefreshAnimation(); + SharedPreferences prefManager = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); + boolean modeSum = prefManager.getBoolean("pref_summarize",false); + if (modeSum) { + menu.findItem(R.id.menu_summarize).getIcon().setAlpha(255); + } else { + menu.findItem(R.id.menu_summarize).getIcon().setAlpha(50); + } + return true; } @@ -210,6 +218,11 @@ public class ForecastCityActivity extends NavigationActivity implements IUpdatea alertDialogBuilder.setPositiveButton(getString(android.R.string.ok), (dialog, which) -> { }); AlertDialog alertDialog = alertDialogBuilder.create(); alertDialog.show(); + } else if (id==R.id.menu_summarize){ + SharedPreferences prefManager = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); + boolean modeSum = prefManager.getBoolean("pref_summarize",false); + prefManager.edit().putBoolean("pref_summarize",!modeSum).commit(); + recreate(); } return super.onOptionsItemSelected(item); diff --git a/app/src/main/java/org/woheller69/weather/activities/NavigationActivity.java b/app/src/main/java/org/woheller69/weather/activities/NavigationActivity.java index 8098762..530768c 100644 --- a/app/src/main/java/org/woheller69/weather/activities/NavigationActivity.java +++ b/app/src/main/java/org/woheller69/weather/activities/NavigationActivity.java @@ -24,6 +24,7 @@ import android.os.Looper; import android.view.MenuItem; +import org.woheller69.freeDroidWarn.FreeDroidWarn; import org.woheller69.weather.BuildConfig; import org.woheller69.weather.R; import org.woheller69.weather.database.SQLiteHelper; @@ -55,6 +56,7 @@ public class NavigationActivity extends AppCompatActivity implements OnNavigatio mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); mHandler = new Handler(Looper.getMainLooper()); + FreeDroidWarn.showWarningOnUpgrade(this, BuildConfig.VERSION_CODE); prefManager = new AppPreferencesManager(PreferenceManager.getDefaultSharedPreferences(this)); if (prefManager.showStarDialog(this)) { AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this); diff --git a/app/src/main/res/drawable/ic_sum_24dp.xml b/app/src/main/res/drawable/ic_sum_24dp.xml new file mode 100644 index 0000000..3ab808f --- /dev/null +++ b/app/src/main/res/drawable/ic_sum_24dp.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/menu/activity_forecast_city.xml b/app/src/main/res/menu/activity_forecast_city.xml index 07a9b68..f190165 100644 --- a/app/src/main/res/menu/activity_forecast_city.xml +++ b/app/src/main/res/menu/activity_forecast_city.xml @@ -1,6 +1,13 @@ +