V2.7

SDK 35
Android 15

README.md

@@ -1,10 +1,15 @@
-<pre>Send a coffee to woheller69@t-online.de 
-<a href= "https://www.paypal.com/signin"><img  align="left" src="https://www.paypalobjects.com/webstatic/de_DE/i/de-pp-logo-150px.png"></a></pre>
+<pre>Send a coffee to 
+woheller69@t-online.de 
+<a href= "https://www.paypal.com/signin"><img  align="left" src="https://www.paypalobjects.com/webstatic/de_DE/i/de-pp-logo-150px.png"></a>
+
+  
+Or via this link (with fees)
+<a href="https://www.paypal.com/donate?hosted_button_id=XVXQ54LBLZ4AA"><img  align="left" src="https://img.shields.io/badge/Donate%20with%20Debit%20or%20Credit%20Card-002991?style=plastic"></a></pre>
 
 
 | **RadarWeather** | **Gas Prices** | **Smart Eggtimer** |
 |:---:|:---:|:---:|
-| [<img src="https://github.com/woheller69/weather/blob/main/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.weather/)| [<img src="https://github.com/woheller69/spritpreise/blob/main/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.spritpreise/) | [<img src="https://github.com/woheller69/eggtimer/blob/main/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.eggtimer/) |
+| [<img src="https://github.com/woheller69/weather/blob/main/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.weather/) | [<img src="https://github.com/woheller69/spritpreise/blob/main/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.spritpreise/) | [<img src="https://github.com/woheller69/eggtimer/blob/main/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.eggtimer/) |
 | **Bubble** | **hEARtest** | **GPS Cockpit** |
 | [<img src="https://github.com/woheller69/Level/blob/master/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.level/) | [<img src="https://github.com/woheller69/audiometry/blob/new/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.audiometry/) | [<img src="https://github.com/woheller69/gpscockpit/blob/master/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.gpscockpit/) |
 | **Audio Analyzer** | **LavSeeker** | **TimeLapseCam** |
@@ -13,8 +18,10 @@
 | [<img src="https://github.com/woheller69/arity/blob/master/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.arity/) | [<img src="https://github.com/woheller69/omweather/blob/master/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.omweather/) | [<img src="https://github.com/woheller69/solXpect/blob/main/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.solxpect/) |
 | **gptAssist** | **dumpSeeker** | **huggingAssist** |
 | [<img src="https://github.com/woheller69/gptassist/blob/master/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.gptassist/) | [<img src="https://github.com/woheller69/dumpseeker/blob/main/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.dumpseeker/) | [<img src="https://github.com/woheller69/huggingassist/blob/master/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.hugassist/) |
-| **FREE Browser** | **whoBIRD**| |
-| [<img src="https://github.com/woheller69/browser/blob/newmaster/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.browser/) | [<img src="https://github.com/woheller69/whoBIRD/blob/master/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.whobird/) | |
+| **FREE Browser** | **whoBIRD** | **PeakOrama** |
+| [<img src="https://github.com/woheller69/browser/blob/newmaster/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.browser/) | [<img src="https://github.com/woheller69/whoBIRD/blob/master/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.whobird/) | [<img src="https://github.com/woheller69/PeakOrama/blob/master/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.PeakOrama/) |
+| **Whisper** | **Seamless** | |
+| [<img src="https://github.com/woheller69/whisperIME/blob/master/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.whisper/) | [<img src="https://github.com/woheller69/seamless/blob/master/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.seemless/) | |
 
 # solXpect
 

app/build.gradle

@@ -2,14 +2,27 @@ apply plugin: 'com.android.application'
 
 android {
 
-    compileSdk 34
+    lintOptions {
+        disable 'MissingTranslation'
+    }
+
+    dependenciesInfo {
+        // Disable including dependency metadata when building APKs
+        includeInApk = false
+        // Disable including dependency metadata when building Android App Bundles
+        includeInBundle = false
+    }
+
+    compileSdk 35
+    android.buildFeatures.buildConfig true
+    namespace 'org.woheller69.weather'
 
     defaultConfig {
         applicationId "org.woheller69.solxpect"
         minSdkVersion 26
-        targetSdk 34
-        versionCode 25
-        versionName "2.5"
+        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/\""
@@ -29,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'
 }

app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.woheller69.weather">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />

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());

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) {
@@ -58,6 +64,7 @@ public class BackupRestoreActivity extends NavigationActivity{
         File intData;
         intData = new File(Environment.getDataDirectory()+"//data//" + this.getPackageName() + "//databases//");
         extStorage = Environment.getExternalStoragePublicDirectory(DIRECTORY_DOCUMENTS);
+        if (!extStorage.exists()) extStorage.mkdir();
         String filesBackup = getResources().getString(R.string.app_name)+".zip";
         final File dbBackup = new File(extStorage, filesBackup);
         AlertDialog.Builder builder = new AlertDialog.Builder(this);

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();
 

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)) {

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());
 

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

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
      */

app/src/main/java/org/woheller69/weather/ui/RecycleList/CityWeatherAdapter.java

@@ -38,6 +38,8 @@ public class CityWeatherAdapter extends RecyclerView.Adapter<CityWeatherAdapter.
     private int[] dataSetTypes;
     private List<HourlyForecast> courseDayList;
     private List<WeekForecast> weekForecastList;
+    private float producedToday;
+    private float remainingToday;
 
     private Context context;
     private ViewGroup mParent;
@@ -118,6 +120,13 @@ public class CityWeatherAdapter extends RecyclerView.Adapter<CityWeatherAdapter.
                 courseDayList.add(f);
             }
 
+            if (f.getForecastTime() < System.currentTimeMillis() && stepCounter <= 24) producedToday = f.getEnergyCum();
+            if (f.getForecastTime() > System.currentTimeMillis() && f.getForecastTime() < System.currentTimeMillis() + 3600000 && stepCounter <= 24) {
+                long millisRemainingThisHour = f.getForecastTime() - System.currentTimeMillis();
+                long millisSoFarThisHour = 3600000 - millisRemainingThisHour;
+                producedToday = producedToday + (f.getEnergyCum()-producedToday) * millisSoFarThisHour/3600000;
+            }
+
             stepCounter++;
             //   if not in debug mode: Reset energyCumulated after every 24 hours if next step is 01:00 am because values are for previous hour
             if (!isDebugMode && stepCounter % 24 == 1) {
@@ -136,7 +145,7 @@ public class CityWeatherAdapter extends RecyclerView.Adapter<CityWeatherAdapter.
             }
             weekForecast.setEnergyDay(totalEnergy/1000);
         }
-
+        remainingToday = weekForecasts.get(0).getEnergyDay()*1000 - producedToday;
         weekForecastList = weekForecasts;
 
         notifyDataSetChanged();
@@ -150,15 +159,17 @@ public class CityWeatherAdapter extends RecyclerView.Adapter<CityWeatherAdapter.
     }
 
     public class OverViewHolder extends ViewHolder {
-        TextView temperature;
+        TextView produced;
+        TextView remaining;
         TextView updatetime;
         TextView sun;
 
         OverViewHolder(View v) {
             super(v);
-            this.temperature = v.findViewById(R.id.card_overview_temperature);
             this.sun=v.findViewById(R.id.card_overview_sunrise_sunset);
             this.updatetime=v.findViewById(R.id.card_overview_update_time);
+            this.produced=v.findViewById(R.id.card_overview_produced_today);
+            this.remaining=v.findViewById(R.id.card_overview_remaining_today);
         }
     }
 
@@ -276,6 +287,8 @@ public class CityWeatherAdapter extends RecyclerView.Adapter<CityWeatherAdapter.
 
             holder.updatetime.setText("("+StringFormatUtils.formatTimeWithoutZone(context, updateTime)+")");
 
+            holder.produced.setText(StringFormatUtils.formatEnergyCum(context, producedToday));
+            holder.remaining.setText(StringFormatUtils.formatEnergyCum(context, remainingToday));
 
         } else if (viewHolder.getItemViewType() == WEEK) {
 
@@ -298,6 +311,7 @@ public class CityWeatherAdapter extends RecyclerView.Adapter<CityWeatherAdapter.
                     new RecyclerItemClickListener(context, holder.recyclerView, new RecyclerItemClickListener.OnItemClickListener() {
                         @Override
                         public void onItemClick(View view, int position) {
+                            if (position == -1) return;
                             SQLiteHelper database = SQLiteHelper.getInstance(context.getApplicationContext());
                             List<WeekForecast> weekforecasts = database.getWeekForecastsByCityId(generalDataList.getCity_id());
                             long time = weekforecasts.get(position).getForecastTime();  //time of clicked week item

app/src/main/java/org/woheller69/weather/ui/WeatherCityFragment.java

@@ -3,6 +3,7 @@ package org.woheller69.weather.ui;
 import static org.woheller69.weather.ui.RecycleList.CityWeatherAdapter.CHART;
 import static org.woheller69.weather.ui.RecycleList.CityWeatherAdapter.DAY;
 import static org.woheller69.weather.ui.RecycleList.CityWeatherAdapter.EMPTY;
+import static org.woheller69.weather.ui.RecycleList.CityWeatherAdapter.OVERVIEW;
 import static org.woheller69.weather.ui.RecycleList.CityWeatherAdapter.WEEK;
 
 import android.annotation.SuppressLint;
@@ -38,7 +39,7 @@ public class WeatherCityFragment extends Fragment implements IUpdateableCityUI {
 
     private int mCityId = -1;
     private int[] mDataSetTypes = new int[]{};
-    private static int[] mFull = {DAY, WEEK, CHART}; //TODO Make dynamic from Settings
+    private static int[] mFull = {OVERVIEW, DAY, WEEK, CHART}; //TODO Make dynamic from Settings
     private static int[] mEmpty = {EMPTY};
     private CityWeatherAdapter mAdapter;
 

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">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout

app/src/main/res/layout/activity_backuprestore.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">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout

app/src/main/res/layout/activity_forecast_city.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">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout

app/src/main/res/layout/activity_help.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">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout

app/src/main/res/layout/activity_manage_locations.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">
 
     <include

app/src/main/res/layout/activity_rain_viewer.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".activities.RainViewerActivity"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:background="@color/backgroundBlue"
-        android:orientation="horizontal">
-
-        <ImageButton
-            android:id="@+id/rainviewer_prev"
-            android:layout_width="wrap_content"
-            android:layout_weight="1"
-            android:src="@drawable/ic_skip_previous_24px"
-            android:layout_height="wrap_content" />
-        <ImageButton
-            android:id="@+id/rainviewer_startstop"
-            android:layout_width="wrap_content"
-            android:layout_weight="3"
-            android:src="@drawable/ic_playpause"
-            android:layout_height="wrap_content" />
-        <ImageButton
-            android:id="@+id/rainviewer_next"
-            android:layout_width="wrap_content"
-            android:layout_weight="1"
-            android:src="@drawable/ic_skip_next_24px"
-            android:layout_height="wrap_content" />
-
-    </LinearLayout>
-
-    <WebView
-        android:id="@+id/webView"
-        android:layout_width="match_parent"
-        android:layout_height="fill_parent" />
-</LinearLayout>

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">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout

app/src/main/res/layout/activity_tutorial.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
 
 
     <androidx.viewpager.widget.ViewPager

app/src/main/res/layout/card_overview.xml

@@ -5,40 +5,38 @@
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/card_margin">
 
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="#fafafa"
-        android:layout_marginTop="5dp"
-        android:layout_marginStart="7dp"
-        android:textSize="12dp"
-        android:text="Weather data by Open-Meteo.com" />
-
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center_vertical">
-
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:background="@color/backgroundBlue">
 
         <TextView
-            android:id="@+id/card_overview_temperature"
-            android:layout_width="wrap_content"
+            android:id="@+id/card_overview_header"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="10dp"
             android:layout_marginEnd="10dp"
-            android:background="@drawable/rounded_corner"
-            android:paddingLeft="7dp"
-            android:paddingRight="7dp"
+            android:layout_marginBottom="10dp"
+            android:gravity="center"
+            android:text="@string/card_today_heading"
+            android:textAllCaps="true"
             android:textColor="@color/colorPrimaryDark"
-            android:textSize="45dp" />
+            android:textStyle="bold" />
+
+        <View
+            android:id="@+id/card_overview_header_spacer"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@id/card_overview_header"
+            android:background="@color/white" />
 
         <TextView
             android:id="@+id/card_overview_update_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
+            android:layout_alignBaseline="@id/card_overview_header"
             android:layout_alignParentEnd="true"
             android:layout_marginEnd="10dp"
             android:paddingLeft="7dp"
@@ -46,18 +44,77 @@
             android:textColor="#fafafa"
             android:textSize="18dp" />
 
-    </RelativeLayout>
+
         <TextView
             android:id="@+id/card_overview_sunrise_sunset"
+            android:layout_alignBaseline="@id/card_overview_remaining_today"
+            android:layout_alignParentEnd="true"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-        android:layout_gravity="bottom|right"
             android:textSize="15dp"
             android:textColor="@color/colorPrimaryDark"
-        android:background="@drawable/rounded_corner"
             android:layout_marginEnd="10dp"
-        android:layout_marginBottom="5dp"
             android:paddingRight="7dp"
             android:paddingLeft="7dp" />
 
+        <TextView
+            android:id="@+id/card_overview_credits"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/card_overview_sunrise_sunset"
+            android:layout_centerHorizontal="true"
+            android:textColor="#fafafa"
+            android:layout_marginStart="7dp"
+            android:textSize="12dp"
+            android:text="Weather data by Open-Meteo.com" />
+
+
+        <TextView
+            android:id="@+id/card_overview_produced_today_header"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/card_overview_header_spacer"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/colorPrimaryDark"
+            android:layout_marginTop="5dp"
+            android:layout_marginStart="7dp"
+            android:text="@string/card_today_produced" />
+
+        <TextView
+            android:id="@+id/card_overview_produced_today"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/card_overview_header_spacer"
+            android:layout_toEndOf="@id/card_overview_produced_today_header"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/colorPrimaryDark"
+            android:layout_marginTop="5dp"
+            android:layout_marginStart="7dp"
+            android:text="1500 Wh" />
+
+        <TextView
+            android:id="@+id/card_overview_remaining_today_header"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/card_overview_produced_today"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/colorPrimaryDark"
+            android:layout_marginTop="5dp"
+            android:layout_marginStart="7dp"
+            android:text="@string/card_today_remaining" />
+
+        <TextView
+            android:id="@+id/card_overview_remaining_today"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/card_overview_produced_today"
+            android:layout_toEndOf="@id/card_overview_remaining_today_header"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/colorPrimaryDark"
+            android:layout_marginTop="5dp"
+            android:layout_marginStart="7dp"
+            android:text="1500 Wh" />
+
+    </RelativeLayout>
+
 </androidx.cardview.widget.CardView>

app/src/main/res/values-de/strings.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">solXpect</string>
     <string name="about">Über</string>
     <string name="about_privacy_heading">Privatsphäre-Informationen</string>
     <string name="about_more_info">Mehr Informationen können gefunden werden auf:</string>
@@ -111,4 +110,7 @@
     <string name="settings_server_urls">Server URLs</string>
     <string name="settings_server_summary">Nur ändern, wenn Sie Ihre eigenen Server betreiben wollen</string>
     <string name="edit_location_hint_central_inverter">Zentralwechselrichter</string>
+    <string name="card_today_heading">Heute</string>
+    <string name="card_today_produced">Produziert:</string>
+    <string name="card_today_remaining">Verbleibend:</string>
 </resources>

app/src/main/res/values-it/strings.xml

@@ -1,5 +1,4 @@
 <resources>
-    <string name="app_name">solXpect</string>
     <string name="activity_about">Info</string>
     <string name="activity_settings">Impostazioni</string>
     <string name="activity_weather">Previsione</string>

app/src/main/res/values-night/colors.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorStatusBar">#181818</color>
     <color name="colorPrimary">#181818</color>
     <color name="colorPrimaryDark">#777777</color>
     <color name="colorAccent">#a0a0a0</color>

app/src/main/res/values-tr/strings.xml

@@ -1,5 +1,4 @@
 <resources>
-    <string name="app_name">solXpect</string>
     <string name="activity_about">Hakkında</string>
     <string name="activity_settings">Ayarlar</string>
     <string name="activity_weather">Tahmin</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -0,0 +1,115 @@
+<resources>
+    <string name="app_name">发电预测</string>
+    <string name="activity_about">关于</string>
+    <string name="activity_settings">设置</string>
+    <string name="activity_weather">天气预报</string>
+    <string name="activity_manage">管理位置</string>
+    <string name="action_refresh">刷新</string>
+    <string name="navigation_drawer_open">打开导航抽屉</string>
+    <string name="navigation_drawer_close">关闭导航抽屉</string>
+    <string name="next">下一步</string>
+    <string name="okay">确定</string>
+    <string name="slide1_heading">欢迎！</string>
+    <string name="slide1_text">太阳能预测可预测您的太阳能发电站输出</string>
+    <string name="slide2_text">本应用的源代码可在GitHub获取。更多说明请查看关于页面。</string>
+    <string name="card_week_heading">本周</string>
+    <string name="card_error_heading">获取天气数据错误</string>
+    <string name="card_error_content">请尝试更新！</string>
+    <string name="about_privacy_heading">隐私信息</string>
+    <string name="about">关于</string>
+    <string name="version_number">版本号</string>
+    <string name="about_license">许可证</string>
+    <string name="about_license_text">本应用衍生自SECUSO研究小组开发的Privacy Friendly Weather。源代码采用GPLv3许可。应用使用的图标来自Google Material Design Icons（Apache 2.0许可）、Leaflet库（BSD 2条款许可）、AutoSuggestTextViewAPICall（Apache 2.0许可）、Solarpositioning（MIT许可）、Zip4j（Apache 2.0许可）、CompassView（Apache 2.0许可）和WilliamChart库（Apache 2.0许可）</string>
+    <string name="about_more_info">更多信息请访问：</string>
+    <string name="activity_settings_title">设置</string>
+    <string name="abbreviation_monday">周一</string>
+    <string name="abbreviation_tuesday">周二</string>
+    <string name="abbreviation_wednesday">周三</string>
+    <string name="abbreviation_thursday">周四</string>
+    <string name="abbreviation_friday">周五</string>
+    <string name="abbreviation_saturday">周六</string>
+    <string name="abbreviation_sunday">周日</string>
+    <string name="dialog_add_label">输入要添加的位置：</string>
+    <string name="dialog_add_no_city_found">未找到匹配您输入的位置。建议从下拉列表中选择项目。</string>
+    <string name="dialog_add_add_button">添加</string>
+    <string name="error_convert_to_json">获取的天气数据格式不正确。</string>
+    <string name="error_no_internet">您的设备未连接到互联网</string>
+    <string name="error_fetch_forecast">更新预报时出错，请重试！</string>
+    <string name="error_no_city_selected">未选择位置。请前往\"管理位置\"进行选择。</string>
+    <string name="settings_interval_quarter">15分钟</string>
+    <string name="settings_interval_half">30分钟</string>
+    <string name="settings_interval_one">1小时</string>
+    <string name="settings_interval_two">2小时</string>
+    <string name="settings_interval_six">6小时</string>
+    <string name="settings_interval_twelve">12小时</string>
+    <string name="settings_interval_twentyfour">24小时</string>
+    <string name="settings_intervals">间隔</string>
+    <string name="settings_update_interval">更新间隔</string>
+    <string name="settings_interval_summary">设置自动更新的间隔时间</string>
+    <string name="about_privacy_answer">太阳能预测仅使用\"互联网\"权限获取天气数据。不包含任何跟踪机制或广告。</string>
+    <string name="about_where_from">天气信息来自哪里？</string>
+    <string name="about_where_from_answer">天气信息获取自</string>
+    <string name="long_press_text">长按并拖动可排序。</string>
+    <string name="swipe_to_delete">滑动删除</string>
+    <string name="settings_title_display_options">显示选项</string>
+    <string name="infoProvider">天气信息获取自Open-Meteo.com</string>
+    <string name="monday">星期一</string>
+    <string name="tuesday">星期二</string>
+    <string name="wednesday">星期三</string>
+    <string name="thursday">星期四</string>
+    <string name="friday">星期五</string>
+    <string name="saturday">星期六</string>
+    <string name="sunday">星期日</string>
+    <string name="chart">图表</string>
+    <string name="units_kWh">千瓦时</string>
+    <string name="dialog_edit_change_button">保存</string>
+    <string name="edit_location_hint_name">名称</string>
+    <string name="settings_search">搜索</string>
+    <string name="settings_darkmode">Android 10+深色模式</string>
+    <string name="settings_time24h">24小时制</string>
+    <string name="summary_time24h">覆盖系统设置</string>
+    <string name="dialog_OK_button">确定</string>
+    <string name="dialog_NO_button">否</string>
+    <string name="dialog_Later_button">稍后再说</string>
+    <string name="dialog_StarOnGitHub">喜欢这个应用吗？请在GitHub上给个星标，并通过PayPal请开发者喝杯咖啡。</string>
+    <string name="slide3_heading">Open-Meteo</string>
+    <string name="settings_forecast_days">预报天数</string>
+    <string name="edit_location_hint_latitude">纬度[°]</string>
+    <string name="edit_location_hint_longitude">经度[°]</string>
+    <string name="edit_location_hint_azimuth">方位角[°]</string>
+    <string name="edit_location_hint_tilt">倾斜角[°]</string>
+    <string name="edit_location_hint_cells_max_power">电池峰值功率[W]</string>
+    <string name="edit_location_hint_cells_efficiency">电池效率[%]</string>
+    <string name="edit_location_hint_cells_area">电池面积[m²]</string>
+    <string name="edit_location_hint_diffuse_efficiency">漫射辐射效率[%]</string>
+    <string name="edit_location_hint_inverter_power_limit">逆变器功率[W]</string>
+    <string name="edit_location_hint_inverter_efficiency">逆变器效率[%]</string>
+    <string name="units_Wh">瓦时</string>
+    <string name="edit_location_title">编辑位置</string>
+    <string name="edit_location_shading_azimuth_heading">方位角范围[°]</string>
+    <string name="edit_location_shading_solar_elevation_heading">最小太阳高度角[°]</string>
+    <string name="edit_location_shading_opacity_heading">此高度以下的遮阳度[%]</string>
+    <string name="edit_location_shading_heading">遮阳</string>
+    <string name="activity_help">使用说明</string>
+    <string name="action_sun_position">当前太阳位置</string>
+    <string name="action_sun_elevation">高度角[°]</string>
+    <string name="edit_location_hint_cells_temp_coeff">温度系数[%/K]</string>
+    <string name="activity_backuprestore">备份/恢复</string>
+    <string name="backup_database">备份数据库</string>
+    <string name="restore_database">恢复数据库</string>
+    <string name="permission_required">需要权限</string>
+    <string name="permission_message">%s需要访问外部存储。请授予权限后重试。</string>
+    <string name="toast_delete">请删除文件后重试</string>
+    <string name="settings_summarize">显示总和</string>
+    <string name="summary_summarize">汇总相同经纬度模块的值。</string>
+    <string name="dialog_add_clone_button">克隆</string>
+    <string name="itemRemoved">已删除：%s</string>
+    <string name="undo">撤销</string>
+    <string name="edit_location_hint_albedo">反照率[0..1]</string>
+    <string name="settings_server_urls">服务器URL</string>
+    <string name="settings_server_summary">仅在您想托管自己的服务器时更改</string>
+    <string name="edit_location_hint_central_inverter">中央逆变器</string>
+    <string name="card_today_heading">今日</string>
+    <string name="card_today_produced">已发电：</string>
+    <string name="card_today_remaining">剩余：</string>
+</resources>

app/src/main/res/values/colors.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorStatusBar">#024265</color>
     <color name="colorPrimary">#024265</color>
     <color name="colorPrimaryDark">#024265</color>
     <color name="colorAccent">#0274b2</color>

app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">solXpect</string>
+    <string name="app_name" translatable="false">solXpect</string>
     <string name="activity_about">About</string>
     <string name="activity_settings">Settings</string>
     <string name="activity_weather">Forecast</string>
@@ -114,5 +114,7 @@
     <string name="settings_server_urls">Server URLs</string>
     <string name="settings_server_summary">Only change if you want to host your own servers</string>
     <string name="edit_location_hint_central_inverter">Central Inverter</string>
-
+    <string name="card_today_heading">Today</string>
+    <string name="card_today_produced">Produced:</string>
+    <string name="card_today_remaining">Remaining:</string>
 </resources>

app/src/main/res/values/styles.xml

@@ -10,7 +10,6 @@
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
     </style>
 
     <style name="SplashTheme" parent="@android:style/Theme.NoTitleBar.Fullscreen">

build.gradle

@@ -9,7 +9,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.1'
+        classpath 'com.android.tools.build:gradle:8.2.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

fastlane/metadata/android/en-US/changelogs/26.txt

@@ -0,0 +1,2 @@
+Show produced / remaining information for current day
+Bugfix

fastlane/metadata/android/en-US/changelogs/27.txt

@@ -0,0 +1 @@
+Update for Android 15 (SDK 35)

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #Mon Oct 03 08:25:14 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
-distributionSha256Sum=f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd
+distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
 zipStoreBase=GRADLE_USER_HOME