From 10aced4a5d69d54aeda7774cdce14497b270837e Mon Sep 17 00:00:00 2001 From: woheller69 Date: Tue, 1 Jul 2025 10:01:17 +0200 Subject: [PATCH] V2.7 SDK 35 Android 15 --- app/build.gradle | 20 +++++----- app/src/main/AndroidManifest.xml | 3 +- .../weather/activities/AboutActivity.java | 8 ++++ .../activities/BackupRestoreActivity.java | 8 +++- .../activities/ForecastCityActivity.java | 8 ++++ .../weather/activities/HelpActivity.java | 8 ++++ .../activities/ManageLocationsActivity.java | 9 +++++ .../weather/activities/SettingsActivity.java | 8 +++- .../weather/firststart/TutorialActivity.java | 21 ++++------ app/src/main/res/layout/activity_about.xml | 1 - .../res/layout/activity_backuprestore.xml | 1 - .../res/layout/activity_forecast_city.xml | 1 - app/src/main/res/layout/activity_help.xml | 1 - .../res/layout/activity_manage_locations.xml | 1 - .../main/res/layout/activity_rain_viewer.xml | 40 ------------------- app/src/main/res/layout/activity_settings.xml | 1 - app/src/main/res/layout/activity_tutorial.xml | 3 +- app/src/main/res/values-night/colors.xml | 1 - app/src/main/res/values/colors.xml | 1 - app/src/main/res/values/styles.xml | 1 - build.gradle | 2 +- .../metadata/android/en-US/changelogs/27.txt | 1 + gradle/wrapper/gradle-wrapper.properties | 4 +- 23 files changed, 71 insertions(+), 81 deletions(-) delete mode 100644 app/src/main/res/layout/activity_rain_viewer.xml create mode 100644 fastlane/metadata/android/en-US/changelogs/27.txt diff --git a/app/build.gradle b/app/build.gradle index a521b59..47ad114 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,14 +13,16 @@ android { includeInBundle = false } - compileSdk 34 + compileSdk 35 + android.buildFeatures.buildConfig true + namespace 'org.woheller69.weather' defaultConfig { applicationId "org.woheller69.solxpect" minSdkVersion 26 - targetSdk 34 - versionCode 26 - versionName "2.6" + targetSdk 35 + versionCode 27 + versionName "2.7" buildConfigField "String", "BASE_URL", "\"https://api.open-meteo.com/v1/\"" buildConfigField "String", "TILES_URL","\"https://tile.openstreetmap.org/\"" @@ -40,16 +42,14 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'com.diogobernardino:williamchart:2.2' implementation 'net.e175.klaus:solarpositioning:0.1.10' - implementation 'androidx.preference:preference:1.2.0' - implementation 'androidx.appcompat:appcompat:1.5.1' - implementation 'com.google.android.material:material:1.6.1' + implementation 'androidx.preference:preference:1.2.1' + implementation 'androidx.appcompat:appcompat:1.7.1' + implementation 'com.google.android.material:material:1.12.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'com.android.volley:volley:1.2.1' - implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'androidx.recyclerview:recyclerview:1.4.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'net.lingala.zip4j:zip4j:2.9.1' - implementation "androidx.lifecycle:lifecycle-viewmodel:2.5.1" //needed due to duplicate class error - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" //needed due to duplicate class error implementation 'com.github.woheller69:CompassView:948f3db329' implementation 'androidx.webkit:webkit:1.5.0' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 847c4e8..d27eaf0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/app/src/main/java/org/woheller69/weather/activities/AboutActivity.java b/app/src/main/java/org/woheller69/weather/activities/AboutActivity.java index fc26530..da787ba 100644 --- a/app/src/main/java/org/woheller69/weather/activities/AboutActivity.java +++ b/app/src/main/java/org/woheller69/weather/activities/AboutActivity.java @@ -1,7 +1,9 @@ package org.woheller69.weather.activities; +import android.os.Build; import android.os.Bundle; import android.text.method.LinkMovementMethod; +import android.view.WindowInsetsController; import android.widget.TextView; import org.woheller69.weather.BuildConfig; @@ -15,6 +17,12 @@ public class AboutActivity extends NavigationActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_about); + if (Build.VERSION.SDK_INT > Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { + getWindow().getInsetsController().setSystemBarsAppearance( + WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS, + WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS + ); + } ((TextView) findViewById(R.id.openmeteoURL)).setMovementMethod(LinkMovementMethod.getInstance()); ((TextView) findViewById(R.id.githubURL)).setMovementMethod(LinkMovementMethod.getInstance()); diff --git a/app/src/main/java/org/woheller69/weather/activities/BackupRestoreActivity.java b/app/src/main/java/org/woheller69/weather/activities/BackupRestoreActivity.java index fe693f5..823dc24 100644 --- a/app/src/main/java/org/woheller69/weather/activities/BackupRestoreActivity.java +++ b/app/src/main/java/org/woheller69/weather/activities/BackupRestoreActivity.java @@ -9,6 +9,7 @@ import android.os.Bundle; import android.os.Environment; import android.view.Gravity; import android.view.View; +import android.view.WindowInsetsController; import android.widget.Toast; import androidx.activity.result.ActivityResultLauncher; @@ -33,7 +34,12 @@ public class BackupRestoreActivity extends NavigationActivity{ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_backuprestore); - + if (Build.VERSION.SDK_INT > Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { + getWindow().getInsetsController().setSystemBarsAppearance( + WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS, + WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS + ); + } ActionBar actionBar = getSupportActionBar(); if (actionBar != null) { 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 7bda47e..44c9124 100644 --- a/app/src/main/java/org/woheller69/weather/activities/ForecastCityActivity.java +++ b/app/src/main/java/org/woheller69/weather/activities/ForecastCityActivity.java @@ -3,6 +3,7 @@ package org.woheller69.weather.activities; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; +import android.os.Build; import android.os.Bundle; import androidx.appcompat.app.AlertDialog; @@ -16,6 +17,7 @@ import androidx.viewpager2.widget.ViewPager2; import android.view.Menu; import android.view.MenuItem; import android.view.View; +import android.view.WindowInsetsController; import android.view.animation.Animation; import android.view.animation.LinearInterpolator; import android.view.animation.RotateAnimation; @@ -93,6 +95,12 @@ public class ForecastCityActivity extends NavigationActivity implements IUpdatea super.onCreate(savedInstanceState); context=this; setContentView(R.layout.activity_forecast_city); + if (Build.VERSION.SDK_INT > Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { + getWindow().getInsetsController().setSystemBarsAppearance( + WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS, + WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS + ); + } initResources(); diff --git a/app/src/main/java/org/woheller69/weather/activities/HelpActivity.java b/app/src/main/java/org/woheller69/weather/activities/HelpActivity.java index 71d56f9..00c8493 100644 --- a/app/src/main/java/org/woheller69/weather/activities/HelpActivity.java +++ b/app/src/main/java/org/woheller69/weather/activities/HelpActivity.java @@ -3,6 +3,7 @@ package org.woheller69.weather.activities; import android.content.res.AssetManager; import android.os.Build; import android.os.Bundle; +import android.view.WindowInsetsController; import android.webkit.WebView; import org.woheller69.weather.R; @@ -20,6 +21,13 @@ public class HelpActivity extends NavigationActivity{ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_help); + if (Build.VERSION.SDK_INT > Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { + getWindow().getInsetsController().setSystemBarsAppearance( + WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS, + WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS + ); + } + WebView view = findViewById(R.id.help); if(WebViewFeature.isFeatureSupported(WebViewFeature.ALGORITHMIC_DARKENING)) { diff --git a/app/src/main/java/org/woheller69/weather/activities/ManageLocationsActivity.java b/app/src/main/java/org/woheller69/weather/activities/ManageLocationsActivity.java index b1a059a..1f4826b 100644 --- a/app/src/main/java/org/woheller69/weather/activities/ManageLocationsActivity.java +++ b/app/src/main/java/org/woheller69/weather/activities/ManageLocationsActivity.java @@ -1,6 +1,7 @@ package org.woheller69.weather.activities; import android.content.Context; +import android.os.Build; import android.os.Bundle; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.redinput.compassview.CompassView; @@ -17,6 +18,7 @@ import android.text.TextWatcher; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.WindowInsetsController; import android.view.WindowManager; import android.widget.CheckBox; import android.widget.EditText; @@ -62,6 +64,13 @@ public class ManageLocationsActivity extends NavigationActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_manage_locations); + if (Build.VERSION.SDK_INT > Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { + getWindow().getInsetsController().setSystemBarsAppearance( + WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS, + WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS + ); + } + context=this; database = SQLiteHelper.getInstance(getApplicationContext()); diff --git a/app/src/main/java/org/woheller69/weather/activities/SettingsActivity.java b/app/src/main/java/org/woheller69/weather/activities/SettingsActivity.java index 4f79ce1..abd2a95 100644 --- a/app/src/main/java/org/woheller69/weather/activities/SettingsActivity.java +++ b/app/src/main/java/org/woheller69/weather/activities/SettingsActivity.java @@ -4,6 +4,7 @@ package org.woheller69.weather.activities; import android.content.SharedPreferences; import android.os.Build; import android.os.Bundle; +import android.view.WindowInsetsController; import androidx.annotation.NonNull; import androidx.annotation.RequiresApi; @@ -40,7 +41,12 @@ public class SettingsActivity extends NavigationActivity implements SharedPrefer super.onCreate(savedInstanceState); setContentView(R.layout.activity_settings); - + if (Build.VERSION.SDK_INT > Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { + getWindow().getInsetsController().setSystemBarsAppearance( + WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS, + WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS + ); + } } @Override diff --git a/app/src/main/java/org/woheller69/weather/firststart/TutorialActivity.java b/app/src/main/java/org/woheller69/weather/firststart/TutorialActivity.java index 6a59c20..135f75d 100644 --- a/app/src/main/java/org/woheller69/weather/firststart/TutorialActivity.java +++ b/app/src/main/java/org/woheller69/weather/firststart/TutorialActivity.java @@ -14,6 +14,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.Window; +import android.view.WindowInsetsController; import android.view.WindowManager; import android.widget.Button; @@ -46,7 +47,12 @@ public class TutorialActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_tutorial); - + if (Build.VERSION.SDK_INT > Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { + getWindow().getInsetsController().setSystemBarsAppearance( + WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS, + WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS + ); + } viewPager = (ViewPager) findViewById(R.id.view_pager); dotsLayout = (LinearLayout) findViewById(R.id.layoutDots); btnNext = (Button) findViewById(R.id.btn_next); @@ -62,8 +68,6 @@ public class TutorialActivity extends AppCompatActivity { // adding bottom dots addBottomDots(0); - // making notification bar transparent - changeStatusBarColor(); myViewPagerAdapter = new MyViewPagerAdapter(); viewPager.setAdapter(myViewPagerAdapter); @@ -158,17 +162,6 @@ public class TutorialActivity extends AppCompatActivity { } }; - /** - * Making notification bar transparent - */ - private void changeStatusBarColor() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - Window window = getWindow(); - window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); - window.setStatusBarColor(Color.TRANSPARENT); - } - } - /** * View pager adapter */ diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 11c2cc4..b3e90a5 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -5,7 +5,6 @@ android:id="@+id/drawer_layout" android:layout_width="match_parent" android:layout_height="match_parent" - android:fitsSystemWindows="true" tools:openDrawer="start"> - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 631a895..985481d 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -5,7 +5,6 @@ android:id="@+id/drawer_layout" android:layout_width="match_parent" android:layout_height="match_parent" - android:fitsSystemWindows="true" tools:openDrawer="start"> + android:layout_height="match_parent" + android:fitsSystemWindows="true"> - #181818 #181818 #777777 #a0a0a0 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 2fe03da..de05bc5 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,6 +1,5 @@ - #024265 #024265 #024265 #0274b2 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 60f3c9c..1f9dd67 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -10,7 +10,6 @@