V2.7

SDK 35
Android 15

README.md

@@ -1,18 +1,38 @@
-<pre>Send a coffee to woheller69@t-online.de 
+<pre>Send a coffee to 
-<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>
+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/) |
+| **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** |
+| [<img src="https://github.com/woheller69/audio-analyzer-for-android/blob/master/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.audio_analyzer_for_android/) |[<img src="https://github.com/woheller69/lavatories/blob/master/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.lavatories/) | [<img src="https://github.com/woheller69/TimeLapseCamera/blob/master/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.TimeLapseCam/) |
+| **Arity** | **Cirrus** | **solXpect** |
+| [<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** | **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
 
-solXpect forecasts the output of your solar power plant
+solXpect is an app that forecasts the output of your solar power plant by using direct and diffuse radiation data from Open-Meteo.com, calculating the position of the sun, and projecting the radiation on your solar panel. 
-
+It shows the estimated energy production for the next 16 days, with hourly values calculated for the preceding hour. As an example, if there are 150 Wh shown at 11:00 this means you can expect 150 Wh between 10:00 and 11:00 from your photovoltaic system.
-This app takes direct and diffuse radiation data from Open-Meteo.com, calculates the position
+The values starting with Σ show the cumulated energy since midnight of the first day.
-of the sun and projects the radiation on your solar panel.
+To use solXpect, you simply enter your latitude and longitude coordinates, as well as the azimuth and tilt of your solar panel. 
-It shows the estimated energy production for the next hours and up to 16 days.
+You also enter information about the peak power, efficiency, temperature coefficient, and area of your solar panel, as well as the maximum power and efficiency of your inverter.
-The hourly values are calculated for the preceding hour. So if there are 150 Wh shown at 11:00 this means you can expect 150 Wh between 10:00 and 11:00.
+Additionally, solXpect allows you to define shading on your solar panels by specifying the minimum elevation of the sun necessary for the sun to hit the solar panels, as well as the percentage of shading for elevations below this value.
-
+If you have multiple solar panels with the same latitude and longitude but pointing in different directions, you can define them as separate locations and use the 'show sum' feature to summarize their output.
-If you have several modules pointing in different directions you can define them as separate locations and switch on 'show sum' in preferences. Then
+Overall, solXpect is a powerful tool for optimizing the use of your own energy and reduce your energy costs. 
-all locations with same latitude/longitude are summarized. In this case you should define your location names as 'myPV | part1', 'myPV | part2', etc.
-In 'show sum' mode the location is then shown as 'myPV' and '|' is taken as delimiter in this case.
 
 <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/01.png" width="150"/> <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/02.png" width="150"/> <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/03.png" width="150"/> <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/04.png" width="150"/> 
 
@@ -20,47 +40,59 @@ In 'show sum' mode the location is then shown as 'myPV' and '|' is taken as deli
 
 ## Parameters
 
+#### Name
+Define a name for the location.
+If you have several modules pointing in different directions at the same location you can activate "showSum" mode in settings.
+In this case you should define your location names as 'myPV | part1', 'myPV | part2', etc. In 'show sum' mode the location is then shown as 'myPV' and '|' is taken as delimiter.
+
 #### Latitude [°] 
-Latitude specifies the north–south position of your solar power plant. It ranges from –90° at the south pole to 90° at the north pole.
+Enter the north-south position of your solar power plant, ranging from -90° at the south pole to 90° at the north pole.
 
 #### Longitude [°]
-Longitude specifies the east–west position of your solar power plant. The prime meridian defines 0° longitude. Positive longitudes are east of the prime meridian, negative ones are west.
+Enter the east-west position of your solar power plant, with 0° defined as the prime meridian. Positive longitudes are east of the prime meridian, negative ones are west.
 
 #### Azimuth [°]
-Azimuth is the horizontal direction of your solar power plant. 0° equals North, 90° equals East, 180° equals South, 270° equals West.
+Specify the horizontal direction of your solar power plant, with 0° corresponding to North, 90° to East, 180° to South, and 270° to West.
 
 #### Tilt [°]
-Tilt is the vertical direction of your solar power plant. 0° means it points up towards the the sky, 90° means it has a vertical orientation and points towards the horizon.
+Specify the vertical direction of your solar power plant, with 0° pointing upwards towards the sky and 90° being a vertical orientation pointing towards the horizon.
 
 #### Cells peak power [W]
-Peak power your solar cells can deliver.
+Enter the maximum power your solar cells (total of all cells) can deliver. At the moment this value is only used if a value of 0 is specified for cells efficiency or cell area.
+In this case it is assumed that the cells peak power is given at an irradiance of 1000W/sqm.
 
 #### Cells efficiency  [%]
-Portion of energy in the form of sunlight that can be converted into electricity by the solar cell.
+Specify the portion of energy in the form of sunlight that can be converted into electricity by the solar cell.
 
 #### Temperature coefficient  [%/K]
-Dependence of the cell power on temperature (usually in the range of -0.4%/K).
+Enter the dependence of the cell power on temperature, usually in the range of -0.4%/K. Cell temperature is estimated from ambient temperature and total irradiance.
-Cell temperature is estimated from ambient temperature and total irradiance.
 
 #### Cell area [m<sup>2</sup>]
-Size of your solar panel.
+Enter the size of your solar panels (total of all cells).
 
 #### Diffuse radiation efficiency  [%]
-Efficiency of your solar power plant for diffuse radiation. When pointing up it should be around 100%, when pointing to the horizon it may be around 50%. 
+Specify the efficiency of your solar power plant for diffuse radiation. When pointing up, it should be around 100%, but when pointing towards the horizon, it may be 50% or less, depending on the environment.
-Also depends on reflections etc.
+You probably need to optimize this parameter.
+
+#### Albedo  [0..1]
+Specify the average albedo for your environment to take reflections into account. The value ranges from 0 (all radiation is absorbed) to 1 (all radiation is reflected).
+Examples: Fresh snow: 0.8, green gras: 0.25, asphalt: 0.1
+You probably need to optimize this parameter.
+
+#### Inverter efficiency  [%]
+Enter the efficiency of your inverter.
 
 #### Inverter power  [W]
-Maximum power of your inverter. If it is lower than the maximum power of your panels the output power of your system will be limited by this parameter.
+Specify the maximum power of your inverter. If it is lower than the maximum power of your panels, the output power of your system will be limited by this parameter.
 
-#### Inverter efficiency  [%] 
+#### Central inverter
-Efficiency of your inverter.
+Select this checkbox to apply the inverter limit to the entire system. When in 'show sum' mode, the power limits of all inverters with this checkbox enabled will be aggregated and used as the system-wide power limit.
 
 #### Shading
 In this section you can define the shading on your solar panels.
 For each azimuth angle range, you can specify the minimum elevation of the sun that is necessary for the sun to hit the solar panels.
 For elevations below this value you can set the percentage of shading. For example, a building will reduce radiation by 100%, a tree maybe only by 60%.
-You can use the button with sun icon (main window) to get information about the current azimuth and elevation of the sun to find out at what elevation the sun gets above 
+You can use the sun icon button in the main window to get information about the current azimuth and elevation of the sun to determine at what elevation the sun gets above buildings or trees.
-buildings or trees.
 
 ## License
 
@@ -79,6 +111,7 @@ The app uses:
 - Map data from OpenStreetMap, licensed under the Open Data Commons Open Database License (ODbL) by the OpenStreetMap Foundation (OSMF) (https://www.openstreetmap.org/copyright)
 - Solar positioning library (https://github.com/klausbrunner/solarpositioning) which is licensed under <a href='https://github.com/klausbrunner/solarpositioning/blob/master/LICENSE.txt'>MIT License</a>
 - Zip4j (https://github.com/srikanth-lingala/zip4j) which is licensed under Apache License Version 2.0
+- CompassView (https://github.com/kix2902/CompassView) which is published under Apache License 2.0
 
 ## Contributing
 
@@ -88,15 +121,3 @@ If you find a bug, please open an issue in the Github repository, assuming one d
   - Make your description as precise as possible.
 
 If you know the solution to a bug please report it in the corresponding issue and if possible modify the code and create a pull request.
-
-## Try my other apps
-
-| **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/) |
-| **Level** | **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** |
-| [<img src="https://github.com/woheller69/audio-analyzer-for-android/blob/master/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.audio_analyzer_for_android/) |[<img src="https://github.com/woheller69/lavatories/blob/master/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.lavatories/) | [<img src="https://github.com/woheller69/TimeLapseCamera/blob/master/fastlane/metadata/android/en-US/images/icon.png" width="50">](https://f-droid.org/packages/org.woheller69.TimeLapseCam/) |
-| **Arity** | **omWeather** | **solXpect** |
-| [<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/) |

app/build.gradle

@@ -2,20 +2,31 @@ apply plugin: 'com.android.application'
 
 android {
 
-    compileSdkVersion 32
+    lintOptions {
-
+        disable 'MissingTranslation'
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    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
-        targetSdkVersion 31
+        targetSdk 35
-        versionCode 14
+        versionCode 27
-        versionName "1.4"
+        versionName "2.7"
 
         buildConfigField "String", "BASE_URL", "\"https://api.open-meteo.com/v1/\""
+        buildConfigField "String", "TILES_URL","\"https://tile.openstreetmap.org/\""
+        buildConfigField "String", "GEOCODING_URL","\"https://geocoding-api.open-meteo.com/\""
         buildConfigField "String", "GITHUB_URL","\"https://github.com/woheller69/solxpect/\""
     }
 
@@ -31,14 +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.preference:preference:1.2.1'
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
-    implementation 'com.google.android.material:material:1.6.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 'com.github.woheller69:CompassView:948f3db329'
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" //needed due to duplicate class error
+    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"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="org.woheller69.weather">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -11,7 +10,6 @@
         android:allowBackup="true"
         android:requestLegacyExternalStorage="true"
         android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:fontFamily = "sans-serif-light"

app/src/main/assets/help/help-de.html

@@ -2,58 +2,68 @@
 <body>
 <h2>Übersicht</h2>
 
-Diese App nimmt direkte und diffuse Strahlungsdaten von Open-Meteo.com, berechnet die Position
+Die Android-App solXpect prognostiziert den Ertrag Ihrer Photovoltaik-Anlage. Sie lädt direkte und diffuse Strahlungsdaten von Open-Meteo.com, berechnet die Position der Sonne und projiziert die Strahlung auf Ihr Solarpanel.
-der Sonne und projiziert die Strahlung auf Ihr Solarpanel.
+Anschließend wird die geschätzte Energieproduktion für die nächsten Stunden (bis zu 16 Tage) dargestellt, wobei stündliche Werte für die vorangegangene Stunde gelten. Wenn zum Beispiel um 11:00 Uhr 150 Wh angezeigt werden, bedeutet dies, dass Sie zwischen 10:00 und 11:00 Uhr 150 Wh erwarten können.
-Es zeigt die geschätzte Energieproduktion für die nächsten Stunden und bis zu 16 Tage an.
+Die mit &#8721 beginnenden Werte zeigen die kumulierte Energie seit Mitternacht des ersten Tages.
-Die Stundenwerte werden für die vorangegangene Stunde berechnet.
+Um solXpect zu verwenden, geben Sie einfach Ihre Breiten- und Längenkoordinaten sowie den Azimut und die Neigung Ihres Solarpanels ein.
-Wenn also um 11:00 Uhr 150 Wh angezeigt werden, bedeutet dies, dass Sie zwischen 10:00 und 11:00 Uhr mit 150 Wh rechnen können.
+Sie geben auch Informationen über die Spitzenleistung, Effizienz, Temperaturkoeffizienten und Fläche Ihres Solarpanels sowie die maximale Leistung und Effizienz Ihres Wechselrichters an.
-
+solXpect ermöglicht es Ihnen auch, Verschattungen auf Ihren Solarzellen zu definieren, indem Sie die minimale Sonnenhöhe angeben, die erforderlich ist, damit die Sonne auf die Solarzellen trifft, sowie den prozentualen Schatten für Höhen unter diesem Wert.
-<h3>Mehrere Module am gleichen Ort</h3>
-Wenn Sie mehrere Module haben, die in verschiedene Richtungen zeigen, können Sie sie als separate Standorte definieren und in den Einstellungen 'Summe anzeigen' einschalten.
-Dann werden alle Orte mit gleichem Breiten-/Längengrad zusammengefasst. In diesem Fall sollten Sie Ihre Standortnamen als 'myPV | Teil1', 'meinPV | Teil2' usw. definieren.
-Im Modus 'Summe anzeigen' wird der Standort dann als 'myPV' angezeigt und '|' wird in diesem Fall als Trennzeichen verwendet.
 
 <h2>Parameter</h2>
 
+<h3>Name</h3>
+Definieren Sie einen Namen für den Standort.
+Wenn Sie mehrere Solarpaneele mit denselben Breiten- und Längenkoordinaten, aber in unterschiedliche Richtungen ausgerichtet haben, können Sie sie als separate Standorte definieren und die Funktion "Summe anzeigen" verwenden, um ihre Leistung zusammenzufassen.
+In diesem Fall sollten Sie Ihre Standortnamen als "myPV | part1", "myPV | part2" usw. definieren. Im "Summe anzeigen"-Modus wird der Standort dann als "myPV" angezeigt und "|" wird in diesem Fall als Trennzeichen verwendet.
+
 <h3>Breitengrad [°]</h3>
-Der Breitengrad gibt die Nord-Süd-Position Ihres Solarkraftwerks an. Er reicht von –90° am Südpol bis 90° am Nordpol.
+Geben Sie die Nord-Süd-Position Ihrer Solaranlage an, die von -90° am Südpol bis 90° am Nordpol reicht.
 
 <h3>Längengrad [°]</h3>
-Der Längengrad gibt die Ost-West-Position Ihres Solarkraftwerks an. Der Nullmeridian definiert 0° Länge. Positive Längen liegen östlich des Nullmeridians, negative westlich.
+Geben Sie die Ost-West-Position Ihrer Solaranlage an, wobei 0° als Nullmeridian definiert ist. Positive Längengrade liegen östlich des Nullmeridians, negative westlich.
 
 <h3>Azimut [°]</h3>
-Azimut ist die horizontale Richtung Ihres Solarkraftwerks. 0° entspricht Norden, 90° entspricht Osten, 180° entspricht Süden, 270° entspricht Westen.
+Legen Sie die horizontale Ausrichtung Ihrer Solaranlage fest, wobei 0° Norden entspricht, 90° Osten, 180° Süden und 270° Westen.
 
 <h3>Neigung [°]</h3>
-Neigung ist die vertikale Richtung Ihres Solarkraftwerks. 0° bedeutet, dass es zum Himmel zeigt, 90° bedeutet, dass es vertikal ausgerichtet ist und zum Horizont zeigt.
+Legen Sie die vertikale Ausrichtung Ihrer Solaranlage fest, wobei 0° nach oben zum Himmel und 90° zum Horizont zeigt.
 
 <h3>Peakleistung der Zellen [W]</h3>
-Maximale Leistung, die Ihre Solarzellen liefern können.
+Geben Sie die maximale Leistung an, die Ihre Solarzellen liefern können (Gesamtleistung aller Zellen). Derzeit wird dieser Wert nur verwendet, wenn für die Zelleneffizienz oder die Zellfläche ein Wert von 0 angegeben ist.
+In diesem Fall wird angenommen, dass die Nennleistung der Zellen bei einer Bestrahlungsstärke von 1000 W/m² vorliegt.
 
 <h3>Wirkungsgrad der Zellen [%]</h3>
-Energieanteil in Form von Sonnenlicht, der von der Solarzelle in Strom umgewandelt werden kann.
+Geben Sie den Anteil der Energie in Form von Sonnenlicht an, der von der Solarzelle in Strom umgewandelt werden kann.
 
 <h3>Temperaturkoeffizient  [%/K]</h3>
-Abhängigkeit der Leistung der Solarmodule von der Temperatur (normalerweise im Bereich von -0.4%/K).
+Geben Sie die Abhängigkeit der Zellleistung von der Temperatur an, normalerweise im Bereich von -0,4%/K. Die Zelltemperatur wird aus der Umgebungstemperatur und der Gesamtstrahlung geschätzt.
 
 <h3>Fläche der Zellen [m<sup>2</sup>]</h3>
-Fläche Ihres Solarpanels.
+Geben Sie die Größe Ihrer Solarmodule (Gesamtfläche aller Zellen) an.
 
 <h3>Effizienz diffuse Strahlung [%]</h3>
-Wirkungsgrad Ihres Solarkraftwerks bei diffuser Strahlung. Bei der Ausrichtung nach oben sollte er etwa 100 % betragen, bei der Ausrichtung zum Horizont etwa 50 %.
+Geben Sie die Effizienz Ihrer Solaranlage für diffuse Strahlung an. Wenn sie nach oben gerichtet ist, sollte sie etwa 100% betragen, aber wenn sie in Richtung Horizont gerichtet ist, beträgt Sie 50% oder weniger - abhängig von der Umgebung.
-Dies ist auch abhängig von Reflexionen etc.
+Sie müssen diesen Parameter wahrscheinlich optimieren.
 
-<h3>Wechselrichterleistung [W]</h3>
+<h3>Albedo  [0..1]</h3>
-Maximale Leistung Ihres Wechselrichters. Wenn sie niedriger als die maximale Leistung Ihrer Panels ist, wird die Ausgangsleistung Ihres Systems durch diesen Parameter begrenzt.
+Geben Sie die durchschnittliche Albedo für Ihre Umgebung an, um Reflexionen zu berücksichtigen. Der Wertebereich geht von 0 (alle Strahlung wird absorbiert) bis 1 (alle Strahlung wird reflektiert).
+Beispiele: Frischer Schnee: 0.8, grünes Gras: 0.25, Asphalt: 0.1
+Sie müssen diesen Parameter wahrscheinlich optimieren.
 
 <h3>Wechselrichtereffizienz [%]</h3>
-Wirkungsgrad Ihres Wechselrichters.
+Geben Sie den Wirkungsgrad Ihres Wechselrichters ein.
+
+<h3>Wechselrichterleistung [W]</h3>
+Geben Sie die maximale Leistung Ihres Wechselrichters an. Wenn diese geringer ist als die maximale Leistung Ihrer Module, wird die Ausgangsleistung Ihres Systems durch diesen Parameter begrenzt.
+
+<h3>Zentralwechselrichter</h3>
+Wählen Sie dieses Kontrollkästchen, um die Wechselrichter-Begrenzung auf das gesamte System anzuwenden. Im "Summe anzeigen"-Modus, werden die Leistungsbegrenzungen aller Wechselrichter mit gesetztem Kontrollkästchen aggregiert und als systemweite Leistungsbegrenzung verwendet.
 
 <h3>Abschattung</h3>
-In diesem Abschnitt können Sie die Abschattung Ihrer Solarmodule definieren.
+In diesem Abschnitt können Sie die Beschattung Ihrer Solarmodule definieren.
-Für jeden Azimutwinkelbereich können Sie die minimale Elevation der Sonne angeben, die erforderlich ist, damit die Sonne auf die Solarmodule trifft.
+Für jeden Azimutwinkelbereich können Sie die minimale Sonnenhöhe angeben, die erforderlich ist, damit die Sonne auf die Solarmodule trifft.
-Für Elevationen unter diesem Wert können Sie den Prozentsatz der Abschattung festlegen. Beispielsweise reduziert ein Gebäude die Strahlung um 100 %, ein Baum vielleicht nur um 60 %.
+Für Höhen unter diesem Wert können Sie den Prozentsatz der Beschattung festlegen. Zum Beispiel reduziert ein Gebäude die Strahlung um 100 %, ein Baum vielleicht nur um 60 %.
-Über die Schaltfläche mit dem Sonnensymbol (Hauptfenster) erhalten Sie Informationen über den aktuellen Azimut und die aktuelle Elevation der Sonne. Damit können Sie herauszufinden, ab welcher Elevation die Sonne oberhalb der Gebäude oder Bäume steht.
+Sie können die Schaltfläche mit dem Sonnen-Symbol im Hauptfenster verwenden, um Informationen über den aktuellen Azimut und die Höhe der Sonne zu erhalten und zu bestimmen, auf welcher Höhe die Sonne über Gebäuden oder Bäumen steht.
 
 </body>
 </html>

app/src/main/assets/help/help-en.html

@@ -2,59 +2,68 @@
 <body>
 <h2>Overview</h2>
 
-This app takes direct and diffuse radiation data from Open-Meteo.com, calculates the position
+This app forecasts the output of your solar power plant by using direct and diffuse radiation data from Open-Meteo.com, calculating the position of the sun, and projecting the radiation on your solar panel.
-of the sun and projects the radiation on your solar panel.
+It shows the estimated energy production for the next 16 days, with hourly values calculated for the preceding hour. As an example, if there are 150 Wh shown at 11:00 this means you can expect 150 Wh between 10:00 and 11:00.
-It shows the estimated energy production for the next hours and up to 16 days.
+The values starting with &#8721 show the cumulated energy since midnight of the first day.
-The hourly values are calculated for the preceding hour.
+To use solXpect, you simply enter your latitude and longitude coordinates, as well as the azimuth and tilt of your solar panel.
-So if there are 150 Wh shown at 11:00 this means you can expect 150 Wh between 10:00 and 11:00.
+You also enter information about the peak power, efficiency, temperature coefficient, and area of your solar panel, as well as the maximum power and efficiency of your inverter.
-
+Additionally, solXpect allows you to define shading on your solar panels by specifying the minimum elevation of the sun necessary for the sun to hit the solar panels, as well as the percentage of shading for elevations below this value.
-<h3>Several modules at same location</h3>
-If you have several modules pointing in different directions you can define them as separate locations and switch on 'show sum' in preferences. Then
-all locations with same latitude/longitude are summarized. In this case you should define your location names as 'myPV | part1', 'myPV | part2', etc.
-In 'show sum' mode the location is then shown as 'myPV' and '|' is taken as delimiter in this case.
 
 <h2>Parameters</h2>
 
+<h3>Name</h3>
+Define a name for the location.
+If you have multiple solar panels with the same latitude and longitude but pointing in different directions, you can define them as separate locations and use the 'show sum' feature to summarize their output.
+In this case you should define your location names as 'myPV | part1', 'myPV | part2', etc. In 'show sum' mode the location is then shown as 'myPV' and '|' is taken as delimiter in this case.
+
 <h3>Latitude [°]</h3>
-Latitude specifies the north–south position of your solar power plant. It ranges from –90° at the south pole to 90° at the north pole.
+Enter the north-south position of your solar power plant, ranging from -90° at the south pole to 90° at the north pole.
 
 <h3>Longitude [°]</h3>
-Longitude specifies the east–west position of your solar power plant. The prime meridian defines 0° longitude. Positive longitudes are east of the prime meridian, negative ones are west.
+Enter the east-west position of your solar power plant, with 0° defined as the prime meridian. Positive longitudes are east of the prime meridian, negative ones are west.
 
 <h3>Azimuth [°]</h3>
-Azimuth is the horizontal direction of your solar power plant. 0° equals North, 90° equals East, 180° equals South, 270° equals West.
+Specify the horizontal direction of your solar power plant, with 0° corresponding to North, 90° to East, 180° to South, and 270° to West.
 
 <h3>Tilt [°]</h3>
-Tilt is the vertical direction of your solar power plant. 0° means it points up towards the the sky, 90° means it has a vertical orientation and points towards the horizon.
+Specify the vertical direction of your solar power plant, with 0° pointing upwards towards the sky and 90° being a vertical orientation pointing towards the horizon.
 
 <h3>Cells peak power [W]</h3>
-Peak power your solar cells can deliver.
+Enter the maximum power your solar cells (total of all cells) can deliver. At the moment this value is only used if a value of 0 is specified for cells efficiency or cell area.
+In this case it is assumed that the cells peak power is given at an irradiance of 1000W/sqm.
 
 <h3>Cells efficiency  [%]</h3>
-Portion of energy in the form of sunlight that can be converted into electricity by the solar cell.
+Specify the portion of energy in the form of sunlight that can be converted into electricity by the solar cell.
 
 <h3>Temperature coefficient  [%/K]</h3>
-Dependence of the cell power on temperature (usually in the range of -0.4%/K).
+Enter the dependence of the cell power on temperature, usually in the range of -0.4%/K. Cell temperature is estimated from ambient temperature and total irradiance.
 
 <h3>Cell area [m<sup>2</sup>]</h3>
-Size of your solar panel.
+Enter the size of your solar panels (total of all cells).
 
 <h3>Diffuse radiation efficiency  [%]</h3>
-Efficiency of your solar power plant for diffuse radiation. When pointing up it should be around 100%, when pointing to the horizon it may be around 50%.
+Specify the efficiency of your solar power plant for diffuse radiation. When pointing up, it should be around 100%, but when pointing towards the horizon, it may be 50% or less, depending on the environment.
-Also depends on reflections etc.
+You probably need to optimize this parameter.
 
-<h3>Inverter power  [W]</h3>
+<h3>Albedo  [0..1]</h3>
-Maximum power of your inverter. If it is lower than the maximum power of your panels the output power of your system will be limited by this parameter.
+Specify the average albedo for your environment to take reflections into account. The value ranges from 0 (all radiation is absorbed) to 1 (all radiation is reflected).
+Examples: Fresh snow: 0.8, green gras: 0.25, asphalt: 0.1
+You probably need to optimize this parameter.
 
 <h3>Inverter efficiency  [%]</h3>
-Efficiency of your inverter.
+Enter the efficiency of your inverter.
+
+<h3>Inverter power  [W]</h3>
+Specify the maximum power of your inverter. If it is lower than the maximum power of your panels, the output power of your system will be limited by this parameter.
+
+<h3>Central Inverter</h3>
+Select this checkbox to apply the inverter limit to the entire system. When in 'show sum' mode, the power limits of all inverters with this checkbox enabled will be aggregated and used as the system-wide power limit.
 
 <h3>Shading</h3>
 In this section you can define the shading on your solar panels.
 For each azimuth angle range, you can specify the minimum elevation of the sun that is necessary for the sun to hit the solar panels.
 For elevations below this value you can set the percentage of shading. For example, a building will reduce radiation by 100%, a tree maybe only by 60%.
-You can use the button with sun icon (main window) to get information about the current azimuth and elevation of the sun to find out at what elevation the sun gets above
+You can use the sun icon button in the main window to get information about the current azimuth and elevation of the sun to determine at what elevation the sun gets above buildings or trees.
-buildings or trees.
 
 </body>
 </html>

app/src/main/assets/help/help-it.html

@@ -0,0 +1,66 @@
+<html>
+<body>
+<h2>Introduzione</h2>
+
+Questa app fa previsioni sulla produzione del tuo impianto fotovoltaico usando i dati di radiazione luminosa diretta e indiretta prodotti da Open-Meteo.com, calcolando la posizione del sole e proiettando la radiazione sul tuo pannello solare.
+Viene mostrata la stima di produzione del tuo impianto fotovoltaico per i prossimi 16 giorni, con valori orari calcolati per l’ora precedente. Ad esempio: se alle 11:00 viene mostrato il dato 150 Wh significa che devi aspettarti 150 Wh tra le 10:00 e le 11:00.
+I valori con il simbolo &#8721 si riferiscono all’energia accumulata dalla mezzanotte del primo giorno.
+Per usare solXpect devi conoscere alcuni parametri del tuo impianto: la latitudine, la longitudine, l’azimuth (orientamento misurato in gradi rispetto alla direzione del nord), l’inclinazione, la potenza di picco e la potenza massima dell’inverter.
+Per migliorare la stima puoi anche personalizzare altri dati ad esempio l’efficienza di conversione dell’inverter, l’efficienza dei pannelli, il coefficiente di temperatura e l’area dell’impianto.
+Infine solXpect gestisce anche gli eventuali ombreggiamenti del tuo impianto, infatti è possibile specificare l’elevazione minima del sole necessaria per illuminare i pannelli e la percentuale di ombreggiamento per le elevazioni minori di questo valore.
+
+<h2>Parametri</h2>
+
+<h3>Nome</h3>
+Scegli un nome per l’impianto.
+Se hai pannelli dello stesso impianto con direzione, inclinazione o ombreggiamento diversi puoi inserirli come impianti diversi e poi usare la funzione 'Mostra totale' per mostrare la produzione complessiva.
+In questo caso devi scegliere i nomi degli impianti come "mioFV | sezione 1", "mioFV | sezione 2", ... 'Mostra totale' utilizzerà "mioFV" come nome dell’impianto in quanto il carattere '|' viene considerato come separatore tra le diverse parti.
+
+<h3>Latitudine [°]</h3>
+Indica la coordinata nord-sud del tuo impianto, può variare tra i valori -90° (polo sud) e 90° (polo nord).
+
+<h3>Longitudine [°]</h3>
+Indica La coordinata est-ovest del tuo impianto, 0° è il meridiano di Greenwich, valori positivi indicato posizioni a est di tale meridiano, negativi l’ovest.
+
+<h3>Azimuth [°]</h3>
+Indica come è orientato sul piano orizzontale il tuo impianto, 0° indicano il Nord, 90° l’Est, 180° il Sud e 270° l’Ovest.
+
+<h3>Inclinazione [°]</h3>
+Indica l’inclinazione sul piano verticale del tuo impianto, se l’impianto punta direttamente il cielo sarà 0°, invece sarà 90° per pannelli verticali.
+
+<h3>Potenza di picco [W]</h3>
+Indica la massima potenza del tuo impianto, spesso nel progetto dell’impianto è indicata con l’unità di misura Wp. Attualmente questo valore viene utilizzato solo se è il valore dell’efficienza delle celle o dell’area è 0.
+In questo caso si suppone che che le il valore di picco delle celle si raggiunga con un’irradianza di 1000W/mq.
+
+<h3>Efficienza dei pannelli [%]</h3>
+Indica la porzione di energia luminosa che viene convertita in elettricità dai pannelli.
+
+<h3>Coefficiente di temperatura [%/K]</h3>
+Indica la dipendenza della potenza dei pannelli dalla temperatura, tipicamente è un valore attorno a -0.4%/K. La temperatura dei pannelli viene stimata in base alla temperatura ambientale e all’irradianza totale.
+
+<h3>Area dei pannelli [m<sup>2</sup>]</h3>
+Indica l’area totale del tuo impianto.
+
+<h3>Efficienza della radiazione diffusa [%]</h3>
+Indica la capacità di catturare la radiazione diffusa. Per impianti poco inclinati si avvicina al 100%, per impianti molto inclinati potrebbe essere del 50% o meno, in base all’ambiente circostante.
+
+<h3>Albedo [0..1]</h3>
+Indica la capacità dell’ambiente circostante il tuo impianto di riflettere la luce solare. I valori variano da 0 (tutta la luce viene assorbita), a 1 (tutta la radiazione viene riflessa).
+Esempi: neve fresca: 0,8 ; erba verde: 0,25 ; asfalto: 0,1 .
+
+<h3>Efficienza dell’inverter [%]</h3>
+Indica l’efficienza di conversione dell’inverter.
+
+<h3>Potenza dell’inverter [W]</h3>
+Indica la potenza massima gestita dall’inverter. Se è minore della potenza massima dei pannelli, la produzione dell’impianto verrà limitata da questo parametro.
+
+<h3>Invertitore centrale</h3>
+Seleziona questa casella di controllo per applicare il limite dell'invertitore all'intero sistema. Quando si è in modalità "mostra totale", i limiti di potenza di tutti gli invertitori con questa casella di controllo abilitata verranno aggregati e utilizzati come limite di potenza dell'intero sistema.
+
+<h3>Ombreggiamenti</h3>
+In questa sezione puoi definire gli ombreggiamenti dei pannelli.
+Per ogni intervallo di azimuth è possibile specificare a quale altezza minima il sole illumina i pannelli.
+Per altezze minori di questo valore è possibile impostare la percentuale di ombreggiamento. Ad esempio un edificio riduce la radiazione solare del 100%, un albero circa del 60%.
+Per impostare questi valori è possibile utilizzare i dati correnti di azimuth e altezza del sole che vengono mostrati premendo l’icona con il simbolo del sole che si trova nella schermata principale.
+</body>
+</html>

app/src/main/assets/help/help-tr.html

@@ -0,0 +1,68 @@
+<html>
+<body>
+<h2>Genel Bakış</h2>
+
+Bu uygulama, Open-Meteo.com'dan doğrudan ve dağınık radyasyon verilerini kullanarak, güneşin konumunu hesaplayarak ve radyasyonu güneş panelinize yansıtarak güneş enerjisi santralinizin çıktısını tahmin eder.
+Bir önceki saat için hesaplanan saatlik değerlerle birlikte önümüzdeki 16 gün için tahmini enerji üretimini gösterir. Örnek olarak, 11:00'de 150 Wh gösteriliyorsa bu, 10:00 ile 11:00 arasında 150 Wh bekleyebileceğiniz anlamına gelir.
+&#8721 ile başlayan değerler ilk günün gece yarısından itibaren biriken enerjiyi göstermektedir.
+solXpect'i kullanmak için enlem ve boylam koordinatlarınızın yanı sıra güneş panelinizin azimut ve eğimini girmeniz yeterlidir.
+Ayrıca güneş panelinizin tepe gücü, verimliliği, sıcaklık katsayısı ve alanı ile invertörünüzün maksimum gücü ve verimliliği hakkındaki bilgileri de girebilirsiniz.
+Öte yandan solXpect, güneşin güneş panellerine vurması için gereken minimum güneş yüksekliğini ve bu değerin altındaki yükseklikler için gölgeleme yüzdesini belirleyerek güneş panellerinizdeki gölgelemeyi tanımlamanıza olanak tanır.
+
+<h2>Parametreler</h2>
+
+<h3>İsim</h3>
+Konum için bir ad tanımlayın.
+Aynı enlem ve boylama sahip fakat farklı yönleri işaret eden birden fazla güneş paneliniz varsa, bunları ayrı konumlar olarak tanımlayabilir ve çıktılarını özetlemek için 'Toplamı göster' özelliğini kullanabilirsiniz.
+Bu durumda konum adlarınızı 'PVkaydım | part1', 'PVkaydım | part2' vb. olarak tanımlamalısınız. 'Toplamı göster' modunda konum daha sonra 'PVkaydım' olarak gösterilir ve bu durumda '|' sınırlayıcı olarak alınır.
+<h3>Enlem [°]</h3>
+Güney kutbunda -90° ile kuzey kutbunda 90° arasında değişen güneş enerjisi santralinizin kuzey-güney konumunu girin.
+
+<h3>Boylam [°]</h3>
+Güneş enerjisi santralinizin doğu-batı konumunu girin, 0° ana meridyen olarak tanımlanır. Pozitif boylamlar ana meridyenin doğusunda, negatif olanlar ise batısındadır.
+
+<h3>Azimut [°]</h3>
+Güneş enerjisi santralinizin yatay yönünü 0° Kuzeye, 90° Doğuya, 180° Güneye ve 270° Batıya karşılık gelecek şekilde belirtin.
+
+<h3>Eğim [°]</h3>
+Güneş enerjisi santralinizin dikey yönünü belirtin; 0° gökyüzüne doğru yukarı bakacak ve 90° ufka doğru dikey bir yön gösterecek şekilde.
+
+<h3>Hücrelerin tepe gücü [W]</h3>
+Güneş hücrelerinizin (tüm hücrelerin toplamı) sağlayabileceği maksimum gücü girin. Şu anda bu değer yalnızca hücre verimliliği veya hücre alanı için 0 değeri belirtilmişse kullanılmaktadır.
+Bu durumda, hücrelerin tepe gücünün 1000W/m2 ışınımda verildiği varsayılır.
+
+<h3>Hücre verimliliği  [%]</h3>
+Güneş ışığı formundaki enerjinin güneş pili tarafından elektriğe dönüştürülebilecek kısmını belirtin.
+
+<h3>Sıcaklık katsayısı  [%/K]</h3>
+Hücre gücünün sıcaklığa bağımlılığını girin, genellikle -%0,4/K aralığındadır. Hücre sıcaklığı, ortam sıcaklığı ve toplam ışınımdan tahmin edilir.
+
+<h3>Hücre alanı [m<sup>2</sup>]</h3>
+Güneş panellerinizin boyutunu girin. (tüm hücrelerin toplamı)
+
+<h3>Dağınık radyasyon verimliliği  [%]</h3>
+Dağınık radyasyon için güneş enerjisi santralinizin verimliliğini belirtin. Yukarı bakarken %100 civarında olmalıdır, ancak ufka doğru bakarken ortama bağlı olarak %50 veya daha az olabilir.
+Muhtemelen bu parametreyi optimize etmeniz gerekir.
+
+<h3>Yansıtabilirlik  [0..1]</h3>
+Yansımaları hesaba katmak için ortamınız için ortalama albedoyu belirtin. Değer 0 (tüm radyasyon emilir) ile 1 (tüm radyasyon yansıtılır) arasında değişir.
+Örnek: Taze kar: 0.8, yeşil ot: 0.25, asfalt: 0.1
+Muhtemelen bu parametreyi optimize etmeniz gerekir.
+
+<h3>İnvertör verimliliği  [%]</h3>
+İnvertörünüzün verimliliğini girin.
+
+<h3>İnvertör gücü  [W]</h3>
+İnvertörünüzün maksimum gücünü belirtin. Panellerinizin maksimum gücünden daha düşükse, sisteminizin çıkış gücü bu parametre ile sınırlandırılacaktır.
+
+<h3>Merkezi invertör</h3>
+İnvertör limitini tüm sisteme uygulamak için bu onay kutusunu seçin. "Toplamı göster" modundayken, bu onay kutusu etkinleştirilmiş olan tüm invertörlerin güç limitleri toplanacak ve tüm sistemin güç limiti olarak kullanılacaktır.
+
+<h3>Gölgelendirme</h3>
+Bu bölümde güneş panellerinizdeki gölgelendirmeyi tanımlayabilirsiniz.
+Her bir azimut açısı aralığı için, güneşin güneş panellerine çarpması için gerekli olan minimum güneş yüksekliğini belirleyebilirsiniz.
+Bu değerin altındaki yükseklikler için gölgeleme yüzdesini ayarlayabilirsiniz. Örneğin, bir bina radyasyonu %100 oranında azaltırken, bir ağaç sadece %60 oranında azaltabilir.
+Ana penceredeki güneş simgesi düğmesini kullanarak güneşin mevcut azimutu ve yüksekliği hakkında bilgi alabilir ve güneşin binaların veya ağaçların üzerinde hangi yükseklikte olduğunu belirleyebilirsiniz.
+
+</body>
+</html>

app/src/main/assets/leaflet-tilelayer-colorfilter.min.js

@@ -1,7 +0,0 @@
-/*
-  Leaflet.TileLayer.ColorFilter
-  (c) 2018, Claudio T. Kawakani
-  A simple and lightweight Leaflet plugin to apply CSS filters on map tiles.
-  https://github.com/xtk93x/Leaflet.TileLayer.ColorFilter
-*/
-"use strict";L.TileLayer.ColorFilter=L.TileLayer.extend({intialize:function(t,i){L.TileLayer.prototype.initialize.call(this,t,i)},colorFilter:function(){var r=["blur:px","brightness:%","bright:brightness:%","bri:brightness:%","contrast:%","con:contrast:%","grayscale:%","gray:grayscale:%","hue-rotate:deg","hue:hue-rotate:deg","hue-rotation:hue-rotate:deg","invert:%","inv:invert:%","opacity:%","op:opacity:%","saturate:%","saturation:saturate:%","sat:saturate:%","sepia:%","sep:sepia:%"];return(this.options.filter?this.options.filter:[]).map(function(t){var i=t.toLowerCase().split(":");if(2===i.length){var e=r.find(function(t){return t.split(":")[0]===i[0]});if(e)return e=e.split(":"),i[1]+=/^\d+$/.test(i[1])?e[e.length-1]:"","".concat(e[e.length-2],"(").concat(i[1],")")}return""}).join(" ")},_initContainer:function(){L.TileLayer.prototype._initContainer.call(this);this._container.style.filter=this.colorFilter()},updateFilter:function(t){this.options.filter=t,this._container&&(this._container.style.filter=this.colorFilter())}}),L.tileLayer.colorFilter=function(t,i){return new L.TileLayer.ColorFilter(t,i)};

app/src/main/assets/map.html

@@ -34,7 +34,7 @@ var map = L.map('mapid', {
         }).setView([getUrlParameter('lat'), getUrlParameter('lon')], 10);  //zoom factor 10
 
 
-    L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+    L.tileLayer(getUrlParameter('tiles')+'{z}/{x}/{y}.png', {
         attribution: 'Map data ©<a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
     }).addTo(map);
 

app/src/main/java/org/woheller69/weather/Backup.java

@@ -5,6 +5,7 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.net.Uri;
+import android.os.Build;
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.app.ActivityCompat;
@@ -16,6 +17,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.file.Files;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -25,7 +27,11 @@ public class Backup {
     public static boolean checkPermissionStorage (Context context) {
             int result = ContextCompat.checkSelfPermission(context, Manifest.permission.READ_EXTERNAL_STORAGE);
             int result1 = ContextCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE);
-            return result == PackageManager.PERMISSION_GRANTED && result1 == PackageManager.PERMISSION_GRANTED;
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                return true;
+            } else {
+                return result == PackageManager.PERMISSION_GRANTED && result1 == PackageManager.PERMISSION_GRANTED;
+        }
     }
 
     public static void requestPermission(Activity activity) {
@@ -52,7 +58,7 @@ public class Backup {
                 try (ZipInputStream zipInputStream = new ZipInputStream(src)) {
                     while ((zipEntry = zipInputStream.getNextEntry()) != null) {
                         File extractedFile = new File(targetDir ,zipEntry.getName());
-                        try (OutputStream outputStream = new FileOutputStream(extractedFile)) {
+                        try (OutputStream outputStream = Files.newOutputStream(extractedFile.toPath())) {
                             while ((readLen = zipInputStream.read(readBuffer)) != -1) {
                                 outputStream.write(readBuffer, 0, readLen);
                             }

app/src/main/java/org/woheller69/weather/SolarPowerPlant.java

@@ -9,6 +9,7 @@ import java.time.ZoneId;
 import java.time.ZonedDateTime;
 
 public class SolarPowerPlant {
+    double albedo;
     double latitude;
     double longitude;
     double cellsMaxPower;
@@ -18,12 +19,14 @@ public class SolarPowerPlant {
     double diffuseEfficiency;
     double inverterPowerLimit;
     double inverterEfficiency;
+    boolean isCentralInverter;
     double azimuthAngle;
     double tiltAngle;
     private final int[] shadingElevation;
     private final int[] shadingOpacity;
 
-    public SolarPowerPlant(double latitude, double longitude, double cellsMaxPower, double cellsArea, double cellsEfficiency, double cellsTempCoeff, double diffuseEfficiency, double inverterPowerLimit, double inverterEfficiency, double azimuthAngle, double tiltAngle, int[] shadingElevation, int[] shadingOpacity ) {
+    public SolarPowerPlant(double latitude, double longitude, double cellsMaxPower, double cellsArea, double cellsEfficiency, double cellsTempCoeff, double diffuseEfficiency, double inverterPowerLimit, double inverterEfficiency,boolean isCentralInverter, double azimuthAngle, double tiltAngle, int[] shadingElevation, int[] shadingOpacity, double albedo ) {
+        this.albedo = albedo;
         this.latitude = latitude;
         this.longitude = longitude;
         this.cellsMaxPower = cellsMaxPower;
@@ -37,10 +40,11 @@ public class SolarPowerPlant {
         this.shadingElevation = shadingElevation;
         this.shadingOpacity = shadingOpacity;
         this.cellsTempCoeff = cellsTempCoeff / 100;
+        this.isCentralInverter = isCentralInverter;
 
     }
 
-    public float getPower(double solarPowerNormal, double solarPowerDiffuse, long epochTimeSeconds, double ambientTemperature) {
+    public float getPower(double solarPowerNormal, double solarPowerDiffuse, double shortwaveRadiation, long epochTimeSeconds, double ambientTemperature) {
         Instant i = Instant.ofEpochSecond(epochTimeSeconds); //currentTimeMillis is in GMT
         ZonedDateTime dateTime = ZonedDateTime.ofInstant(i, ZoneId.of("GMT"));
 
@@ -65,24 +69,63 @@ public class SolarPowerPlant {
             efficiency = Math.max(0, efficiency); //scalar product is negative if sun points to back of module. set 0 in this case
 
             if (efficiency > 0) {
-                //Calculate shading  in 10 degree ranges, total 36 ranges
+                double shFactor=0;
-                int shadingIndex = ((((int) Math.round((solarAzimuth + 5) / 10)) - 1) % 36 + 36) % 36;
+                Instant sh;
-                if (shadingElevation[shadingIndex] > solarElevation) {
+                ZonedDateTime shDateTime;
-                    efficiency *= (double) (100 - shadingOpacity[shadingIndex])/100;
+                AzimuthZenithAngle shPosition;
+                double shSolarAzimuth;
+                double shSolarElevation;
+
+                //Calculate shading in 6 intervals per hour -> 10min steps xx:05 / xx:15 / xx:25 / xx:35 / xx:45 / xx:55
+                int numSteps = 6;
+                long interval = 3600 / numSteps;
+                for (int j=0; j<numSteps;j++){
+                    sh = Instant.ofEpochSecond(epochTimeSeconds-(numSteps-1)*interval/2+j*interval);
+                    shDateTime = ZonedDateTime.ofInstant(sh, ZoneId.of("GMT"));  //currentTimeMillis is in GMT
+
+                    shPosition = Grena3.calculateSolarPosition(
+                            shDateTime,
+                            latitude,
+                            longitude,
+                            DeltaT.estimate(shDateTime.toLocalDate())); // delta T (s)
+
+                    shSolarAzimuth = shPosition.getAzimuth();
+                    shSolarElevation = 90 - shPosition.getZenithAngle();
+
+                    //shading values are provided in 10 degree ranges -> total of 36 ranges
+                    int shadingIndex = ((((int) Math.round((shSolarAzimuth + 5) / 10)) - 1) % 36 + 36) % 36;
+                    if (shadingElevation[shadingIndex] > shSolarElevation) {
+                        shFactor += (double) (100 - shadingOpacity[shadingIndex])/(numSteps*100);
+                    } else {
+                        shFactor += (double) 100/(numSteps*100);  //numSteps iterations with no shading give 100%
+                    }
                 }
+                efficiency *= shFactor;
             }
         }
 
-        double totalRadiationOnCell = solarPowerNormal * efficiency + solarPowerDiffuse * diffuseEfficiency;  //flat plate equivalent of the solar irradiance
+        double totalRadiationOnCell = solarPowerNormal * efficiency + solarPowerDiffuse * diffuseEfficiency + shortwaveRadiation * (0.5-0.5*Math.cos(tiltAngle/180*Math.PI)) * albedo;  //flat plate equivalent of the solar irradiance
         double cellTemperature = calcCellTemperature(ambientTemperature,totalRadiationOnCell);
+        double dcPower;
+        if (cellsEfficiency!=0 && cellsArea!=0){
+            dcPower = totalRadiationOnCell * (1+(cellTemperature - 25)*cellsTempCoeff) * cellsEfficiency * cellsArea;
+        } else { //assume cellMaxPower is defined at 1000W/sqm
+            dcPower = totalRadiationOnCell/1000 * (1+(cellTemperature - 25)*cellsTempCoeff) * cellsMaxPower;
+        }
 
-        double dcPower = totalRadiationOnCell * cellsEfficiency * (1+(cellTemperature - 25)*cellsTempCoeff) * cellsArea;
+        double acPower;
-
+        if (!isCentralInverter)
-        double acPower = Math.min(dcPower * inverterEfficiency, inverterPowerLimit);
+            acPower = Math.min(dcPower * inverterEfficiency, inverterPowerLimit);
+        else
+            acPower = dcPower * inverterEfficiency;  //do limiting on system level
 
         return (float) acPower;
     }
 
+    public static int calcDiffuseEfficiency(float tilt){
+        return (int) ( 50 + 50* Math.cos(tilt/180*Math.PI));
+    }
+
     public static double calcCellTemperature(double ambientTemperature, double totalIrradiance){
         //models from here: https://www.scielo.br/j/babt/a/FBq5Pmm4gSFqsfh3V8MxfGN/  Photovoltaic Cell Temperature Estimation for a Grid-Connect Photovoltaic Systems in Curitiba
         //float cellTemperature =  30.006f + 0.0175f*(totalIrradiance-300f)+1.14f*(ambientTemperature-25f);  //Lasnier and Ang  Lasnier, F.; Ang, T. G. Photovoltaic engineering handbook, 1st ed.; IOP Publishing LTD: Lasnier, France, 1990; pp. 258.

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,7 +17,12 @@ public class AboutActivity extends NavigationActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
-        overridePendingTransition(0, 0);
+        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,7 +95,12 @@ public class ForecastCityActivity extends NavigationActivity implements IUpdatea
         super.onCreate(savedInstanceState);
         context=this;
         setContentView(R.layout.activity_forecast_city);
-        overridePendingTransition(0, 0);
+        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();
 
@@ -139,7 +146,8 @@ public class ForecastCityActivity extends NavigationActivity implements IUpdatea
     private void initResources() {
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
         viewPager2 = findViewById(R.id.viewPager2);
-        reduceViewpager2DragSensitivity(viewPager2,2);
+        viewPager2.setUserInputEnabled(false);
+        //reduceViewpager2DragSensitivity(viewPager2,2);
         tabLayout = findViewById(R.id.tab_layout);
         if (sharedPreferences.getBoolean("pref_summarize",false)){
             pagerAdapter = new WeatherPagerAdapter(this, getSupportFragmentManager(),getLifecycle(),true);
@@ -219,12 +227,7 @@ public class ForecastCityActivity extends NavigationActivity implements IUpdatea
     }
 
     @Override
-    public void processNewWeekForecasts(List<WeekForecast> forecasts) {
+    public void processNewForecasts(List<HourlyForecast> hourlyForecasts, List<WeekForecast> weekForecasts) {
-        stopRefreshAnimation();
-    }
-
-    @Override
-    public void processNewForecasts(List<HourlyForecast> hourlyForecasts) {
         stopRefreshAnimation();
     }
 

app/src/main/java/org/woheller69/weather/activities/HelpActivity.java

@@ -1,11 +1,15 @@
 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;
 
 import androidx.appcompat.app.ActionBar;
+import androidx.webkit.WebSettingsCompat;
+import androidx.webkit.WebViewFeature;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -17,8 +21,21 @@ 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)) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                WebSettingsCompat.setAlgorithmicDarkeningAllowed(view.getSettings(), true);
+            }
+        }
+
         String language = getResources().getConfiguration().getLocales().get(0).getLanguage();
 
         String filename = "help-"+language+".html";

app/src/main/java/org/woheller69/weather/activities/ManageLocationsActivity.java

@@ -1,8 +1,10 @@
 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;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -16,22 +18,33 @@ 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;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import net.e175.klaus.solarpositioning.AzimuthZenithAngle;
+import net.e175.klaus.solarpositioning.DeltaT;
+import net.e175.klaus.solarpositioning.Grena3;
+
 import org.woheller69.weather.R;
+import org.woheller69.weather.SolarPowerPlant;
 import org.woheller69.weather.database.City;
 import org.woheller69.weather.database.CityToWatch;
 import org.woheller69.weather.database.SQLiteHelper;
 import org.woheller69.weather.dialogs.AddLocationDialogOmGeocodingAPI;
 import org.woheller69.weather.ui.Help.InputFilterMinMax;
+import org.woheller69.weather.ui.Help.StringFormatUtils;
 import org.woheller69.weather.ui.RecycleList.RecyclerItemClickListener;
 import org.woheller69.weather.ui.RecycleList.RecyclerOverviewListAdapter;
 import org.woheller69.weather.ui.RecycleList.SimpleItemTouchHelperCallback;
 
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -51,7 +64,13 @@ public class ManageLocationsActivity extends NavigationActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_manage_locations);
-        overridePendingTransition(0, 0);
+        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());
 
@@ -183,22 +202,52 @@ public class ManageLocationsActivity extends NavigationActivity {
         EditText editLongitude = (EditText) dialogView.findViewById(R.id.EditLocation_Lon);
         EditText editCity = (EditText) dialogView.findViewById(R.id.EditLocation_Name);
         EditText editAzimuth = (EditText) dialogView.findViewById(R.id.EditLocation_Azimuth);
+        CompassView editCompass = (CompassView) dialogView.findViewById(R.id.EditLocation_Compass);
         EditText editTilt = (EditText) dialogView.findViewById(R.id.EditLocation_Tilt);
         EditText editCellsMaxPower = (EditText) dialogView.findViewById(R.id.EditLocation_Cell_Max_Power);
         EditText editCellsArea = (EditText) dialogView.findViewById(R.id.EditLocation_Cells_Area);
         EditText editCellsEfficiency = (EditText) dialogView.findViewById(R.id.EditLocation_Cell_Efficiency);
         EditText editCellsTempCoeff = (EditText) dialogView.findViewById(R.id.EditLocation_Cell_Temp_Coeff);
         EditText editDiffuseEfficiency = (EditText) dialogView.findViewById(R.id.EditLocation_Diffuse_Efficiency);
+        EditText editAlbedo = (EditText) dialogView.findViewById(R.id.EditLocation_Albedo);
         EditText editInverterPowerLimit = (EditText) dialogView.findViewById(R.id.EditLocation_Inverter_Power_Limit);
         EditText editInverterEfficiency = (EditText) dialogView.findViewById(R.id.EditLocation_Inverter_Efficiency);
+        CheckBox editIsCentralInverter = (CheckBox) dialogView.findViewById(R.id.EditLocation_Central_Inverter);
+        TextView currentAzimuth = (TextView) dialogView.findViewById(R.id.edit_current_azi_ele);
+
+        Long time = System.currentTimeMillis()/1000;
+        ZonedDateTime dateTime = ZonedDateTime.ofInstant(Instant.ofEpochSecond(time), ZoneId.of("GMT"));
+        AzimuthZenithAngle position = Grena3.calculateSolarPosition(
+                dateTime,
+                city.getLatitude(),
+                city.getLongitude(),
+                DeltaT.estimate(dateTime.toLocalDate()));
+
+        String solarAzimuth = StringFormatUtils.formatDecimal((float) position.getAzimuth(),"");
+        String solarElevation = StringFormatUtils.formatDecimal((float) (90 - position.getZenithAngle()),"");
+        currentAzimuth.setText(getString(R.string.edit_location_hint_azimuth)+": "+solarAzimuth + " " + getString(R.string.action_sun_elevation) + ": " + solarElevation);
 
         editCity.setText(city.getCityName());
         editLatitude.setText(Float.toString(city.getLatitude()));
         editLatitude.setFilters(new InputFilter[]{ new InputFilterMinMax(-90, 90)});
         editLongitude.setText(Float.toString(city.getLongitude()));
         editLongitude.setFilters(new InputFilter[]{ new InputFilterMinMax(-180, 180)});
+        editCompass.setDegrees(city.getAzimuthAngle());
+        editCompass.setOnCompassDragListener(degrees -> { editAzimuth.setText(Float.toString(Math.round(degrees))); });
         editAzimuth.setText(Float.toString(city.getAzimuthAngle()));
         editAzimuth.setFilters(new InputFilter[]{ new InputFilterMinMax(0, 360)});
+        editAzimuth.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { }
+            @Override
+            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { }
+
+            @Override
+            public void afterTextChanged(Editable editable) {
+                float azimuth = Float.parseFloat(!editAzimuth.getText().toString().isEmpty() ? editAzimuth.getText().toString() : "0");
+                editCompass.setDegrees(azimuth);
+            }
+        });
         editTilt.setText(Float.toString(city.getTiltAngle()));
         editTilt.setFilters(new InputFilter[]{ new InputFilterMinMax(0, 90)});
         editCellsMaxPower.setText(Float.toString(city.getCellsMaxPower()));
@@ -209,8 +258,11 @@ public class ManageLocationsActivity extends NavigationActivity {
         editCellsTempCoeff.setFilters(new InputFilter[]{ new InputFilterMinMax(-100, 100)});
         editDiffuseEfficiency.setText(Float.toString(city.getDiffuseEfficiency()));
         editDiffuseEfficiency.setFilters(new InputFilter[]{ new InputFilterMinMax(0, 100)});
+        editAlbedo.setText(Float.toString(city.getAlbedo()));
+        editAlbedo.setFilters(new InputFilter[]{ new InputFilterMinMax(0,1)});
         editInverterPowerLimit.setText(Float.toString(city.getInverterPowerLimit()));
         editInverterEfficiency.setText(Float.toString(city.getInverterEfficiency()));
+        editIsCentralInverter.setChecked(city.isCentralInverter());
         editInverterEfficiency.setFilters(new InputFilter[]{ new InputFilterMinMax(0, 100)});
         editTilt.addTextChangedListener(new TextWatcher() {
             @Override
@@ -221,7 +273,7 @@ public class ManageLocationsActivity extends NavigationActivity {
             @Override
             public void afterTextChanged(Editable editable) {
                 float tilt = Float.parseFloat(!editTilt.getText().toString().isEmpty() ? editTilt.getText().toString() : "0");
-                int diffuseEfficiency = (int) (100-50 * tilt/90);
+                int diffuseEfficiency = SolarPowerPlant.calcDiffuseEfficiency(tilt);
                 editDiffuseEfficiency.setText(Float.toString((float) diffuseEfficiency));
             }
         });
@@ -242,13 +294,15 @@ public class ManageLocationsActivity extends NavigationActivity {
                     Float.parseFloat(editCellsEfficiency.getText().toString().isEmpty() ? "0" : editCellsEfficiency.getText().toString()),
                     Float.parseFloat(editCellsTempCoeff.getText().toString().isEmpty() ? "0" : editCellsTempCoeff.getText().toString()),
                     Float.parseFloat(editDiffuseEfficiency.getText().toString().isEmpty() ? "0" : editDiffuseEfficiency.getText().toString()),
+                    Float.parseFloat(editAlbedo.getText().toString().isEmpty() ? "0" : editAlbedo.getText().toString()),
                     Float.parseFloat(editInverterPowerLimit.getText().toString().isEmpty() ? "0" : editInverterPowerLimit.getText().toString()),
                     Float.parseFloat(editInverterEfficiency.getText().toString().isEmpty() ? "0" : editInverterEfficiency.getText().toString()),
+                    editIsCentralInverter.isChecked(),
                     shadingElevation,
                     shadingOpacity
                     );
         });
-        alert.setNegativeButton(getString(R.string.dialog_add_close_button), (dialog, whichButton) -> {
+        alert.setNegativeButton(getString(android.R.string.cancel), (dialog, whichButton) -> {
         });
 
         alert.setNeutralButton(getString(R.string.dialog_add_clone_button), (dialog, whichButton) -> {
@@ -277,8 +331,10 @@ public class ManageLocationsActivity extends NavigationActivity {
                     Float.parseFloat(editCellsEfficiency.getText().toString().isEmpty() ? "0" : editCellsEfficiency.getText().toString()),
                     Float.parseFloat(editCellsTempCoeff.getText().toString().isEmpty() ? "0" : editCellsTempCoeff.getText().toString()),
                     Float.parseFloat(editDiffuseEfficiency.getText().toString().isEmpty() ? "0" : editDiffuseEfficiency.getText().toString()),
+                    Float.parseFloat(editAlbedo.getText().toString().isEmpty() ? "0" : editAlbedo.getText().toString()),
                     Float.parseFloat(editInverterPowerLimit.getText().toString().isEmpty() ? "0" : editInverterPowerLimit.getText().toString()),
                     Float.parseFloat(editInverterEfficiency.getText().toString().isEmpty() ? "0" : editInverterEfficiency.getText().toString()),
+                    editIsCentralInverter.isChecked(),
                     shadingElevation,
                     shadingOpacity
             );

app/src/main/java/org/woheller69/weather/activities/NavigationActivity.java

@@ -3,6 +3,7 @@ package org.woheller69.weather.activities;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -25,6 +26,7 @@ import android.view.MenuItem;
 
 import org.woheller69.weather.BuildConfig;
 import org.woheller69.weather.R;
+import org.woheller69.weather.database.SQLiteHelper;
 import org.woheller69.weather.preferences.AppPreferencesManager;
 
 import static java.lang.Boolean.TRUE;
@@ -79,7 +81,6 @@ public class NavigationActivity extends AppCompatActivity implements OnNavigatio
 
         }
 
-        overridePendingTransition(0, 0);
     }
 
     @Override
@@ -170,6 +171,9 @@ public class NavigationActivity extends AppCompatActivity implements OnNavigatio
             intent = new Intent(this, HelpActivity.class);
             startActivity(intent);
         }else if(itemId==R.id.nav_backuprestore) {
+            SQLiteHelper dbhelper = SQLiteHelper.getInstance(this);  //create a database if it does not yet exist
+            SQLiteDatabase database = dbhelper.getWritableDatabase();
+            database.close();
             intent = new Intent(this, BackupRestoreActivity.class);
             startActivity(intent);
         }else if (itemId==R.id.star_on_github){

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,8 +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) {
-        overridePendingTransition(0, 0);
+            getWindow().getInsetsController().setSystemBarsAppearance(
+                    WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS,
+                    WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS
+            );
+        }
     }
 
     @Override

app/src/main/java/org/woheller69/weather/database/CityToWatch.java

@@ -23,6 +23,8 @@ public class CityToWatch {
     private float inverterEfficiency;
     private float azimuthAngle;
     private float tiltAngle;
+    private float albedo;
+    private boolean isCentralInverter;
     private int rank;
     private int[] shadingElevation = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
     private int[] shadingOpacity =   {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
@@ -46,6 +48,7 @@ public class CityToWatch {
         this.inverterEfficiency = 95.0f;
         this.azimuthAngle = 170.0f;
         this.tiltAngle = 90.0f;
+        this.albedo = 0f;
 
     }
 
@@ -145,6 +148,11 @@ public class CityToWatch {
         this.inverterPowerLimit = inverterPowerLimit;
     }
 
+    public void setIsCentralInverter(boolean isCentralInverter) {
+        this.isCentralInverter = isCentralInverter;
+    }
+    public boolean isCentralInverter() {return isCentralInverter;}
+
     public void setDiffuseEfficiency(float diffuseEfficiency) {
         this.diffuseEfficiency = diffuseEfficiency;
     }
@@ -192,4 +200,8 @@ public class CityToWatch {
     public void setCellsTempCoeff(float cellsTempCoeff) {
         this.cellsTempCoeff = cellsTempCoeff;
     }
+
+    public float getAlbedo() { return this.albedo;   }
+
+    public void setAlbedo (float albedo) { this.albedo = albedo; }
 }

app/src/main/java/org/woheller69/weather/database/HourlyForecast.java

@@ -15,7 +15,9 @@ public class HourlyForecast {
     private int weatherID;
     private float directRadiationNormal;
     private float diffuseRadiation;
+    private float shortwaveRadiation;
     private float power;
+    private float energyCum;
     private String city_name;
 
 
@@ -104,4 +106,12 @@ public class HourlyForecast {
     public void setDiffuseRadiation(float diffuseRadiation) { this.diffuseRadiation = diffuseRadiation; }
 
     public void setPower(float power) { this.power = power; }
+
+    public void setShortwaveRadiation(float shortwaveRadiation) { this.shortwaveRadiation = shortwaveRadiation; }
+
+    public float getShortwaveRadiation() { return this.shortwaveRadiation; }
+
+    public float getEnergyCum() { return this.energyCum; }
+
+    public void setEnergyCum(float energy_cum) { this.energyCum = energy_cum;}
 }

app/src/main/java/org/woheller69/weather/database/SQLiteHelper.java

@@ -20,7 +20,7 @@ import static androidx.core.app.JobIntentService.enqueueWork;
  */
 public class SQLiteHelper extends SQLiteOpenHelper {
 
-    private static final int DATABASE_VERSION = 2;
+    private static final int DATABASE_VERSION = 4;
     private Context context;
 
     private List<City> allCities = new ArrayList<>();
@@ -54,6 +54,8 @@ public class SQLiteHelper extends SQLiteOpenHelper {
     private static final String CITIES_TO_WATCH_SHADING_ELEVATION = "shading_elevation";
     private static final String CITIES_TO_WATCH_SHADING_OPACITY = "shading_opacity";
     private static final String CITIES_TO_WATCH_CELLS_TEMP_COEFF = "cells_temp_coeff";
+    private static final String CITIES_TO_WATCH_ALBEDO = "albedo";
+    private static final String CITIES_TO_WATCH_IS_CENTRAL_INVERTER = "is_central_inverter";
 
     //Names of columns in TABLE_FORECAST
     private static final String FORECAST_ID = "forecast_id";
@@ -137,7 +139,9 @@ public class SQLiteHelper extends SQLiteOpenHelper {
             CITIES_TO_WATCH_TILT_ANGLE + " REAL NOT NULL," +
             CITIES_TO_WATCH_SHADING_ELEVATION + " VARCHAR(255) NOT NULL," +
             CITIES_TO_WATCH_SHADING_OPACITY + " VARCHAR(255) NOT NULL," +
-            CITIES_TO_WATCH_CELLS_TEMP_COEFF + " REAL NOT NULL)";
+            CITIES_TO_WATCH_CELLS_TEMP_COEFF + " REAL NOT NULL," +
+            CITIES_TO_WATCH_ALBEDO + " REAL NOT NULL," +
+            CITIES_TO_WATCH_IS_CENTRAL_INVERTER + " INTEGER)";
 
     public static SQLiteHelper getInstance(Context context) {
         if (instance == null && context != null) {
@@ -166,6 +170,10 @@ public class SQLiteHelper extends SQLiteOpenHelper {
             case 1:
                 db.execSQL("ALTER TABLE "+TABLE_CITIES_TO_WATCH+" ADD COLUMN "+CITIES_TO_WATCH_CELLS_TEMP_COEFF+" REAL DEFAULT 0");
                 // we want both updates, so no break statement here...
+            case 2:
+                db.execSQL("ALTER TABLE "+TABLE_CITIES_TO_WATCH+" ADD COLUMN "+CITIES_TO_WATCH_ALBEDO+" REAL DEFAULT 0");
+            case 3:
+                db.execSQL("ALTER TABLE "+TABLE_CITIES_TO_WATCH+" ADD COLUMN "+CITIES_TO_WATCH_IS_CENTRAL_INVERTER+" INTEGER DEFAULT 0");
         }
 
     }
@@ -194,6 +202,8 @@ public class SQLiteHelper extends SQLiteOpenHelper {
         values.put(CITIES_TO_WATCH_SHADING_ELEVATION,city.getShadingElevationString());
         values.put(CITIES_TO_WATCH_SHADING_OPACITY,city.getShadingOpacityString());
         values.put(CITIES_TO_WATCH_CELLS_TEMP_COEFF,city.getCellsTempCoeff());
+        values.put(CITIES_TO_WATCH_ALBEDO,city.getAlbedo());
+        values.put(CITIES_TO_WATCH_IS_CENTRAL_INVERTER,city.isCentralInverter() ? 1 : 0);
 
         long id=database.insert(TABLE_CITIES_TO_WATCH, null, values);
 
@@ -228,6 +238,8 @@ public class SQLiteHelper extends SQLiteOpenHelper {
                         ", " + CITIES_TO_WATCH_SHADING_ELEVATION +
                         ", " + CITIES_TO_WATCH_SHADING_OPACITY +
                         ", " + CITIES_TO_WATCH_CELLS_TEMP_COEFF +
+                        ", " + CITIES_TO_WATCH_ALBEDO +
+                        ", " + CITIES_TO_WATCH_IS_CENTRAL_INVERTER +
                         ", " + CITIES_TO_WATCH_COLUMN_RANK +
                         " FROM " + TABLE_CITIES_TO_WATCH +
                         " WHERE " + CITIES_TO_WATCH_CITY_ID + " = ?", arguments);
@@ -251,7 +263,9 @@ public class SQLiteHelper extends SQLiteOpenHelper {
             cityToWatch.setShadingElevation(cursor.getString(13));
             cityToWatch.setShadingOpacity(cursor.getString(14));
             cityToWatch.setCellsTempCoeff(Float.parseFloat(cursor.getString(15)));
-            cityToWatch.setRank(Integer.parseInt(cursor.getString(16)));
+            cityToWatch.setAlbedo(Float.parseFloat(cursor.getString(16)));
+            cityToWatch.setIsCentralInverter(Integer.parseInt(cursor.getString(17)) == 1);
+            cityToWatch.setRank(Integer.parseInt(cursor.getString(18)));
 
             cursor.close();
         }
@@ -283,6 +297,8 @@ public class SQLiteHelper extends SQLiteOpenHelper {
                         ", " + CITIES_TO_WATCH_SHADING_ELEVATION +
                         ", " + CITIES_TO_WATCH_SHADING_OPACITY +
                         ", " + CITIES_TO_WATCH_CELLS_TEMP_COEFF +
+                        ", " + CITIES_TO_WATCH_ALBEDO +
+                        ", " + CITIES_TO_WATCH_IS_CENTRAL_INVERTER +
                         ", " + CITIES_TO_WATCH_COLUMN_RANK +
                         " FROM " + TABLE_CITIES_TO_WATCH
                 , new String[]{});
@@ -308,7 +324,9 @@ public class SQLiteHelper extends SQLiteOpenHelper {
                 cityToWatch.setShadingElevation(cursor.getString(13));
                 cityToWatch.setShadingOpacity(cursor.getString(14));
                 cityToWatch.setCellsTempCoeff(Float.parseFloat(cursor.getString(15)));
-                cityToWatch.setRank(Integer.parseInt(cursor.getString(16)));
+                cityToWatch.setAlbedo(Float.parseFloat(cursor.getString(16)));
+                cityToWatch.setIsCentralInverter(Integer.parseInt(cursor.getString(17)) == 1);
+                cityToWatch.setRank(Integer.parseInt(cursor.getString(18)));
 
                 cityToWatchList.add(cityToWatch);
             } while (cursor.moveToNext());
@@ -339,6 +357,8 @@ public class SQLiteHelper extends SQLiteOpenHelper {
         values.put(CITIES_TO_WATCH_SHADING_ELEVATION,cityToWatch.getShadingElevationString());
         values.put(CITIES_TO_WATCH_SHADING_OPACITY,cityToWatch.getShadingOpacityString());
         values.put(CITIES_TO_WATCH_CELLS_TEMP_COEFF,cityToWatch.getCellsTempCoeff());
+        values.put(CITIES_TO_WATCH_ALBEDO,cityToWatch.getAlbedo());
+        values.put(CITIES_TO_WATCH_IS_CENTRAL_INVERTER,cityToWatch.isCentralInverter() ? 1 : 0);
 
         database.update(TABLE_CITIES_TO_WATCH, values, CITIES_TO_WATCH_ID + " = ?",
                 new String[]{String.valueOf(cityToWatch.getId())});

app/src/main/java/org/woheller69/weather/dialogs/AddLocationDialogOmGeocodingAPI.java

@@ -6,6 +6,7 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.Handler;
@@ -24,8 +25,10 @@ import android.widget.AutoCompleteTextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.core.os.ConfigurationCompat;
 import androidx.fragment.app.DialogFragment;
+import androidx.preference.PreferenceManager;
 
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
@@ -53,47 +56,73 @@ public class AddLocationDialogOmGeocodingAPI extends DialogFragment {
     Activity activity;
     View rootView;
     SQLiteHelper database;
+    private WebView webview;
 
     private AutoCompleteTextView autoCompleteTextView;
     City selectedCity;
 
     private static final int TRIGGER_AUTO_COMPLETE = 100;
     private static final long AUTO_COMPLETE_DELAY = 300;
+    private static final int TRIGGER_HIDE_KEYBOARD = 200;
+    private static final long HIDE_KEYBOARD_DELAY = 3000;
     private Handler handler;
     private AutoSuggestAdapter autoSuggestAdapter;
-    String url="https://geocoding-api.open-meteo.com/v1/search?name=";
+    String urlSuffix="v1/search?name=";
-    String lang="default";
+    String url="";
+    String lang="en";
+
+    public AddLocationDialogOmGeocodingAPI() {
+        setRetainInstance(true);
+    }
 
     @Override
     public void onAttach(@NonNull Context context) {
         super.onAttach(context);
-       if (context instanceof Activity){
+        if (context instanceof Activity){
             this.activity=(Activity) context;
         }
     }
 
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (savedInstanceState != null) dismiss();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        handler.removeMessages(TRIGGER_HIDE_KEYBOARD);
+        if(selectedCity != null && webview != null) {
+            SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(activity);
+            String osmTiles = sp.getString("pref_OsmTiles_URL", BuildConfig.TILES_URL);
+            webview.loadUrl("file:///android_asset/map.html?lat=" + selectedCity.getLatitude() + "&lon=" + selectedCity.getLongitude() + "&tiles=" + osmTiles);
+        }
+    }
 
     @NonNull
     @SuppressLint("SetJavaScriptEnabled")
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(activity);
+        url = sp.getString("pref_OMGEO_URL",BuildConfig.GEOCODING_URL);
+        url = url + urlSuffix;
         Locale locale = ConfigurationCompat.getLocales(Resources.getSystem().getConfiguration()).get(0);
-        lang=locale.getLanguage();
+        if (locale != null) lang=locale.getLanguage();
 
-        LayoutInflater inflater = getActivity().getLayoutInflater();
+        LayoutInflater inflater = activity.getLayoutInflater();
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        AlertDialog.Builder builder = new AlertDialog.Builder(activity);
         View view = inflater.inflate(R.layout.dialog_add_location, null);
 
         rootView = view;
 
         builder.setView(view);
-        builder.setTitle(getActivity().getString(R.string.dialog_add_label));
+        builder.setTitle(activity.getString(R.string.dialog_add_label));
 
-        this.database = SQLiteHelper.getInstance(getActivity());
+        this.database = SQLiteHelper.getInstance(activity);
 
 
-        final WebView webview= rootView.findViewById(R.id.webViewAddLocation);
+        webview = rootView.findViewById(R.id.webViewAddLocation);
         webview.getSettings().setJavaScriptEnabled(true);
         webview.getSettings().setUserAgentString(BuildConfig.APPLICATION_ID+"/"+BuildConfig.VERSION_NAME);
         webview.setBackgroundColor(0x00000000);
@@ -115,10 +144,11 @@ public class AddLocationDialogOmGeocodingAPI extends DialogFragment {
                                             int position, long id) {
                         selectedCity=autoSuggestAdapter.getObject(position);
                         //Hide keyboard to have more space
-                        final InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+                        final InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
                         imm.hideSoftInputFromWindow(rootView.getWindowToken(), 0);
                         //Show city on map
-                        webview.loadUrl("file:///android_asset/map.html?lat=" + selectedCity.getLatitude() + "&lon=" + selectedCity.getLongitude());
+                        String osmTiles = sp.getString("pref_OsmTiles_URL", BuildConfig.TILES_URL);
+                        webview.loadUrl("file:///android_asset/map.html?lat=" + selectedCity.getLatitude() + "&lon=" + selectedCity.getLongitude() + "&tiles=" + osmTiles);
                     }
                 });
 
@@ -133,8 +163,9 @@ public class AddLocationDialogOmGeocodingAPI extends DialogFragment {
             public void onTextChanged(CharSequence s, int start, int before,
                                       int count) {
                 handler.removeMessages(TRIGGER_AUTO_COMPLETE);
-                handler.sendEmptyMessageDelayed(TRIGGER_AUTO_COMPLETE,
+                handler.sendEmptyMessageDelayed(TRIGGER_AUTO_COMPLETE, AUTO_COMPLETE_DELAY);
-                        AUTO_COMPLETE_DELAY);
+                handler.removeMessages(TRIGGER_HIDE_KEYBOARD);
+                handler.sendEmptyMessageDelayed(TRIGGER_HIDE_KEYBOARD, HIDE_KEYBOARD_DELAY);
             }
 
             @Override
@@ -143,23 +174,24 @@ public class AddLocationDialogOmGeocodingAPI extends DialogFragment {
             }
         });
 
-        handler = new Handler(Looper.getMainLooper(), new Handler.Callback() {
+        handler = new Handler(Looper.getMainLooper(), msg -> {
-            @Override
+            if (msg.what == TRIGGER_AUTO_COMPLETE) {
-            public boolean handleMessage(Message msg) {
+                if (!TextUtils.isEmpty(autoCompleteTextView.getText())) {
-                if (msg.what == TRIGGER_AUTO_COMPLETE) {
+                    try {
-                    if (!TextUtils.isEmpty(autoCompleteTextView.getText())) {
+                        makeApiCall(URLEncoder.encode(autoCompleteTextView.getText().toString(), StandardCharsets.UTF_8.name()));
-                        try {
+                    } catch (UnsupportedEncodingException e) {
-                            makeApiCall(URLEncoder.encode(autoCompleteTextView.getText().toString(), StandardCharsets.UTF_8.name()));
+                        e.printStackTrace();
-                        } catch (UnsupportedEncodingException e) {
-                            e.printStackTrace();
-                        }
                     }
                 }
-                return false;
+            } else if (msg.what == TRIGGER_HIDE_KEYBOARD) {
+                //Hide keyboard to show entries behind the keyboard
+                final InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+                imm.hideSoftInputFromWindow(rootView.getWindowToken(), 0);
             }
+            return false;
         });
 
-        builder.setPositiveButton(getActivity().getString(R.string.dialog_add_add_button), new DialogInterface.OnClickListener() {
+        builder.setPositiveButton(activity.getString(R.string.dialog_add_add_button), new DialogInterface.OnClickListener() {
 
             @Override
             public void onClick(DialogInterface dialog, int which) {
@@ -167,7 +199,7 @@ public class AddLocationDialogOmGeocodingAPI extends DialogFragment {
             }
         });
 
-        builder.setNegativeButton(getActivity().getString(R.string.dialog_add_close_button), null);
+        builder.setNegativeButton(activity.getString(android.R.string.cancel), null);
 
         return builder.create();
 

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;
@@ -22,7 +23,7 @@ import android.widget.TextView;
 
 import org.woheller69.weather.R;
 import org.woheller69.weather.activities.ForecastCityActivity;
-import org.woheller69.weather.activities.SettingsActivity;
+import org.woheller69.weather.activities.HelpActivity;
 
 
 /**
@@ -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);
@@ -118,7 +122,7 @@ public class TutorialActivity extends AppCompatActivity {
     }
 
     private void launchSettings() {
-        startActivity(new Intent(TutorialActivity.this, SettingsActivity.class));
+        startActivity(new Intent(TutorialActivity.this, HelpActivity.class));
         finish();
     }
 
@@ -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/services/UpdateDataService.java

@@ -20,6 +20,11 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.URL;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 /**
  * This class provides the functionality to fetch forecast data for a given city as a background
@@ -54,7 +59,7 @@ public class UpdateDataService extends JobIntentService {
 
     @Override
     protected void onHandleWork(Intent intent) {
-        if (!isOnline()) {
+        if (!isOnline(2000)) {
             Handler h = new Handler(getApplicationContext().getMainLooper());
             h.post(new Runnable() {
                 @Override
@@ -116,14 +121,22 @@ public class UpdateDataService extends JobIntentService {
         }
     }
 
-    private boolean isOnline() {
+    private boolean isOnline(int timeOut) { //https://stackoverflow.com/questions/9570237/android-check-internet-connection
+        InetAddress inetAddress = null;
         try {
-            URL url = new URL(BuildConfig.BASE_URL);
+            Future<InetAddress> future = Executors.newSingleThreadExecutor().submit(() -> {
-            InetAddress inetAddress = InetAddress.getByName(url.getHost());
+                try {
-            return inetAddress.isReachable(2000);
+                    URL url = new URL(BuildConfig.BASE_URL);
-        } catch (IOException | IllegalArgumentException e) {
+                    return InetAddress.getByName(url.getHost());
-            return false;
+                } catch ( IOException e) {
+                    return null;
+                }
+            });
+            inetAddress = future.get(timeOut, TimeUnit.MILLISECONDS);
+            future.cancel(true);
+        } catch (InterruptedException | ExecutionException | TimeoutException  e) {
         }
+        return inetAddress!=null && !inetAddress.toString().isEmpty();
     }
 
     private void handleUpdateForecastAction(Intent intent) {

app/src/main/java/org/woheller69/weather/ui/Help/StringFormatUtils.java

@@ -2,14 +2,12 @@ package org.woheller69.weather.ui.Help;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.graphics.drawable.Drawable;
 import androidx.preference.PreferenceManager;
 
-import androidx.core.content.res.ResourcesCompat;
 import org.woheller69.weather.R;
-import org.woheller69.weather.preferences.AppPreferencesManager;
 
 import java.math.RoundingMode;
+import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -28,6 +26,12 @@ public final class StringFormatUtils {
         return removeMinusIfZerosOnly(decimalFormat.format(decimal));
     }
 
+    public static String formatEnergyCum(Context context, float energyCum) {
+        if (energyCum < 10000.0f) return formatInt(energyCum, context.getString(R.string.units_Wh));
+        else if (energyCum < 100000.0f) return formatDecimal(energyCum/1000,context.getString(R.string.units_kWh));
+        else return formatInt(energyCum/1000,context.getString(R.string.units_kWh));
+    }
+
     public static String formatInt(float decimal) {
         intFormat.setRoundingMode(RoundingMode.HALF_UP);
         return removeMinusIfZerosOnly(intFormat.format(decimal));
@@ -54,6 +58,12 @@ public final class StringFormatUtils {
         return df.format(time);
     }
 
+    public static String formatDate(long time) {
+        java.text.DateFormat df = java.text.DateFormat.getDateInstance(DateFormat.SHORT);
+        df.setTimeZone(TimeZone.getTimeZone("GMT"));
+        return df.format(time);
+    }
+
     public static Integer getDayShort(int day){
 
         switch(day)    {

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

@@ -2,7 +2,6 @@ package org.woheller69.weather.ui.RecycleList;
 
 import android.content.Context;
 import androidx.core.content.ContextCompat;
-import androidx.core.content.res.ResourcesCompat;
 import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -13,6 +12,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.db.chart.Tools;
 import com.db.chart.model.BarSet;
@@ -37,7 +37,9 @@ public class CityWeatherAdapter extends RecyclerView.Adapter<CityWeatherAdapter.
 
     private int[] dataSetTypes;
     private List<HourlyForecast> courseDayList;
-    private float[][] forecastData;
+    private List<WeekForecast> weekForecastList;
+    private float producedToday;
+    private float remainingToday;
 
     private Context context;
     private ViewGroup mParent;
@@ -63,27 +65,30 @@ public class CityWeatherAdapter extends RecyclerView.Adapter<CityWeatherAdapter.
         List<HourlyForecast> hourlyForecasts = database.getForecastsByCityId(generalDataList.getCity_id());
         List<WeekForecast> weekforecasts = database.getWeekForecastsByCityId(generalDataList.getCity_id());
 
-        updateForecastData(hourlyForecasts);
+        updateForecastData(hourlyForecasts, weekforecasts);
-        updateWeekForecastData(weekforecasts);
 
     }
 
     // function update 3-hour or 1-hour forecast list
-    public void updateForecastData(List<HourlyForecast> hourlyForecasts) {
+    public void updateForecastData(List<HourlyForecast> hourlyForecasts, List<WeekForecast> weekForecasts) {
-        if (hourlyForecasts.isEmpty()) return;
+        if (hourlyForecasts.isEmpty() || weekForecasts.isEmpty()) return;
         SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
+        int cityId = hourlyForecasts.get(0).getCity_id();
+        SQLiteHelper dbHelper = SQLiteHelper.getInstance(context.getApplicationContext());
+        CityToWatch requestedCity = dbHelper.getCityToWatch(cityId);
+
+        Float centralInverterLimit = requestedCity.isCentralInverter() ? requestedCity.getInverterPowerLimit() : 0;
 
         if (sp.getBoolean("pref_summarize",false)){
-            int cityId = hourlyForecasts.get(0).getCity_id();
             ArrayList<Integer> CityIDList = new ArrayList<Integer>();
-            SQLiteHelper dbHelper = SQLiteHelper.getInstance(context.getApplicationContext());
             hourlyForecasts = dbHelper.getForecastsByCityId(cityId); //get fresh values from database to make sure we do add new values to sum values from last update
             List<CityToWatch> citiesToWatch = dbHelper.getAllCitiesToWatch();
-            CityToWatch requestedCity = dbHelper.getCityToWatch(cityId);
+
             for (int i = 0; i < citiesToWatch.size(); i++) {
                 CityToWatch city = citiesToWatch.get(i);
                 if (city.getCityId()!=requestedCity.getCityId() && city.getLatitude() == requestedCity.getLatitude() && city.getLongitude() == requestedCity.getLongitude()) {
                     CityIDList.add(city.getCityId());
+                    if (city.isCentralInverter()) centralInverterLimit += city.getInverterPowerLimit();
                 }
             }
             if (CityIDList.size()>0){
@@ -100,72 +105,53 @@ public class CityWeatherAdapter extends RecyclerView.Adapter<CityWeatherAdapter.
 
         courseDayList = new ArrayList<>();
 
-            for (HourlyForecast f : hourlyForecasts) {
+        float energyCumulated=0;
-                if (sp.getBoolean("pref_debug",false)) {
+        boolean isDebugMode = sp.getBoolean("pref_debug", false);
-                    courseDayList.add(f);
+        int stepCounter = 0; // Counter to track the number of steps taken in the loop
-                } else {
-                    if (f.getForecastTime() >= System.currentTimeMillis()) {
-                        courseDayList.add(f);
-                    }
-                }
-            }
-            notifyDataSetChanged();
-    }
 
-    // function for week forecast list
+        for (HourlyForecast f : hourlyForecasts) {
-    public void updateWeekForecastData(List<WeekForecast> forecasts) {
+            if (centralInverterLimit>0) f.setPower(Math.min(f.getPower(),centralInverterLimit));  //apply central inverter limit if there is one
-        if (forecasts.isEmpty()) return;
+            float power = f.getPower();
-        int cityId = forecasts.get(0).getCity_id();
+            if (stepCounter > 0) energyCumulated += power;  //Ignore first value because power values are for preceding hour
+            f.setEnergyCum(energyCumulated);
 
-        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
+            // In debug mode show all values, otherwise only future values
-        if (sp.getBoolean("pref_summarize",false)){
+            if (isDebugMode || f.getForecastTime() >= System.currentTimeMillis()) {
-            ArrayList<Integer> CityIDList = new ArrayList<Integer>();
+                courseDayList.add(f);
-            SQLiteHelper dbHelper = SQLiteHelper.getInstance(context.getApplicationContext());
-            forecasts = dbHelper.getWeekForecastsByCityId(cityId);  //get fresh values from database to make sure we do add new values to sum values from last update
-            List<CityToWatch> citiesToWatch = dbHelper.getAllCitiesToWatch();
-            CityToWatch requestedCity = dbHelper.getCityToWatch(cityId);
-            for (int i = 0; i < citiesToWatch.size(); i++) {
-                CityToWatch city = citiesToWatch.get(i);
-                if (city.getCityId()!=requestedCity.getCityId() && city.getLatitude() == requestedCity.getLatitude() && city.getLongitude() == requestedCity.getLongitude()) {
-                    CityIDList.add(city.getCityId());
-                }
             }
-            if (CityIDList.size()>0){
+
-                for (int c=0; c<CityIDList.size();c++) {
+            if (f.getForecastTime() < System.currentTimeMillis() && stepCounter <= 24) producedToday = f.getEnergyCum();
-                    int iteratorCityId = CityIDList.get(c);
+            if (f.getForecastTime() > System.currentTimeMillis() && f.getForecastTime() < System.currentTimeMillis() + 3600000 && stepCounter <= 24) {
-                    List<WeekForecast> wfc = dbHelper.getWeekForecastsByCityId(iteratorCityId);
+                long millisRemainingThisHour = f.getForecastTime() - System.currentTimeMillis();
-                    if (wfc.size() != forecasts.size()) break;  //maybe something went wrong during update or city is not yet updated
+                long millisSoFarThisHour = 3600000 - millisRemainingThisHour;
-                    for (int i=0;i<wfc.size();i++){
+                producedToday = producedToday + (f.getEnergyCum()-producedToday) * millisSoFarThisHour/3600000;
-                        forecasts.get(i).setEnergyDay(forecasts.get(i).getEnergyDay()+wfc.get(i).getEnergyDay());
+            }
-                    }
+
-                }
+            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) {
+                energyCumulated = 0;
             }
         }
 
-        SQLiteHelper dbHelper = SQLiteHelper.getInstance(context.getApplicationContext());
+        //Now calculate weekForecasts from hourlyForecasts
-        int zonemilliseconds = dbHelper.getGeneralDataByCityId(cityId).getTimeZoneSeconds() * 1000;
+        for (WeekForecast weekForecast: weekForecasts){
-
+            float totalEnergy = 0;
-        forecastData = new float[forecasts.size()][11];
+            long timeNoon = weekForecast.getForecastTime();
-
+            for (HourlyForecast hourlyForecast: hourlyForecasts){
-        for (int i=0;i<forecasts.size();i++){
+                if ((hourlyForecast.getForecastTime()>=timeNoon-11*3600*1000L) && (hourlyForecast.getForecastTime()< timeNoon + 13*3600*1000L)){ //values are for preceding hour!
-            forecastData[i][0]=0;
+                    totalEnergy+=hourlyForecast.getPower();
-            forecastData[i][1]=0;
+                }
-            forecastData[i][2]=0;
+            }
-            forecastData[i][3]=0;
+            weekForecast.setEnergyDay(totalEnergy/1000);
-            forecastData[i][4]=forecasts.get(i).getEnergyDay();
-            forecastData[i][5]=0;
-            forecastData[i][6]=0;
-            forecastData[i][7]=0;
-            forecastData[i][8]=forecasts.get(i).getForecastTime()+zonemilliseconds;
-            forecastData[i][9]=forecasts.get(i).getWeatherID();
-            forecastData[i][10]=1;
         }
+        remainingToday = weekForecasts.get(0).getEnergyDay()*1000 - producedToday;
+        weekForecastList = weekForecasts;
 
         notifyDataSetChanged();
     }
 
 
-
     static class ViewHolder extends RecyclerView.ViewHolder {
         ViewHolder(View v) {
             super(v);
@@ -173,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);
         }
     }
 
@@ -299,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) {
 
@@ -307,7 +297,7 @@ public class CityWeatherAdapter extends RecyclerView.Adapter<CityWeatherAdapter.
             holder.recyclerView.setLayoutManager(layoutManager);
 
 
-            final WeekWeatherAdapter adapter = new WeekWeatherAdapter(context, forecastData, generalDataList.getCity_id());
+            final WeekWeatherAdapter adapter = new WeekWeatherAdapter(context, weekForecastList, generalDataList.getCity_id());
             holder.recyclerView.setAdapter(adapter);
             holder.recyclerView.setFocusable(false);
 
@@ -321,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
@@ -351,20 +342,11 @@ public class CityWeatherAdapter extends RecyclerView.Adapter<CityWeatherAdapter.
                                         mCourseOfDay.getLayoutManager().scrollToPosition(i);
                                     }
 
-                                    highlightSelected(view);
                                 }
 
                             }
                         }
 
-                        private void highlightSelected(View view) {
-                            for (int j=0;j<courseDayList.size();j++){  //reset all items
-                                if (holder.recyclerView.getLayoutManager().getChildAt(j)!=null){
-                                    holder.recyclerView.getLayoutManager().getChildAt(j).setBackground(ResourcesCompat.getDrawable(context.getResources(),R.drawable.rounded_transparent,null));
-                                }
-                            }
-                            view.setBackground(ResourcesCompat.getDrawable(context.getResources(),R.drawable.rounded_highlight,null)); //highlight selected item
-                        }
 
                         public void onLongItemClick(View view, int position) {
 
@@ -384,7 +366,7 @@ public class CityWeatherAdapter extends RecyclerView.Adapter<CityWeatherAdapter.
         } else if (viewHolder.getItemViewType() == CHART) {
             ChartViewHolder holder = (ChartViewHolder) viewHolder;
 
-            if(forecastData==null || forecastData.length==0 || forecastData[0]==null) return;
+            if(weekForecastList.isEmpty()) return;
 
             float energyMax=0;
 
@@ -393,13 +375,13 @@ public class CityWeatherAdapter extends RecyclerView.Adapter<CityWeatherAdapter.
             Calendar c = Calendar.getInstance();
             c.setTimeZone(TimeZone.getTimeZone("GMT"));
 
-            for (int i=0 ; i< forecastData.length;i++) {
+            for (int i = 0 ; i < weekForecastList.size(); i++) {
-                c.setTimeInMillis((long) forecastData[i][8]);
+                c.setTimeInMillis(weekForecastList.get(i).getLocalForecastTime(context));
                 int day = c.get(Calendar.DAY_OF_WEEK);
-                float energyDay=forecastData[i][4];
+                float energyDay=weekForecastList.get(i).getEnergyDay();
 
                 String dayString = context.getResources().getString(StringFormatUtils.getDayShort(day));
-                if (forecastData.length>8) dayString=dayString.substring(0,1);  //use first character only if more than 8 days to avoid overlapping text
+                if (weekForecastList.size()>8) dayString=dayString.substring(0,1);  //use first character only if more than 8 days to avoid overlapping text
 
                 energyDataset.addBar(dayString, energyDay);
                 if (energyDay>energyMax) energyMax=energyDay;

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

@@ -42,7 +42,7 @@ public class CourseOfDayAdapter extends RecyclerView.Adapter<CourseOfDayAdapter.
         this.courseOfDayList = courseOfDayList;
         this.recyclerViewHeader=recyclerViewHeader;
         this.recyclerView=recyclerView;
-        if (courseOfDayList.size()!=0 && courseOfDayList.get(0)!=null) {
+        if (courseOfDayList!=null && courseOfDayList.size()!=0 && courseOfDayList.get(0)!=null) {
             this.courseOfDayHeaderDate = new Date(courseOfDayList.get(0).getLocalForecastTime(context));
         }else this.courseOfDayHeaderDate=new Date();  //fallback if no data available
     }
@@ -98,21 +98,16 @@ public class CourseOfDayAdapter extends RecyclerView.Adapter<CourseOfDayAdapter.
         if (sp.getBoolean("pref_debug",false)) {
             holder.diffuseRadiation.setVisibility(View.VISIBLE);
             holder.directRadiationNormal.setVisibility(View.VISIBLE);
-            holder.energyCum.setVisibility(View.VISIBLE);
         } else {
             holder.diffuseRadiation.setVisibility(View.GONE);
             holder.directRadiationNormal.setVisibility(View.GONE);
-            holder.energyCum.setVisibility(View.GONE);
         }
 
         holder.time.setText(StringFormatUtils.formatTimeWithoutZone(context, courseOfDayList.get(position).getLocalForecastTime(context)));
         holder.directRadiationNormal.setText(StringFormatUtils.formatInt(courseOfDayList.get(position).getDirectRadiationNormal()," W/qm"));
         holder.diffuseRadiation.setText(StringFormatUtils.formatInt(courseOfDayList.get(position).getDiffuseRadiation()," W/qm"));
-        holder.power.setText(StringFormatUtils.formatInt(courseOfDayList.get(position).getPower()," "+ context.getString(R.string.units_Wh)));
+        holder.power.setText(StringFormatUtils.formatInt(courseOfDayList.get(position).getPower(),context.getString(R.string.units_Wh)));
-        float energyCumulated=0;
+        holder.energyCum.setText("\u03a3\u200a"+StringFormatUtils.formatEnergyCum(context, courseOfDayList.get(position).getEnergyCum()));
-        for (int i=0; i<=position;i++)
-            energyCumulated+=courseOfDayList.get(i).getPower();
-        holder.energyCum.setText(StringFormatUtils.formatInt(energyCumulated," "+ context.getString(R.string.units_Wh)));
 
         updateRecyclerViewHeader();  //update header according to date in first visible item on the left
 
@@ -133,7 +128,7 @@ public class CourseOfDayAdapter extends RecyclerView.Adapter<CourseOfDayAdapter.
             HeaderTime.setTimeInMillis(courseOfDayList.get(visiblePosition).getLocalForecastTime(context));
             int headerday = HeaderTime.get(Calendar.DAY_OF_WEEK);
             headerday = StringFormatUtils.getDayLong(headerday);
-            recyclerViewHeader.setText(context.getResources().getString(headerday));
+            recyclerViewHeader.setText(context.getResources().getString(headerday) + " (" + StringFormatUtils.formatDate(courseOfDayList.get(visiblePosition).getLocalForecastTime(context)) + ")");
 
             courseOfDayHeaderDate=HeaderTime.getTime();
 
@@ -146,7 +141,8 @@ public class CourseOfDayAdapter extends RecyclerView.Adapter<CourseOfDayAdapter.
 
     @Override
     public int getItemCount() {
-        return courseOfDayList.size();
+        if (courseOfDayList==null) return 0;
+        else return courseOfDayList.size();
     }
 
     class CourseOfDayViewHolder extends RecyclerView.ViewHolder {

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

@@ -23,8 +23,6 @@ public class ItemViewHolder extends RecyclerView.ViewHolder {
     public TextView cellsMaxPower;
     public TextView cellsArea;
     public TextView cellsEfficiency;
-    public TextView cellsTempCoeff;
-    public TextView diffuseEfficiency;
     public TextView inverterPowerLimit;
     public TextView inverterEfficiency;
 
@@ -42,8 +40,6 @@ public class ItemViewHolder extends RecyclerView.ViewHolder {
         this.cellsMaxPower = (TextView) itemView.findViewById(R.id.city_cells_max_power);
         this.cellsArea = (TextView) itemView.findViewById(R.id.city_cells_area);
         this.cellsEfficiency = (TextView) itemView.findViewById(R.id.city_cells_efficiency);
-        this.cellsTempCoeff = (TextView) itemView.findViewById(R.id.city_cells_temp_coeff);
-        this.diffuseEfficiency = (TextView) itemView.findViewById(R.id.city_diffuse_efficiency);
         this.inverterPowerLimit = (TextView) itemView.findViewById(R.id.city_inverter_power_limit);
         this.inverterEfficiency = (TextView) itemView.findViewById(R.id.city_inverter_efficiency);
 

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

@@ -8,6 +8,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.google.android.material.snackbar.Snackbar;
+
 import org.woheller69.weather.R;
 import org.woheller69.weather.database.CityToWatch;
 import org.woheller69.weather.database.SQLiteHelper;
@@ -28,6 +30,7 @@ public class RecyclerOverviewListAdapter extends RecyclerView.Adapter<ItemViewHo
      */
     private Context context;
     private final List<CityToWatch> cities;
+    private RecyclerView rv;
 
     SQLiteHelper database;
 
@@ -49,6 +52,7 @@ public class RecyclerOverviewListAdapter extends RecyclerView.Adapter<ItemViewHo
     @Override
     public ItemViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_city_list, parent, false);
+        rv = (RecyclerView) parent;
         return new ItemViewHolder(view);
     }
 
@@ -63,9 +67,7 @@ public class RecyclerOverviewListAdapter extends RecyclerView.Adapter<ItemViewHo
         holder.tiltAngle.setText(context.getString(R.string.edit_location_hint_tilt) +": "+ cities.get(position).getTiltAngle());
         holder.cellsMaxPower.setText(context.getString(R.string.edit_location_hint_cells_max_power) +": "+ cities.get(position).getCellsMaxPower());
         holder.cellsEfficiency.setText(context.getString(R.string.edit_location_hint_cells_efficiency) +": "+ cities.get(position).getCellsEfficiency());
-        holder.cellsTempCoeff.setText(context.getString(R.string.edit_location_hint_cells_temp_coeff) +": "+ cities.get(position).getCellsTempCoeff());
         holder.cellsArea.setText(context.getString(R.string.edit_location_hint_cells_area) +": "+ cities.get(position).getCellsArea());
-        holder.diffuseEfficiency.setText(context.getString(R.string.edit_location_hint_diffuse_efficiency) +": "+ cities.get(position).getDiffuseEfficiency());
         holder.inverterPowerLimit.setText(context.getString(R.string.edit_location_hint_inverter_power_limit) +": "+ cities.get(position).getInverterPowerLimit());
         holder.inverterEfficiency.setText(context.getString(R.string.edit_location_hint_inverter_efficiency) +": "+ cities.get(position).getInverterEfficiency());
 
@@ -90,6 +92,17 @@ public class RecyclerOverviewListAdapter extends RecyclerView.Adapter<ItemViewHo
         database.deleteCityToWatch(city);
         cities.remove(position);
         notifyItemRemoved(position);
+
+        Snackbar.make(rv,context.getString(R.string.itemRemoved,city.getCityName()),Snackbar.LENGTH_LONG).setAction(context.getString(R.string.undo), new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                long id=database.addCityToWatch(city);
+                city.setId((int) id);
+                city.setCityId((int) id);  //use id also instead of city id as unique identifier
+                cities.add(position,city);
+                notifyItemInserted(position);
+            }
+        }).show();
     }
 
     /**
@@ -115,7 +128,7 @@ public class RecyclerOverviewListAdapter extends RecyclerView.Adapter<ItemViewHo
     public CityToWatch getCitytoWatch(int position){
         return cities.get(position);
     }
-    public void updateCity(CityToWatch cityToWatch, String cityName, float latitude, float longitude, float azimuth, float tilt, float cellsMaxPower, float cellsArea, float cellsEfficiency, float cellsTempCoeff, float diffuseEfficiency, float inverterPowerLimit, float inverterEfficiency, int[] shadingElevation, int[] shadingOpacity) {
+    public void updateCity(CityToWatch cityToWatch, String cityName, float latitude, float longitude, float azimuth, float tilt, float cellsMaxPower, float cellsArea, float cellsEfficiency, float cellsTempCoeff, float diffuseEfficiency, float albedo, float inverterPowerLimit, float inverterEfficiency, boolean isCentralInverter, int[] shadingElevation, int[] shadingOpacity) {
         cityToWatch.setCityName(cityName);
         cityToWatch.setLatitude(latitude);
         cityToWatch.setLongitude(longitude);
@@ -126,8 +139,10 @@ public class RecyclerOverviewListAdapter extends RecyclerView.Adapter<ItemViewHo
         cityToWatch.setCellsEfficiency(cellsEfficiency);
         cityToWatch.setCellsTempCoeff(cellsTempCoeff);
         cityToWatch.setDiffuseEfficiency(diffuseEfficiency);
+        cityToWatch.setAlbedo(albedo);
         cityToWatch.setInverterPowerLimit(inverterPowerLimit);
         cityToWatch.setInverterEfficiency(inverterEfficiency);
+        cityToWatch.setIsCentralInverter(isCentralInverter);
         cityToWatch.setShadingElevation(shadingElevation);
         cityToWatch.setShadingOpacity(shadingOpacity);
         database.updateCityToWatch(cityToWatch);

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

@@ -14,11 +14,13 @@ import android.widget.TextView;
 import org.woheller69.weather.R;
 import org.woheller69.weather.database.GeneralData;
 import org.woheller69.weather.database.SQLiteHelper;
+import org.woheller69.weather.database.WeekForecast;
 import org.woheller69.weather.ui.Help.StringFormatUtils;
 import org.woheller69.weather.ui.UiResourceProvider;
 
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 import java.util.TimeZone;
 
 /**
@@ -28,16 +30,16 @@ import java.util.TimeZone;
 public class WeekWeatherAdapter extends RecyclerView.Adapter<WeekWeatherAdapter.WeekForecastViewHolder> {
 
     private Context context;
-    private float[][] forecastData;
+    private List<WeekForecast> weekForecastList;
     private int cityID;
     private Date courseOfDayHeaderDate;
 
-    WeekWeatherAdapter(Context context, float[][] forecastData, int cityID) {
+    WeekWeatherAdapter(Context context, List<WeekForecast> weekForecastList, int cityID) {
         this.context = context;
         this.cityID = cityID;
-        this.forecastData = forecastData;
+        this.weekForecastList = weekForecastList;
-        if (forecastData!=null && forecastData.length!=0 && forecastData[0]!=null) {
+        if (weekForecastList!=null && !weekForecastList.isEmpty()) {
-            this.courseOfDayHeaderDate = new Date((long) forecastData[0][8]);  //init with date of first weekday
+            this.courseOfDayHeaderDate = new Date(weekForecastList.get(0).getLocalForecastTime(context));  //init with date of first weekday
         } else this.courseOfDayHeaderDate = new Date();  //fallback if no data available
     }
 
@@ -65,15 +67,14 @@ public class WeekWeatherAdapter extends RecyclerView.Adapter<WeekWeatherAdapter.
 
     @Override
     public void onBindViewHolder(WeekForecastViewHolder holder, int position) {
-        float[] dayValues = forecastData[position];
+        WeekForecast weekForecast = weekForecastList.get(position);
-        if (dayValues.length!=11) return;  //Fixes app crash if forecastData not yet ready.
 
         SQLiteHelper dbHelper = SQLiteHelper.getInstance(context);
         GeneralData generalData = dbHelper.getGeneralDataByCityId(cityID);
 
         Calendar forecastTime = Calendar.getInstance();
         forecastTime.setTimeZone(TimeZone.getTimeZone("GMT"));
-        forecastTime.setTimeInMillis((long) dayValues[8]);
+        forecastTime.setTimeInMillis(weekForecast.getLocalForecastTime(context));
 
         boolean isDay;
 
@@ -87,15 +88,15 @@ public class WeekWeatherAdapter extends RecyclerView.Adapter<WeekWeatherAdapter.
             isDay = true;
         }
 
-        setIcon((int) dayValues[9], holder.weather, isDay);
+        setIcon(weekForecast.getWeatherID(), holder.weather, isDay);
-        if (dayValues[4] == 0)
+        if (weekForecast.getEnergyDay() == 0)
             holder.power.setText("-");
         else
-            holder.power.setText(StringFormatUtils.formatDecimal(dayValues[4], context.getString(R.string.units_kWh)));
+            holder.power.setText(StringFormatUtils.formatDecimal(weekForecast.getEnergyDay(), context.getString(R.string.units_kWh)));
 
         Calendar c = Calendar.getInstance();
         c.setTimeZone(TimeZone.getTimeZone("GMT"));
-        c.setTimeInMillis((long) dayValues[8]);
+        c.setTimeInMillis(weekForecast.getLocalForecastTime(context));
         int day = c.get(Calendar.DAY_OF_WEEK);
 
         holder.day.setText(StringFormatUtils.getDayShort(day));
@@ -113,8 +114,8 @@ public class WeekWeatherAdapter extends RecyclerView.Adapter<WeekWeatherAdapter.
 
     @Override
     public int getItemCount() {
-    if (forecastData!=null)
+    if (weekForecastList!=null && !weekForecastList.isEmpty())
-        return forecastData.length;
+        return weekForecastList.size();
     else
         return 0;
     }

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;
 
@@ -128,19 +129,10 @@ public class WeatherCityFragment extends Fragment implements IUpdateableCityUI {
     }
 
     @Override
-    public void processNewForecasts(List<HourlyForecast> hourlyForecasts) {
+    public void processNewForecasts(List<HourlyForecast> hourlyForecasts, List<WeekForecast> weekForecasts) {
         if (hourlyForecasts != null && hourlyForecasts.size() > 0 && hourlyForecasts.get(0).getCity_id() == mCityId) {
             if (mAdapter != null) {
-                mAdapter.updateForecastData(hourlyForecasts);
+                mAdapter.updateForecastData(hourlyForecasts, weekForecasts);
-            }
-        }
-    }
-
-    @Override
-    public void processNewWeekForecasts(List<WeekForecast> forecasts) {
-        if (forecasts != null && forecasts.size() > 0 && forecasts.get(0).getCity_id() == mCityId) {
-            if (mAdapter != null) {
-                mAdapter.updateWeekForecastData(forecasts);
             }
         }
     }

app/src/main/java/org/woheller69/weather/ui/updater/IUpdateableCityUI.java

@@ -12,7 +12,6 @@ import java.util.List;
 public interface IUpdateableCityUI {
     void processNewGeneralData(GeneralData data);
 
-    void processNewForecasts(List<HourlyForecast> hourlyForecasts);
+    void processNewForecasts(List<HourlyForecast> hourlyForecasts, List<WeekForecast> weekForecasts);
 
-    void processNewWeekForecasts(List<WeekForecast> forecasts);
 }

app/src/main/java/org/woheller69/weather/ui/updater/ViewUpdater.java

@@ -31,17 +31,11 @@ public class ViewUpdater {
         }
     }
 
-    public static void updateWeekForecasts(List<WeekForecast> forecasts) {
-        ArrayList<IUpdateableCityUI> subcopy = new ArrayList<>(subscribers);
-        for (IUpdateableCityUI sub : subcopy) {
-            sub.processNewWeekForecasts(forecasts);
-        }
-    }
 
-    public static void updateForecasts(List<HourlyForecast> hourlyForecasts) {
+    public static void updateForecasts(List<HourlyForecast> hourlyForecasts, List<WeekForecast> weekForecasts) {
         ArrayList<IUpdateableCityUI> subcopy = new ArrayList<>(subscribers);
         for (IUpdateableCityUI sub : subcopy) {
-            sub.processNewForecasts(hourlyForecasts);
+            sub.processNewForecasts(hourlyForecasts, weekForecasts);
         }
     }
 }

app/src/main/java/org/woheller69/weather/ui/viewPager/WeatherPagerAdapter.java

@@ -118,14 +118,10 @@ public class WeatherPagerAdapter extends FragmentStateAdapter implements IUpdate
     }
 
     @Override
-    public void processNewForecasts(List<HourlyForecast> hourlyForecasts) {
+    public void processNewForecasts(List<HourlyForecast> hourlyForecasts, List<WeekForecast> weekForecasts) {
         //empty because Fragments are subscribers themselves
     }
 
-    @Override
-    public void processNewWeekForecasts(List<WeekForecast> forecasts) {
-        //empty because Fragments are subscribers themselves
-    }
 
     public int getCityIDForPos(int pos) {
             CityToWatch city = cities.get(pos);

app/src/main/java/org/woheller69/weather/weather_api/open_meteo/OMDataExtractor.java

@@ -69,12 +69,13 @@ public class OMDataExtractor implements IDataExtractor {
             JSONArray tempArray = jsonData.has("temperature_2m") ? jsonData.getJSONArray("temperature_2m") : null;
             JSONArray directRadiationArray = jsonData.has("direct_normal_irradiance") ? jsonData.getJSONArray("direct_normal_irradiance") : null;
             JSONArray diffuseRadiationArray = jsonData.has("diffuse_radiation") ? jsonData.getJSONArray("diffuse_radiation") : null;
+            JSONArray shortwaveRadiationArray = jsonData.has("shortwave_radiation") ? jsonData.getJSONArray("shortwave_radiation") : null;
 
             //TODO get Data for power plant from city to Watch
 
             SQLiteHelper dbhelper = SQLiteHelper.getInstance(context);
             CityToWatch city = dbhelper.getCityToWatch(cityID);
-            SolarPowerPlant spp = new SolarPowerPlant(city.getLatitude(), city.getLongitude(), city.getCellsMaxPower(), city.getCellsArea(), city.getCellsEfficiency(), city.getCellsTempCoeff(), city.getDiffuseEfficiency(), city.getInverterPowerLimit(), city.getInverterEfficiency(), city.getAzimuthAngle(), city.getTiltAngle(), city.getShadingElevation(), city.getShadingOpacity());
+            SolarPowerPlant spp = new SolarPowerPlant(city.getLatitude(), city.getLongitude(), city.getCellsMaxPower(), city.getCellsArea(), city.getCellsEfficiency(), city.getCellsTempCoeff(), city.getDiffuseEfficiency(), city.getInverterPowerLimit(), city.getInverterEfficiency(), city.isCentralInverter(), city.getAzimuthAngle(), city.getTiltAngle(), city.getShadingElevation(), city.getShadingOpacity(), city.getAlbedo());
 
 
             IApiToDatabaseConversion conversion = new OMToDatabaseConversion();
@@ -87,7 +88,8 @@ public class OMDataExtractor implements IDataExtractor {
                 if (weathercodeArray!=null && !weathercodeArray.isNull(i)) hourlyForecast.setWeatherID(conversion.convertWeatherCategory(weathercodeArray.getString(i)));
                 if (directRadiationArray!=null && !directRadiationArray.isNull(i)) hourlyForecast.setDirectRadiationNormal((float) directRadiationArray.getDouble(i));
                 if (diffuseRadiationArray!=null && !diffuseRadiationArray.isNull(i)) hourlyForecast.setDiffuseRadiation((float) diffuseRadiationArray.getDouble(i));
-                hourlyForecast.setPower(spp.getPower(hourlyForecast.getDirectRadiationNormal(), hourlyForecast.getDiffuseRadiation(), timeArray.getLong(i)-1800, ambientTemperature));  //use solar position 1/2h earlier for calculation of average power in preceding hour
+                if (shortwaveRadiationArray!=null && !shortwaveRadiationArray.isNull(i)) hourlyForecast.setShortwaveRadiation((float) shortwaveRadiationArray.getDouble(i));
+                hourlyForecast.setPower(spp.getPower(hourlyForecast.getDirectRadiationNormal(), hourlyForecast.getDiffuseRadiation(), hourlyForecast.getShortwaveRadiation(), timeArray.getLong(i)-1800, ambientTemperature));  //use solar position 1/2h earlier for calculation of average power in preceding hour
                 hourlyForecasts.add(hourlyForecast);
             }
             return hourlyForecasts;

app/src/main/java/org/woheller69/weather/weather_api/open_meteo/OMHttpRequest.java

@@ -19,13 +19,12 @@ import java.util.List;
 public class OMHttpRequest {
 
     protected String getUrlForQueryingOMweatherAPI(Context context, float lat, float lon) {
-        AppPreferencesManager prefManager =
+
-                new AppPreferencesManager(PreferenceManager.getDefaultSharedPreferences(context));
         SharedPreferences sharedPreferences=PreferenceManager.getDefaultSharedPreferences(context);
 
         return String.format(
-                "%sforecast?latitude=%s&longitude=%s&forecast_days=%s&hourly=temperature_2m,diffuse_radiation,direct_normal_irradiance,weathercode&daily=weathercode,sunrise,sunset,&timeformat=unixtime&timezone=auto",
+                "%sforecast?latitude=%s&longitude=%s&forecast_days=%s&hourly=temperature_2m,diffuse_radiation,direct_normal_irradiance,shortwave_radiation,weathercode&daily=weathercode,sunrise,sunset,&timeformat=unixtime&timezone=auto",
-                BuildConfig.BASE_URL,
+                sharedPreferences.getString("pref_OM_URL", BuildConfig.BASE_URL),
                 lat,
                 lon,
                 sharedPreferences.getInt("pref_number_days",7)

app/src/main/java/org/woheller69/weather/weather_api/open_meteo/ProcessOMweatherAPIRequest.java

@@ -141,8 +141,7 @@ public class ProcessOMweatherAPIRequest implements IProcessHttpRequest {
                 dbHelper.addWeekForecasts(weekforecasts);
 
                 if (c == CityIDList.size()-1) ViewUpdater.updateGeneralDataData(generalData); // Call Viewupdater if last (requested) city is updated
-                if (c == CityIDList.size()-1) ViewUpdater.updateWeekForecasts(weekforecasts);
+                if (c == CityIDList.size()-1) ViewUpdater.updateForecasts(hourlyforecasts, weekforecasts);
-                if (c == CityIDList.size()-1) ViewUpdater.updateForecasts(hourlyforecasts);
 
             } catch (JSONException e) {
                 e.printStackTrace();
@@ -194,17 +193,6 @@ public class ProcessOMweatherAPIRequest implements IProcessHttpRequest {
             }
         }
 
-        for (WeekForecast weekForecast: weekforecasts){
-            float totalEnergy = 0;
-            Long timeNoon = weekForecast.getForecastTime();
-            for (HourlyForecast hourlyForecast: hourlyforecasts){
-                if ((hourlyForecast.getForecastTime()>=timeNoon-12*3600*1000L) && (hourlyForecast.getForecastTime()< timeNoon + 12*3600*1000L)){
-                   totalEnergy+=hourlyForecast.getPower();
-                }
-            }
-            weekForecast.setEnergyDay(totalEnergy/1000);
-        }
-
         return weekforecasts;
     }
 

app/src/main/res/drawable/button_disabled.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <solid android:color="@color/middlegrey" />
-            <corners android:radius="6dp" />
-        </shape>
-    </item>
-</selector>

app/src/main/res/drawable/button_fullwidth.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <solid android:color="@color/blue" />
-            <corners android:radius="6dp" />
-        </shape>
-    </item>
-</selector>

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -13,14 +13,14 @@
         android:strokeColor="#00000000"
         android:fillType="evenOdd"/>
     <path
-        android:pathData="M3409,9504L1600,6178 4257,5943 6067,9270 3409,9504Z"
+        android:pathData="M3410,9505L1600,6178 4258,5943 6067,9270 3410,9505Z"
         android:strokeLineJoin="round"
         android:strokeWidth="28.222"
         android:fillColor="#192072"
         android:strokeColor="#00000000"
         android:fillType="evenOdd"/>
     <path
-        android:pathData="M6331,9246L4521,5920 7178,5686 8987,9012 6331,9246Z"
+        android:pathData="M6331,9246L4521,5920 7178,5686 8988,9012 6331,9246Z"
         android:strokeLineJoin="round"
         android:strokeWidth="28.222"
         android:fillColor="#192072"
@@ -34,21 +34,21 @@
         android:strokeColor="#00000000"
         android:fillType="evenOdd"/>
     <path
-        android:pathData="M5241,13000L3431,9674 6088,9439 7897,12766 5241,13000Z"
+        android:pathData="M5351,13078L3541,9752 6198,9517 8008,12844 5351,13078Z"
         android:strokeLineJoin="round"
         android:strokeWidth="28.222"
         android:fillColor="#192072"
         android:strokeColor="#00000000"
         android:fillType="evenOdd"/>
     <path
-        android:pathData="M8270,12810L6460,9484 9117,9250 10926,12576 8270,12810Z"
+        android:pathData="M8270,12811L6460,9484 9116,9250 10926,12575 8270,12811Z"
         android:strokeLineJoin="round"
         android:strokeWidth="28.222"
         android:fillColor="#192072"
         android:strokeColor="#00000000"
         android:fillType="evenOdd"/>
     <path
-        android:pathData="M11193,12552L9384,9226 12040,8991 13850,12318 11193,12552Z"
+        android:pathData="M11193,12553L9384,9226 12040,8991 13850,12318 11193,12553Z"
         android:strokeLineJoin="round"
         android:strokeWidth="28.222"
         android:fillColor="#192072"
@@ -61,6 +61,13 @@
         android:fillColor="#FFD550"
         android:strokeColor="#00000000"
         android:fillType="evenOdd"/>
+    <path
+        android:pathData="M6295,6466L7622,6937 7622,5994 6295,6466Z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="212"
+        android:fillColor="#00000000"
+        android:strokeColor="#000000"
+        android:fillType="evenOdd"/>
     <path
         android:pathData="M7251,8776L8523,8171 7856,7504 7251,8776Z"
         android:strokeLineJoin="round"
@@ -68,6 +75,13 @@
         android:fillColor="#FFD550"
         android:strokeColor="#00000000"
         android:fillType="evenOdd"/>
+    <path
+        android:pathData="M7251,8776L8523,8171 7856,7504 7251,8776Z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="212"
+        android:fillColor="#00000000"
+        android:strokeColor="#000000"
+        android:fillType="evenOdd"/>
     <path
         android:pathData="M9562,9733L10033,8405 9090,8405 9562,9733Z"
         android:strokeLineJoin="round"
@@ -75,6 +89,13 @@
         android:fillColor="#FFD550"
         android:strokeColor="#00000000"
         android:fillType="evenOdd"/>
+    <path
+        android:pathData="M9562,9733L10033,8405 9090,8405 9562,9733Z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="212"
+        android:fillColor="#00000000"
+        android:strokeColor="#000000"
+        android:fillType="evenOdd"/>
     <path
         android:pathData="M11872,8776L11267,7504 10600,8171 11872,8776Z"
         android:strokeLineJoin="round"
@@ -82,6 +103,13 @@
         android:fillColor="#FFD550"
         android:strokeColor="#00000000"
         android:fillType="evenOdd"/>
+    <path
+        android:pathData="M11872,8776L11267,7504 10600,8171 11872,8776Z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="212"
+        android:fillColor="#00000000"
+        android:strokeColor="#000000"
+        android:fillType="evenOdd"/>
     <path
         android:pathData="M12829,6466L11501,5994 11501,6937 12829,6466Z"
         android:strokeLineJoin="round"
@@ -89,6 +117,13 @@
         android:fillColor="#FFD550"
         android:strokeColor="#00000000"
         android:fillType="evenOdd"/>
+    <path
+        android:pathData="M12829,6466L11501,5994 11501,6937 12829,6466Z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="212"
+        android:fillColor="#00000000"
+        android:strokeColor="#000000"
+        android:fillType="evenOdd"/>
     <path
         android:pathData="M11872,4155L10600,4760 11267,5427 11872,4155Z"
         android:strokeLineJoin="round"
@@ -96,6 +131,13 @@
         android:fillColor="#FFD550"
         android:strokeColor="#00000000"
         android:fillType="evenOdd"/>
+    <path
+        android:pathData="M11872,4155L10600,4760 11267,5427 11872,4155Z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="212"
+        android:fillColor="#00000000"
+        android:strokeColor="#000000"
+        android:fillType="evenOdd"/>
     <path
         android:pathData="M9562,3199L9090,4526 10033,4526 9562,3199Z"
         android:strokeLineJoin="round"
@@ -103,6 +145,13 @@
         android:fillColor="#FFD550"
         android:strokeColor="#00000000"
         android:fillType="evenOdd"/>
+    <path
+        android:pathData="M9562,3199L9090,4526 10033,4526 9562,3199Z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="212"
+        android:fillColor="#00000000"
+        android:strokeColor="#000000"
+        android:fillType="evenOdd"/>
     <path
         android:pathData="M7251,4155L7856,5427 8523,4760 7251,4155Z"
         android:strokeLineJoin="round"
@@ -110,6 +159,13 @@
         android:fillColor="#FFD550"
         android:strokeColor="#00000000"
         android:fillType="evenOdd"/>
+    <path
+        android:pathData="M7251,4155L7856,5427 8523,4760 7251,4155Z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="212"
+        android:fillColor="#00000000"
+        android:strokeColor="#000000"
+        android:fillType="evenOdd"/>
     <path
         android:pathData="M11196,6466C11196,6753 11120,7034 10977,7283 10833,7531 10627,7737 10379,7881 10130,8024 9849,8100 9562,8100 9275,8100 8994,8024 8745,7881 8497,7737 8291,7531 8147,7283 8004,7034 7929,6753 7929,6466 7929,6179 8004,5898 8147,5649 8291,5401 8497,5195 8745,5051 8994,4908 9275,4833 9562,4833 9849,4832 10130,4908 10379,5051 10627,5195 10833,5401 10977,5649 11120,5898 11196,6179 11196,6466L11196,6466Z"
         android:strokeLineJoin="round"
@@ -117,5 +173,12 @@
         android:fillColor="#FFD550"
         android:strokeColor="#00000000"
         android:fillType="evenOdd"/>
+    <path
+        android:pathData="M11196,6466C11196,6753 11120,7034 10977,7283 10833,7531 10627,7737 10379,7881 10130,8024 9849,8100 9562,8100 9275,8100 8994,8024 8745,7881 8497,7737 8291,7531 8147,7283 8004,7034 7929,6753 7929,6466 7929,6179 8004,5898 8147,5649 8291,5401 8497,5195 8745,5051 8994,4908 9275,4833 9562,4833 9849,4832 10130,4908 10379,5051 10627,5195 10833,5401 10977,5649 11120,5898 11196,6179 11196,6466L11196,6466Z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="212"
+        android:fillColor="#00000000"
+        android:strokeColor="#000000"
+        android:fillType="evenOdd"/>
   </group>
 </vector>

app/src/main/res/drawable/ic_launcher_monochrome.xml

@@ -0,0 +1,48 @@
+<vector android:height="108dp" android:viewportHeight="16001"
+    android:viewportWidth="16001" android:width="108dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillType="evenOdd"
+        android:pathData="M8000,16000L0,16000 0,0 16000,0 16000,16000 8000,16000Z"
+        android:strokeColor="#00000000" android:strokeLineJoin="round" android:strokeWidth="28.222"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M7318,11319L6502,11400 5276,9110 6909,8949 8135,11239 7318,11319Z"
+        android:strokeColor="#192072" android:strokeLineJoin="round" android:strokeWidth="159"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M9294,11116L8477,11196 7250,8905 8884,8745 10111,11036 9294,11116Z"
+        android:strokeColor="#192072" android:strokeLineJoin="round" android:strokeWidth="159"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M11267,10936L10451,11017 9225,8727 10858,8566 12084,10856 11267,10936Z"
+        android:strokeColor="#192072" android:strokeLineJoin="round" android:strokeWidth="159"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M5958,8734L5141,8814 3914,6523 5547,6363 6775,8654 5958,8734Z"
+        android:strokeColor="#192072" android:strokeLineJoin="round" android:strokeWidth="159"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M7933,8529L7116,8610 5889,6319 7523,6158 8750,8449 7933,8529Z"
+        android:strokeColor="#192072" android:strokeLineJoin="round" android:strokeWidth="159"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M7006,7084L8012,7442 8012,6726 7006,7084Z"
+        android:strokeColor="#192072" android:strokeLineJoin="round" android:strokeWidth="282"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M7730,8837C8052,8684 8373,8530 8695,8378L8189,7872C8037,8194 7883,8515 7730,8837Z"
+        android:strokeColor="#192072" android:strokeLineJoin="round" android:strokeWidth="282"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M9483,9562C9602,9227 9721,8890 9841,8555L9125,8555C9244,8890 9364,9227 9483,9562Z"
+        android:strokeColor="#192072" android:strokeLineJoin="round" android:strokeWidth="282"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M11237,8837C11084,8515 10930,8194 10778,7872L10272,8378C10594,8530 10915,8684 11237,8837Z"
+        android:strokeColor="#192072" android:strokeLineJoin="round" android:strokeWidth="282"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M11962,7084C11627,6965 11290,6846 10955,6726L10955,7442C11290,7322 11627,7203 11962,7084Z"
+        android:strokeColor="#192072" android:strokeLineJoin="round" android:strokeWidth="282"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M11237,5331C10915,5484 10594,5638 10272,5790L10778,6296C10930,5974 11084,5653 11237,5331Z"
+        android:strokeColor="#192072" android:strokeLineJoin="round" android:strokeWidth="282"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M9483,4606L9125,5612 9841,5612 9483,4606Z"
+        android:strokeColor="#192072" android:strokeLineJoin="round" android:strokeWidth="282"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M7730,5331C7883,5653 8037,5974 8189,6296L8695,5790C8373,5638 8052,5484 7730,5331Z"
+        android:strokeColor="#192072" android:strokeLineJoin="round" android:strokeWidth="282"/>
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M10723,7084C10723,7301 10666,7515 10557,7703 10449,7892 10292,8049 10104,8157 9915,8266 9701,8323 9484,8323 9267,8323 9053,8266 8865,8157 8676,8049 8520,7892 8411,7703 8302,7515 8245,7301 8245,7084 8245,6867 8302,6653 8411,6465 8520,6276 8676,6120 8865,6011 9053,5902 9267,5845 9484,5845 9701,5845 9915,5902 10104,6011 10292,6120 10449,6276 10557,6465 10666,6653 10723,6867 10723,7084Z"
+        android:strokeColor="#192072" android:strokeLineJoin="round" android:strokeWidth="282"/>
+</vector>

app/src/main/res/drawable/rounded_corner.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#AAFFFFFF" />
+    <solid android:color="@color/lightgrey" />
 
     <padding
         android:left="3dp"

app/src/main/res/drawable/rounded_grey.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#AAFFFFFF" />
-    <stroke android:width="0dp"
-        android:color="#AAFFFFFF"
-        />
-    <padding
-        android:bottom="-3dp"
-        android:top="-3dp"
-        android:left="5dp"
-        android:right="5dp" />
-
-    <corners android:radius="7dp" />
-</shape>

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

@@ -14,7 +14,6 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    android:layout_marginTop="53dp"
     android:weightSum="1">
 
     <TextView

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
@@ -13,10 +12,15 @@
         android:layout_height="match_parent"
         android:fitsSystemWindows="true"
         tools:context=".activities.AboutActivity">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
-        <include layout="@layout/toolbar" />
+            <include layout="@layout/toolbar" />
 
-        <include layout="@layout/about" />
+            <include layout="@layout/about" />
+        </LinearLayout>
 
     </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
@@ -14,14 +13,20 @@
         android:fitsSystemWindows="true"
         tools:context=".activities.HelpActivity">
 
-        <include layout="@layout/toolbar" />
+        <LinearLayout
-
-        <WebView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/help"
-            android:layout_marginTop="53dp"
             android:layout_width="match_parent"
-            android:layout_height="fill_parent" />
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
+            <include layout="@layout/toolbar" />
+
+            <WebView
+                android:id="@+id/help"
+                android:padding="10dp"
+                android:layout_width="match_parent"
+                android:layout_height="fill_parent" />
+
+        </LinearLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <com.google.android.material.navigation.NavigationView

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_height="wrap_content"
-        android:layout_gravity="center_vertical">
+        android:layout_gravity="center_vertical"
-
+        android:background="@color/backgroundBlue">
 
         <TextView
-            android:id="@+id/card_overview_temperature"
+            android:id="@+id/card_overview_header"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
+            android:layout_marginStart="10dp"
-            android:layout_centerVertical="true"
+            android:layout_marginTop="10dp"
             android:layout_marginEnd="10dp"
-            android:background="@drawable/rounded_corner"
+            android:layout_marginBottom="10dp"
-            android:paddingLeft="7dp"
+            android:gravity="center"
-            android:paddingRight="7dp"
+            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" />
 
+
+        <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:textSize="15dp"
+            android:textColor="@color/colorPrimaryDark"
+            android:layout_marginEnd="10dp"
+            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>
-    <TextView
-        android:id="@+id/card_overview_sunrise_sunset"
-        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" />
 
 </androidx.cardview.widget.CardView>

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

@@ -17,10 +17,15 @@
         android:imeOptions="actionDone"
         android:maxLines="1"
         android:inputType="text" />
-
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#aad3df"
+        android:gravity="center"
+        android:text="Search powered by by Open-Meteo.com"/>
     <WebView
-             android:id="@+id/webViewAddLocation"
+        android:id="@+id/webViewAddLocation"
-             android:layout_width="match_parent"
+        android:layout_width="match_parent"
-            android:layout_height="200dp" />
+        android:layout_height="200dp" />
 
 </LinearLayout>

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -15,6 +15,7 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textStyle="bold"
         android:hint="@string/edit_location_hint_name"/>
     <androidx.appcompat.widget.AppCompatEditText
         android:id="@+id/EditLocation_Name"
@@ -24,6 +25,7 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textStyle="bold"
         android:hint="@string/edit_location_hint_latitude"/>
     <androidx.appcompat.widget.AppCompatEditText
         android:id="@+id/EditLocation_Lat"
@@ -34,6 +36,7 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textStyle="bold"
         android:hint="@string/edit_location_hint_longitude"/>
     <androidx.appcompat.widget.AppCompatEditText
         android:id="@+id/EditLocation_Lon"
@@ -44,7 +47,22 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textStyle="bold"
         android:hint="@string/edit_location_hint_azimuth"/>
+
+    <com.redinput.compassview.CompassView
+        android:id="@+id/EditLocation_Compass"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        app:backgroundColor="#FFFFFF"
+        app:showMarker="true"
+        app:markerColor="@color/colorAccent"
+        app:lineColor="#000000"
+        app:textColor="#000000"
+        app:textSize="12sp"
+        app:rangeDegrees="180.0"/>
+
     <androidx.appcompat.widget.AppCompatEditText
         android:id="@+id/EditLocation_Azimuth"
         android:layout_width="match_parent"
@@ -54,6 +72,7 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textStyle="bold"
         android:hint="@string/edit_location_hint_tilt"/>
     <androidx.appcompat.widget.AppCompatEditText
         android:id="@+id/EditLocation_Tilt"
@@ -64,6 +83,7 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textStyle="bold"
         android:hint="@string/edit_location_hint_cells_max_power"/>
     <androidx.appcompat.widget.AppCompatEditText
         android:id="@+id/EditLocation_Cell_Max_Power"
@@ -74,6 +94,7 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textStyle="bold"
         android:hint="@string/edit_location_hint_cells_area"/>
     <androidx.appcompat.widget.AppCompatEditText
         android:id="@+id/EditLocation_Cells_Area"
@@ -84,6 +105,7 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textStyle="bold"
         android:hint="@string/edit_location_hint_cells_efficiency"/>
     <androidx.appcompat.widget.AppCompatEditText
         android:id="@+id/EditLocation_Cell_Efficiency"
@@ -94,6 +116,7 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textStyle="bold"
         android:hint="@string/edit_location_hint_cells_temp_coeff"/>
     <androidx.appcompat.widget.AppCompatEditText
         android:id="@+id/EditLocation_Cell_Temp_Coeff"
@@ -104,6 +127,7 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textStyle="bold"
         android:hint="@string/edit_location_hint_diffuse_efficiency"/>
     <androidx.appcompat.widget.AppCompatEditText
         android:id="@+id/EditLocation_Diffuse_Efficiency"
@@ -114,6 +138,29 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textStyle="bold"
+        android:hint="@string/edit_location_hint_albedo"/>
+    <androidx.appcompat.widget.AppCompatEditText
+        android:id="@+id/EditLocation_Albedo"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inputType="numberDecimal"
+        android:hint="@string/edit_location_hint_albedo"/>
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textStyle="bold"
+        android:hint="@string/edit_location_hint_inverter_efficiency"/>
+    <androidx.appcompat.widget.AppCompatEditText
+        android:id="@+id/EditLocation_Inverter_Efficiency"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inputType="numberDecimal"
+        android:hint="@string/edit_location_hint_inverter_efficiency"/>
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textStyle="bold"
         android:hint="@string/edit_location_hint_inverter_power_limit"/>
     <androidx.appcompat.widget.AppCompatEditText
         android:id="@+id/EditLocation_Inverter_Power_Limit"
@@ -124,14 +171,12 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="@string/edit_location_hint_inverter_efficiency"/>
+        android:textStyle="bold"
-    <androidx.appcompat.widget.AppCompatEditText
+        android:hint="@string/edit_location_hint_central_inverter"/>
-        android:id="@+id/EditLocation_Inverter_Efficiency"
+    <CheckBox
+        android:id="@+id/EditLocation_Central_Inverter"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="wrap_content" />
-        android:inputType="numberDecimal"
-        android:hint="@string/edit_location_hint_inverter_efficiency"/>
-
     <LinearLayout
         android:id="@+id/edit_Location_shading"
         android:layout_width="match_parent"
@@ -141,9 +186,22 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:textStyle="bold"
             android:text="@string/edit_location_shading_heading"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:layout_marginBottom="10dp"/>
+        <TextView
+            android:paddingLeft="5px"
+            android:text="@string/action_sun_position"
+            android:textStyle="bold"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+        <TextView
+            android:id="@+id/edit_current_azi_ele"
+            android:paddingLeft="5px"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"/>
 
     </LinearLayout>
 </LinearLayout>

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

@@ -90,20 +90,11 @@
                 tools:visibility="visible" />
 
             <TextView
-                android:id="@+id/city_cells_temp_coeff"
+                android:id="@+id/city_inverter_efficiency"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:text="@string/edit_location_hint_cells_temp_coeff"
+                android:text="@string/edit_location_hint_inverter_efficiency"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                tools:visibility="visible" />
-
-            <TextView
-                android:id="@+id/city_diffuse_efficiency"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/edit_location_hint_diffuse_efficiency"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                 tools:visibility="visible" />
 
@@ -116,14 +107,6 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                 tools:visibility="visible" />
 
-            <TextView
-                android:id="@+id/city_inverter_efficiency"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/edit_location_hint_inverter_efficiency"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                tools:visibility="visible" />
 
         </LinearLayout>
 

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

@@ -57,7 +57,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="3dp"
-        android:text="xy Wh"
+        android:text="\u03a3\u200axy Wh"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textColor="@color/colorPrimaryDark" />
 

app/src/main/res/menu/activity_main_drawer.xml

@@ -36,6 +36,6 @@
         <item
             android:id="@+id/star_on_github"
             android:icon="@drawable/baseline_star_rate_24"
-            android:title="Star on GitHub" />
+            android:title="@string/github" />
     </group>
 </menu>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
 </adaptive-icon>

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

@@ -1,15 +1,15 @@
 <?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>
-    <string name="about_license_text">Diese App ist abgeleitet von Privacy Friendly Weather, entwickelt von der Forschungsgruppe SECUSO. Quelltext lizenziert unter GPLv3. Die App benutzt Icons von Google Material Design Icons, lizenziert unter Apache License Version 2.0, die Leaflet Bibliothek, lizenziert unter 2-clause BSD License, AutoSuggestTextViewAPICall, lizenziert unter der Apache License Version 2.0, Solarpositioning (net.e175.klaus:solarpositioning), lizenziert unter MIT Lizenz, Zip4j, lizenziert unter Apache License Version 2.0 und die WilliamChart Bibliothek (com.db.chart), lizenziert unter der Apache License Version 2.0</string>
+    <string name="about_license_text">Diese App ist abgeleitet von Privacy Friendly Weather, entwickelt von der Forschungsgruppe SECUSO. Quelltext lizenziert unter GPLv3. Die App benutzt Icons von Google Material Design Icons, lizenziert unter Apache License Version 2.0, die Leaflet Bibliothek, lizenziert unter 2-clause BSD License, AutoSuggestTextViewAPICall, lizenziert unter der Apache License Version 2.0, Solarpositioning (net.e175.klaus:solarpositioning), lizenziert unter MIT Lizenz, Zip4j, lizenziert unter Apache License Version 2.0, CompassView (https://github.com/kix2902/CompassView), lizenziert unter Apache License Version 2.0 und die WilliamChart Bibliothek (com.db.chart), lizenziert unter der Apache License Version 2.0</string>
     <string name="about_license">Lizenz</string>
     <string name="about_privacy_answer">solXpect benötigt nur Zugang zum Internet. Es werden weder persönliche Daten gesammelt, noch wird Werbung angezeigt.</string>
     <string name="about_where_from">Woher kommen die Wetterinformationen?</string>
     <string name="about_where_from_answer">Die Wetterinformationen stammen von</string>
     <string name="activity_about">Über</string>
+    <string name="version_number">Version</string>
     <string name="activity_weather">Vorhersage</string>
     <string name="activity_manage">Orte verwalten</string>
     <string name="activity_settings">Einstellungen</string>
@@ -21,7 +21,6 @@
     <string name="error_fetch_forecast">Es ist ein Fehler beim Abrufen der Wettervorhersage aufgetreten, bitte versuchen Sie es erneut!</string>
     <string name="error_no_city_selected">Sie haben keinen Ort ausgewählt. Wählen Sie \"Orte verwalten\" in der Navigation, um einen Ort auszuwählen.</string>
     <string name="dialog_add_add_button">Hinzufügen</string>
-    <string name="dialog_add_close_button">Schließen</string>
     <string name="dialog_add_label">Ort, der hinzugefügt werden soll:</string>
     <string name="dialog_add_no_city_found">Es wurde kein Ort gefunden, der der Eingabe entspricht. Es wird empfohlen, einen Eintrag aus dem Dropdown-Menu zu wählen.</string>
     <string name="navigation_drawer_close">Navigationsleiste schließen</string>
@@ -56,7 +55,7 @@
     <string name="sunday">Sonntag</string>
     <string name="chart">Diagramm</string>
     <string name="units_kWh">kWh</string>
-    <string name="dialog_edit_change_button">Ändern</string>
+    <string name="dialog_edit_change_button">Speichern</string>
     <string name="edit_location_hint_name">Name</string>
     <string name="settings_search">Suche</string>
     <string name="settings_darkmode">Android 10+ Dark Mode</string>
@@ -92,7 +91,7 @@
     <string name="edit_location_shading_opacity_heading">Abschattung unterhalb dieser Elevation [%]</string>
     <string name="edit_location_shading_heading">Abschattung</string>
     <string name="activity_help">Anleitung</string>
-    <string name="action_sun_position">Sonnenposition</string>
+    <string name="action_sun_position">Aktuelle Sonnenposition</string>
     <string name="action_sun_elevation">Elevation [°]</string>
     <string name="edit_location_hint_cells_temp_coeff">Temperaturkoeffizient [%/K]</string>
     <string name="activity_backuprestore">Sichern/Wiederherstellen</string>
@@ -105,6 +104,13 @@
     <string name="settings_summarize">Summe anzeigen</string>
     <string name="summary_summarize">Summiere die Werte aller Module mit gleichem Längen- und Breitengrad.</string>
     <string name="dialog_add_clone_button">Klonen</string>
-
+    <string name="itemRemoved">ENTFERNT:\u0020\u0020%s</string>
-
+    <string name="undo">WIEDERHERSTELLEN</string>
+    <string name="edit_location_hint_albedo">Albedo [0..1]</string>
+    <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

@@ -0,0 +1,117 @@
+<resources>
+    <string name="activity_about">Info</string>
+    <string name="activity_settings">Impostazioni</string>
+    <string name="activity_weather">Previsione</string>
+    <string name="activity_manage">Gestisci luoghi</string>
+    <string name="action_refresh">Ricarica</string>
+    <string name="navigation_drawer_open">Apri pannello di navigazione</string>
+    <string name="navigation_drawer_close">Chiudi pannello di navigazione</string>
+    <string name="next">Prossimo</string>
+    <string name="okay">OK</string>
+    <string name="slide1_heading">Benvenuto!</string>
+    <string name="slide1_text">solXpect prevede la produzione del tuo impianto fotovoltaico</string>
+    <string name="slide2_heading" translatable="false">Github</string>
+    <string name="slide2_text">Il codice sorgente di questa app è disponibile su GitHub. Ulteriori dettagli si trovano nella pagina Info.</string>
+    <string name="card_week_heading">Settimana</string>
+    <string name="card_error_heading">Errore nel recuperare i dati meteo</string>
+    <string name="card_error_content">Prova a aggiornare!</string>
+    <string name="about_privacy_heading">Privacy Info</string>
+    <string name="about">Info</string>
+    <string name="version_number">Versione</string>
+    <string name="about_license">Licenza</string>
+    <string name="about_license_text">Questa applicazione è derivata da Privacy Friendly Weather, sviluppata dal gruppo di ricerca SECUSO. Il codice sorgente è rilasciato con licenza GPLv3. L\u0027app usa icone da Google Material Design Icons distruite con licenza Apache License Version 2.0, inoltre usa le seguenti librerie: Leaflet con licenza 2-clause BSD License, AutoSuggestTextViewAPICall con licenza Apache License Version 2.0, Solarpositioning (net.e175.klaus:solarpositioning) con licenza MIT License, Zip4j (https://github.com/srikanth-lingala/zip4j) con licenza Apache License Version 2.0, CompassView (https://github.com/kix2902/CompassView) con licenza Apache License Version 2.0, and WilliamChart library (com.db.chart) con licenza Apache License Version 2.0</string>
+    <string name="about_more_info">Altre informazioni si possono trovare su:</string>
+    <string name="about_github" translatable="false"><a href="https://github.com/woheller69/solxpect">Github-Repo</a></string>
+    <string name="about_openmeteo" translatable="false"><a href="https://open-meteo.com">Open-Meteo \n(Attribution 4.0 International CC BY 4.0)</a></string>
+    <string name="activity_settings_title">Impostazioni</string>
+    <string name="abbreviation_monday">Lu.</string>
+    <string name="abbreviation_tuesday">Ma.</string>
+    <string name="abbreviation_wednesday">Me.</string>
+    <string name="abbreviation_thursday">Gio.</string>
+    <string name="abbreviation_friday">Ve.</string>
+    <string name="abbreviation_saturday">Sa.</string>
+    <string name="abbreviation_sunday">Do.</string>
+    <string name="dialog_add_label">Inserisci il luogo da aggiungere:</string>
+    <string name="dialog_add_no_city_found">Nessun luogo corrisponde al testo immesso. Si raccommanda di selezionare uno degli elementi dalla lista.</string>
+    <string name="dialog_add_add_button">Aggiungi</string>
+    <string name="error_convert_to_json">I dati meteo scaricati hanno un formato errato.</string>
+    <string name="error_no_internet">Il dispositivo non è collegato a internet</string>
+    <string name="error_fetch_forecast">Errore nell\u0027aggiornare le previsioni, riprova!</string>
+    <string name="error_no_city_selected">Nessun luogo selezionato. Per scegliere un luog va su \"Gestisci luoghi\".</string>
+    <string name="settings_interval_quarter">15 min</string>
+    <string name="settings_interval_half">30 min</string>
+    <string name="settings_interval_one">1 h</string>
+    <string name="settings_interval_two">2 h</string>
+    <string name="settings_interval_six">6 h</string>
+    <string name="settings_interval_twelve">12 h</string>
+    <string name="settings_interval_twentyfour">24 h</string>
+    <string name="settings_intervals">Intervalli</string>
+    <string name="settings_update_interval">Aggiorna intervalli</string>
+    <string name="settings_interval_summary">Imposta l\u0027intervallo di tempo per l\u0027aggionamento automatico</string>
+    <string name="about_privacy_answer">solXpect usa solo il permisso \"Internet\" per scaricare i dati meteo. Non include nessun meccanismo di tracciamento o pubblicitario.</string>
+    <string name="about_where_from">Da dove vengono scaricati i dati meteo?</string>
+    <string name="about_where_from_answer">I dati meteo vengono scaricati da</string>
+    <string name="long_press_text">Tenere premuto e trascinare per ordinare.</string>
+    <string name="swipe_to_delete">Passare il dito per eliminare</string>
+    <string name="settings_title_display_options">Opzioni di visualizzazione</string>
+    <string name="infoProvider">I dati meteo sono scaricati da Open-Meteo.com</string>
+    <string name="monday">Lunedì</string>
+    <string name="tuesday">Martedì</string>
+    <string name="wednesday">Mercoledì</string>
+    <string name="thursday">Giovedì</string>
+    <string name="friday">Venerdì</string>
+    <string name="saturday">Sabato</string>
+    <string name="sunday">Domenica</string>
+    <string name="chart">Grafico</string>
+    <string name="units_kWh">kWh</string>
+    <string name="dialog_edit_change_button">Salva</string>
+    <string name="edit_location_hint_name">Nome</string>
+    <string name="settings_search">Cerca</string>
+    <string name="settings_darkmode">Modalità scura per Android 10+</string>
+    <string name="settings_time24h">Ore in formato 24h</string>
+    <string name="summary_time24h">Sovrascrivi le impostazioni di sistema</string>
+    <string name="dialog_OK_button">OK</string>
+    <string name="dialog_NO_button">No</string>
+    <string name="dialog_Later_button">Forse dopo</string>
+    <string name="dialog_StarOnGitHub">Ti piace questa app? Per favore assegnale una stella su GitHub e regala un caffè allo sviluppatore con PayPal.</string>
+    <string name="slide3_heading">Open-Meteo</string>
+    <string name="settings_forecast_days">Numero di giorni nelle previsioni</string>
+    <string name="edit_location_hint_latitude">Latitudine [°]</string>
+    <string name="edit_location_hint_longitude">Longitudine [°]</string>
+    <string name="edit_location_hint_azimuth">Azimuth [°]</string>
+    <string name="edit_location_hint_tilt">Inclinazione [°]</string>
+    <string name="edit_location_hint_cells_max_power">Potenza di picco delle celle [W]</string>
+    <string name="edit_location_hint_cells_efficiency">Efficienza delle celle [%]</string>
+    <string name="edit_location_hint_cells_area">Area delle celle [m\u00b2]</string>
+    <string name="edit_location_hint_diffuse_efficiency">Efficienza da radiazione diffusa [%]</string>
+    <string name="edit_location_hint_inverter_power_limit">Potenza dell\u0027inverter [W]</string>
+    <string name="edit_location_hint_inverter_efficiency">Efficienza dell\u0027inverter [%]</string>
+    <string name="units_Wh">Wh</string>
+    <string name="edit_location_title">Modifica luogo</string>
+    <string name="edit_location_shading_azimuth_heading">Intervallo di Azimuth [°]</string>
+    <string name="edit_location_shading_solar_elevation_heading">Elevazione solare min. [°]</string>
+    <string name="edit_location_shading_opacity_heading">Ombra al di sotto di questa elevazione [%]</string>
+    <string name="edit_location_shading_heading">Ombreggiamento</string>
+    <string name="activity_help">Instruzioni</string>
+    <string name="action_sun_position">Posizione attuale del sole</string>
+    <string name="action_sun_elevation">Elevazione [°]</string>
+    <string name="edit_location_hint_cells_temp_coeff">Coefficiente di temperatura [%/K]</string>
+    <string name="activity_backuprestore">Backup/Ripristino</string>
+    <string name="backup_database">Backup database</string>
+    <string name="restore_database">Ripristina database</string>
+    <string name="permission_required">Permessi richiesti</string>
+    <string name="permission_message">%s deve accedere allo spazio di archiviazione esterno. Accetta i permessi e riprova.</string>
+    <string name="toast_delete">Cancella il file e riprova</string>
+    <string name="restore_database_message">Ripristina i dati dalla cartella Documenti. Apri la cartella \'Documenti\' e seleziona solXpect.zip se rchiesto!</string>
+    <string name="settings_summarize">Mostra somma</string>
+    <string name="summary_summarize">Somma i valori dei moduli con la stessa latitudine and longitudine.</string>
+    <string name="dialog_add_clone_button">Clona</string>
+    <string name="itemRemoved">RIMOSSO:\u0020\u0020%s</string>
+    <string name="undo">ANNULLA</string>
+    <string name="edit_location_hint_albedo">Albedo [0..1]</string>
+    <string name="github" translatable="false">GitHub</string>
+    <string name="settings_server_urls">Server URLs</string>
+    <string name="settings_server_summary">Cambia solo se vuoi ospitare un tuo server</string>
+    <string name="edit_location_hint_central_inverter">Invertitore centrale</string>
+
+</resources>

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

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorStatusBar">#181818</color>
     <color name="colorPrimary">#181818</color>
-    <color name="colorPrimaryDark">#666666</color>
+    <color name="colorPrimaryDark">#777777</color>
-    <color name="colorAccent">#707070</color>
+    <color name="colorAccent">#a0a0a0</color>
     <color name="colorListItem">#FFFFFF</color>
-    <color name="middlegrey">#A0A0A0</color>
+    <color name="middlegrey">#707070</color>
+    <color name="lightgrey">#BBFFFFFF</color>
     <color name="backgroundHighlight">#2A2A2A</color>
     <color name="white">#303030</color>
     <color name="red">#d01530</color>
@@ -17,7 +17,7 @@
     <color name="blue">#0274b2</color>
     <color name="lightblue">#1382d4</color>
     <color name="midblue">#1b5cd9</color>
-    <color name="backgroundBlue">#181818</color>
+    <color name="backgroundBlue">#080808</color>
     <color name="widgetBackground">#DD181818</color>
 </resources>
 

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

@@ -0,0 +1,112 @@
+<resources>
+    <string name="activity_about">Hakkında</string>
+    <string name="activity_settings">Ayarlar</string>
+    <string name="activity_weather">Tahmin</string>
+    <string name="activity_manage">Konumu yönet</string>
+    <string name="action_refresh">Yenile</string>
+    <string name="navigation_drawer_open">Navigasyon bölümünü aç</string>
+    <string name="navigation_drawer_close">Navigasyon bölümünü kapat</string>
+    <string name="next">Sıradaki</string>
+    <string name="okay">Tamam</string>
+    <string name="slide1_heading">Hoşgeldin!</string>
+    <string name="slide1_text">solXpect güneş enerjisi santralinizin üretimini tahmin eder</string>
+    <string name="slide2_text">Bu uygulamanın kaynak kodu GitHub\'da mevcuttur. Daha fazla açıklama için Hakkında Sayfası\'na bir göz atın.</string>
+    <string name="card_week_heading">Hafta</string>
+    <string name="card_error_heading">Hava durumu verisini getirirken hata oluştu</string>
+    <string name="card_error_content">Lütfen güncellemeyi deneyin!</string>
+    <string name="about_privacy_heading">Gizlilik Bilgisi</string>
+    <string name="about">Hakkında</string>
+    <string name="version_number">Sürüm</string>
+    <string name="about_license">Lisans</string>
+    <string name="about_license_text">Bu uygulama, SECUSO araştırma grubu tarafından geliştirilen Privacy Friendly Weather\'dan türetilmiştir. Kaynak kodu GPLv3 altında lisanslanmıştır. Uygulama, Apache Lisansı Sürüm 2.0 altında lisanslanan Google Material Design Icons, 2 maddelik BSD Lisansı altında lisanslanan Leaflet kütüphanesi, Apache Lisansı Sürüm 2.0 altında lisanslanan AutoSuggestTextViewAPICall, MIT Lisansı altında lisanslanan Solarpositioning (net.e175.klaus:solarpositioning), Zip4j (https://github. com/srikanth-lingala/zip4j) Apache Lisansı Sürüm 2.0 altında, CompassView (https://github.com/kix2902/CompassView) Apache Lisansı Sürüm 2.0 altında ve WilliamChart kütüphanesi (com.db.chart) Apache Lisansı Sürüm 2.0 altında lisanslanmıştır.</string>
+    <string name="about_more_info">Daha fazla bilgi için:</string>
+    <string name="activity_settings_title">Ayarlar</string>
+    <string name="abbreviation_monday">Pzt.</string>
+    <string name="abbreviation_tuesday">Sal.</string>
+    <string name="abbreviation_wednesday">Çrş.</string>
+    <string name="abbreviation_thursday">Perş.</string>
+    <string name="abbreviation_friday">Cum.</string>
+    <string name="abbreviation_saturday">Cts.</string>
+    <string name="abbreviation_sunday">Paz.</string>
+    <string name="dialog_add_label">Eklemek için konum girin:</string>
+    <string name="dialog_add_no_city_found">Girdiğiniz bilgilerle eşleşen bir konum bulunamadı. listedeki öğelerden birini seçebilirsiniz.  </string>
+    <string name="dialog_add_add_button">Ekle</string>
+    <string name="error_convert_to_json">Alınan hava durumu verileri iyi biçimlendirilmemiştir. </string>
+    <string name="error_no_internet">Cihazınız internete bağlı değil</string>
+    <string name="error_fetch_forecast">Tahmini güncellerken bir hata oluştu, tekrar deneyin!</string>
+    <string name="error_no_city_selected">Seçili bir konum yok. Bir konum seçmek için \"Konumları yönet\" bölümüne gidin.</string>
+    <string name="settings_interval_quarter">15 dk</string>
+    <string name="settings_interval_half">30 dk</string>
+    <string name="settings_interval_one">1 sa</string>
+    <string name="settings_interval_two">2 sa</string>
+    <string name="settings_interval_six">6 sa</string>
+    <string name="settings_interval_twelve">12 sa</string>
+    <string name="settings_interval_twentyfour">24 sa</string>
+    <string name="settings_intervals">Aralıklar</string>
+    <string name="settings_update_interval">Aralığı güncelle</string>
+    <string name="settings_interval_summary">Otomatik güncellemelerin aralığını ayarla</string>
+    <string name="about_privacy_answer">solXpect hava durumu verilerini almak için yalnızca \"İnternet\" iznini kullanır. Ayrıca herhangi bir izleme mekanizması veya reklam içermez.</string>
+    <string name="about_where_from">Hava durumu bilgileri nereden geliyor?</string>
+    <string name="about_where_from_answer">Hava durumu bilgilerinin alındığı yer</string>
+    <string name="long_press_text">Sıralamak için basılı tutun ve sürükleyin.</string>
+    <string name="swipe_to_delete">Silmek için kaydırın</string>
+    <string name="settings_title_display_options">Ekran seçenekleri</string>
+    <string name="infoProvider">Hava durumu bilgileri Open-Meteo.com\'dan çekilir</string>
+    <string name="monday">Pazartesi</string>
+    <string name="tuesday">Salı</string>
+    <string name="wednesday">Çarşamba</string>
+    <string name="thursday">Perşembe</string>
+    <string name="friday">Cuma</string>
+    <string name="saturday">Cumartesi</string>
+    <string name="sunday">Pazar</string>
+    <string name="chart">Grafik</string>
+    <string name="units_kWh">kWsa</string>
+    <string name="dialog_edit_change_button">Kaydet</string>
+    <string name="edit_location_hint_name">İsim</string>
+    <string name="settings_search">Ara</string>
+    <string name="settings_darkmode">Android 10+ Koyu Mod</string>
+    <string name="settings_time24h">24 saat formatı</string>
+    <string name="summary_time24h">Sistem ayarını geçersiz kıl</string>
+    <string name="dialog_OK_button">TAMAM</string>
+    <string name="dialog_NO_button">Hayır</string>
+    <string name="dialog_Later_button">Belki sonra</string>
+    <string name="dialog_StarOnGitHub">Bu uygulamayı beğendiniz mi? Lütfen GitHub\'da yıldız verin ve geliştiriciye PayPal ile bir kahve ısmarlayın.</string>
+    <string name="slide3_heading">Open-Meteo</string>
+    <string name="settings_forecast_days">Tahmin edilen gün sayısı</string>
+    <string name="edit_location_hint_latitude">Enlem [°]</string>
+    <string name="edit_location_hint_longitude">Boylam [°]</string>
+    <string name="edit_location_hint_azimuth">Azimut [°]</string>
+    <string name="edit_location_hint_tilt">Eğim [°]</string>
+    <string name="edit_location_hint_cells_max_power">Hücrelerin tepe gücü [W]</string>
+    <string name="edit_location_hint_cells_efficiency">Hücre verimliliği [%]</string>
+    <string name="edit_location_hint_cells_area">Hücre bölgesi [m\u00b2]</string>
+    <string name="edit_location_hint_diffuse_efficiency">Dağınık radyasyon verimliliği [%]</string>
+    <string name="edit_location_hint_inverter_power_limit">İnvertör gücü [W]</string>
+    <string name="edit_location_hint_inverter_efficiency">İnvertör verimliliği [%]</string>
+    <string name="units_Wh">Wh</string>
+    <string name="edit_location_title">Konumu düzenle</string>
+    <string name="edit_location_shading_azimuth_heading">Azimut menzili [°]</string>
+    <string name="edit_location_shading_solar_elevation_heading">Min. güneş yüksekliği [°]</string>
+    <string name="edit_location_shading_opacity_heading">Bu yüksekliğin altında gölgelendirme [%]</string>
+    <string name="edit_location_shading_heading">Gölgelendirme</string>
+    <string name="activity_help">Yönergeler</string>
+    <string name="action_sun_position">Güncel güneş konumu</string>
+    <string name="action_sun_elevation">Yükseklik [°]</string>
+    <string name="edit_location_hint_cells_temp_coeff">Sıcaklık katsayısı [%/K]</string>
+    <string name="activity_backuprestore">Yedekle/Geri Yükle</string>
+    <string name="backup_database">Yedekleme veritabanı</string>
+    <string name="restore_database">Geri Yükleme veritabanı</string>
+    <string name="permission_required">İzİn gerekli</string>
+    <string name="permission_message">%s harici depolama alanına erişmesi gerekiyor. Lütfen izni kabul edin ve tekrar deneyin.</string>
+    <string name="toast_delete">Lütfen dosyayı silin ve tekrar deneyin</string>
+    <string name="restore_database_message">Belgeler klasöründen Verileri Geri Yükleyin. Eğer gerekirse \'Belgeler\' klasörünü açın ve solXpect.zip dosyasını seçin!</string>
+    <string name="settings_summarize">Toplamı göster</string>
+    <string name="summary_summarize">Aynı enlem ve boylamdaki modüllerin değerlerini özetleyin.</string>
+    <string name="dialog_add_clone_button">Klon</string>
+    <string name="itemRemoved">\u0020\u0020%s KALDIRILDI</string>
+    <string name="undo">GERİ AL</string>
+    <string name="edit_location_hint_albedo">Albedo [0..1]</string>
+    <string name="settings_server_urls">Sunucu URL\'leri</string>
+    <string name="settings_server_summary">Yalnızca kendi sunucularınızı barındırmak istiyorsanız değiştirin</string>
+    <string name="edit_location_hint_central_inverter">Merkezi invertör</string>
+</resources>

app/src/main/res/values-v14/dimens.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!--
-Refer to App Widget Documentation for margin information
-http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
-    -->
-
-</resources>

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

@@ -1,14 +0,0 @@
-<resources>
-    <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:statusBarColor">@color/colorStatusBar</item>
-    </style>
-    <style name="AppTheme.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-    </style>
-</resources>

app/src/main/res/values-w820dp/dimens.xml

@@ -1,6 +0,0 @@
-<resources>
-    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
-         (such as screen margins) for screens with more than 820dp of available width. This
-         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
-    <dimen name="activity_horizontal_margin">64dp</dimen>
-</resources>

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,12 +1,12 @@
 <?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>
     <color name="colorListItem">#024265</color>
     <color name="backgroundHighlight">#5fa1d2</color>
     <color name="middlegrey">#A8A8A8</color>
+    <color name="lightgrey">#AAFFFFFF</color>
     <color name="white">#fafafa</color>
     <color name="red">#d01530</color>
     <color name="lightred">#fa7972</color>

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

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#aba4a4</color>
+    <color name="ic_launcher_background">#ABA4A4</color>
 </resources>

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>
@@ -18,9 +18,9 @@
     <string name="card_error_content">Please try to update!</string>
     <string name="about_privacy_heading">Privacy Info</string>
     <string name="about">About</string>
-    <string name="version_number" translatable="false">Version</string>
+    <string name="version_number">Version</string>
     <string name="about_license">License</string>
-    <string name="about_license_text">This application is derived from Privacy Friendly Weather, developed by the research group SECUSO. Sourcecode licensed under GPLv3. The app uses icons from Google Material Design Icons licensed under Apache License Version 2.0, the Leaflet library which is licensed under 2-clause BSD License, AutoSuggestTextViewAPICall which is licensed under Apache License Version 2.0, Solarpositioning (net.e175.klaus:solarpositioning) which is licensed under MIT License, Zip4j (https://github.com/srikanth-lingala/zip4j) which is licensed under Apache License Version 2.0, and WilliamChart library (com.db.chart) which is licensed under Apache License Version 2.0</string>
+    <string name="about_license_text">This application is derived from Privacy Friendly Weather, developed by the research group SECUSO. Sourcecode licensed under GPLv3. The app uses icons from Google Material Design Icons licensed under Apache License Version 2.0, the Leaflet library which is licensed under 2-clause BSD License, AutoSuggestTextViewAPICall which is licensed under Apache License Version 2.0, Solarpositioning (net.e175.klaus:solarpositioning) which is licensed under MIT License, Zip4j (https://github.com/srikanth-lingala/zip4j) which is licensed under Apache License Version 2.0, CompassView (https://github.com/kix2902/CompassView) which is licensed under Apache License Version 2.0, and WilliamChart library (com.db.chart) which is licensed under Apache License Version 2.0</string>
     <string name="about_more_info">More information can be found on:</string>
     <string name="about_github" translatable="false"><a href="https://github.com/woheller69/solxpect">Github-Repo</a></string>
     <string name="about_openmeteo" translatable="false"><a href="https://open-meteo.com">Open-Meteo \n(Attribution 4.0 International CC BY 4.0)</a></string>
@@ -34,7 +34,6 @@
     <string name="abbreviation_sunday">Su.</string>
     <string name="dialog_add_label">Enter the location to add:</string>
     <string name="dialog_add_no_city_found">No location was found that matches your input. It is recommended to select one of the items from the dropdown list.  </string>
-    <string name="dialog_add_close_button">Close</string>
     <string name="dialog_add_add_button">Add</string>
     <string name="error_convert_to_json">The retrieved weather data was not well-formed. </string>
     <string name="error_no_internet">Your Device is not connected to the Internet</string>
@@ -66,7 +65,7 @@
     <string name="sunday">Sunday</string>
     <string name="chart">Chart</string>
     <string name="units_kWh">kWh</string>
-    <string name="dialog_edit_change_button">Modify</string>
+    <string name="dialog_edit_change_button">Save</string>
     <string name="edit_location_hint_name">Name</string>
     <string name="settings_search">Search</string>
     <string name="settings_darkmode">Android 10+ Dark Mode</string>
@@ -95,7 +94,7 @@
     <string name="edit_location_shading_opacity_heading">Shading below this elevation [%]</string>
     <string name="edit_location_shading_heading">Shading</string>
     <string name="activity_help">Instructions</string>
-    <string name="action_sun_position">Sun position</string>
+    <string name="action_sun_position">Current sun position</string>
     <string name="action_sun_elevation">Elevation [°]</string>
     <string name="edit_location_hint_cells_temp_coeff">Temperature coefficient [%/K]</string>
     <string name="activity_backuprestore">Backup/Restore</string>
@@ -108,4 +107,14 @@
     <string name="settings_summarize">Show sum</string>
     <string name="summary_summarize">Summarize values of modules at the same latitude and longitude.</string>
     <string name="dialog_add_clone_button">Clone</string>
+    <string name="itemRemoved">REMOVED:\u0020\u0020%s</string>
+    <string name="undo">UNDO</string>
+    <string name="edit_location_hint_albedo">Albedo [0..1]</string>
+    <string name="github" translatable="false">GitHub</string>
+    <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/xml/pref_general.xml

@@ -51,4 +51,22 @@
             android:title="@string/settings_update_interval" />
     </PreferenceCategory>
 
+    <PreferenceCategory android:title="@string/settings_server_urls" android:summary="@string/settings_server_summary">
+        <EditTextPreference
+            android:title="Open-Meteo API"
+            android:key="pref_OM_URL"
+            android:defaultValue="https://api.open-meteo.com/v1/"
+            />
+        <EditTextPreference
+            android:title="OpenStreetMap API"
+            android:key="pref_OsmTiles_URL"
+            android:defaultValue="https://tile.openstreetmap.org/"
+            />
+        <EditTextPreference
+            android:title="Open-Meteo Geocoding API"
+            android:key="pref_OMGEO_URL"
+            android:defaultValue="https://geocoding-api.open-meteo.com/"
+            />
+    </PreferenceCategory>
+
 </PreferenceScreen>

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
@@ -23,6 +23,7 @@ allprojects {
             url 'https://maven.google.com/'
             name 'Google'
         }
+        maven { url 'https://jitpack.io' }
     }
     tasks.withType(JavaCompile) {
         options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"

fastlane/metadata/android/de-DE/full_description.txt

@@ -1,7 +1,6 @@
-solXpect prognostiziert den Ertrag Ihrer PV Anlage
+solXpect prognostiziert den Ertrag Ihrer Photovoltaikanlage (PV)
 
-Diese App nimmt direkte und diffuse Strahlungsdaten von Open-Meteo.com, berechnet die Position
+Diese App nimmt direkte und diffuse Strahlungsdaten von Open-Meteo.com, berechnet die Position der Sonne und projiziert die Strahlung auf Ihr Solarpanel.
-der Sonne und projiziert die Strahlung auf Ihr Solarpanel.
 Es zeigt die geschätzte Energieproduktion für die nächsten Stunden und bis zu 16 Tage an.
 
 Features:

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

@@ -0,0 +1,3 @@
+Offer UNDO operation when location is deleted
+Use cells peak power if cell area or efficiency = 0
+Improved check if device is online

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

@@ -0,0 +1,3 @@
+Take reflections into account
+Use better formula for diffuse efficiency
+Add compass to select azimuth angle

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

@@ -0,0 +1 @@
+Show cumulated values

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

@@ -0,0 +1,2 @@
+Show date in course of day header
+Bugfixes

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

@@ -0,0 +1,4 @@
+Upgrade for Android 13
+Support Dark Mode in Help Activity for Android 10+
+Slightly improve contrast in Dark Mode
+Add support for monochrome icon

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

@@ -0,0 +1,2 @@
+Improved icon
+Fix backup/restore for Android 13