Merge pull request #35 from mrgames13/release-candidate

Release of version 3.4.0
chillibits · Nov 22, 2019 · af0b684 · af0b684
2 parents 667f136 + a6e70a2
commit af0b684
Show file tree

Hide file tree

Showing 126 changed files with 3,432 additions and 2,725 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,3 +1,4 @@
 # These are supported funding model platforms
 
 github: [mrgames13]
+custom: ["https://www.paypal.me/marcauberer"]
diff --git a/.gitignore b/.gitignore
@@ -11,7 +11,7 @@
 
 # Generated files
 bin/
-#gen/
+gen/
 out/
 #  Uncomment the following line in case you need and you don't have the release build type files in your app
 # release/

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Feinstaub-App
 
-This is the App-Code for the Particulate Matter App.
+This is the official app code for the Particulate Matter App, written in Kotlin.
 
 To help us translating the app, please send an email to mrgames@outlook.de
 
-© M&R Games 2017-2019 (Designed and developed by Marc Auberer from 2017 to 2019)
+© M&R Games 2017-2019 (Designed and developed by Marc Auberer from 2017 to 2019)
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,15 +5,17 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlinx-serialization'
 
 android {
     compileSdkVersion 29
+    buildToolsVersion "29.0.2"
     defaultConfig {
         applicationId "com.mrgames13.jimdo.feinstaubapp"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 3301
-        versionName "3.3.1"
+        versionCode 3400
+        versionName "3.4.0"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
     }
@@ -23,18 +25,20 @@ android {
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
-        debug {
-            minifyEnabled true
-            shrinkResources true
-        }
     }
-    lintOptions {
+    /*lintOptions {
         abortOnError false
-    }
+    }*/
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+    packagingOptions {
+        pickFirst 'META-INF/*'
+    }
 }
 
 repositories {
@@ -48,34 +52,38 @@ repositories {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.2.0-beta02'
-    implementation "androidx.preference:preference-ktx:1.1.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation 'androidx.palette:palette:1.0.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.13.0'
+    implementation 'androidx.core:core-ktx:1.2.0-beta02'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.preference:preference:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta3'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0-rc01'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.palette:palette:1.0.0'
     implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.google.android.material:material:1.2.0-alpha01'
     implementation 'com.jjoe64:graphview:4.2.2'
-    implementation 'com.github.turing-tech:MaterialScrollBar:13.3.0'
+    implementation 'com.github.turing-tech:MaterialScrollBar:13.3.2'
     implementation 'net.margaritov.preference.colorpicker.ColorPickerPreference:ColorPickerPreference:1.0.0'
     implementation 'com.github.mrgames13:SplashScreen:1.1.0'
     implementation 'com.github.coyarzun89:fabtransitionactivity:0.2.0'
     implementation 'com.google.android.gms:play-services-maps:17.0.0'
     implementation 'com.google.android.libraries.places:places:2.1.0'
-    implementation 'com.github.rtchagas:pingplacepicker:1.1.0'
+    implementation 'com.github.rtchagas:pingplacepicker:1.1.5'
     implementation 'com.google.maps.android:android-maps-utils:0.6.2'
     implementation 'eu.davidea:flipview:1.2.0'
     implementation 'com.miguelcatalan:materialsearchview:1.4.0'
     implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
     implementation 'com.google.zxing:core:3.4.0'
     implementation 'com.google.firebase:firebase-database:19.2.0'
-    implementation 'com.squareup.okhttp3:okhttp:3.12.5' // 3.12.5
     implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
     implementation 'com.github.angads25:filepicker:1.1.1'
+    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19'
+    implementation "io.ktor:ktor-client-android:$ktor_version"
+    implementation "io.ktor:ktor-client-json-jvm:$ktor_version"
+    implementation "io.ktor:ktor-client-serialization-jvm:$ktor_version"
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright © 2019 Marc Auberer. All rights reserved.
-  -->
-
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.mrgames13.jimdo.feinstaubapp"
@@ -24,11 +20,12 @@
 
     <application
         android:allowBackup="true"
+        android:fullBackupContent="false"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        tools:ignore="InnerclassSeparator"
         android:theme="@style/AppTheme">
 
         <meta-data
@@ -44,22 +41,23 @@
         <uses-library
             android:name="org.apache.http.legacy"
             android:required="false" />
-
         <!-- SplashActivity -->
         <activity
-            android:name=".App.SplashActivity"
+            android:name=".ui.activity.SplashActivity"
             android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <!-- MainActivity -->
         <activity
-            android:name=".App.MainActivity"
+            android:name=".ui.activity.MainActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan">
+            android:windowSoftInputMode="adjustPan"
+            android:configChanges="uiMode">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
             </intent-filter>
@@ -70,8 +68,8 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:scheme="https"
-                    android:host="feinstaub.mrgames-server.de" />
+                    android:host="feinstaub.mrgames-server.de"
+                    android:scheme="https" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -80,24 +78,24 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:scheme="https"
-                    android:host="pm.mrgames-server.de" />
+                    android:host="pm.mrgames-server.de"
+                    android:scheme="https" />
             </intent-filter>
         </activity>
         <!-- SettingsActivity -->
         <activity
-            android:name=".App.SettingsActivity"
+            android:name=".ui.activity.SettingsActivity"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan"/>
         <!-- DiagramActivity -->
         <activity
-            android:name=".App.DiagramActivity"
+            android:name=".ui.activity.DiagramActivity"
             android:screenOrientation="landscape"
             android:theme="@style/Theme.AppCompat.DayNight.NoActionBar.Fullscreen"
             android:windowSoftInputMode="adjustPan" />
         <!-- SensorActivity -->
         <activity
-            android:name=".App.SensorActivity"
+            android:name=".ui.activity.SensorActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustPan">
@@ -108,9 +106,9 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:scheme="https"
                     android:host="feinstaub.mrgames-server.de"
-                    android:pathPattern="/sensor" />
+                    android:pathPattern="/sensor"
+                    android:scheme="https" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -119,31 +117,31 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:scheme="https"
                     android:host="pm.mrgames-server.de"
-                    android:pathPattern="/sensor" />
+                    android:pathPattern="/sensor"
+                    android:scheme="https" />
             </intent-filter>
         </activity>
         <!-- AddSensorActivity -->
         <activity
-            android:name=".App.AddSensorActivity"
+            android:name=".ui.activity.AddSensorActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustPan" />
         <!-- CompareActivity -->
         <activity
-            android:name=".App.CompareActivity"
+            android:name=".ui.activity.CompareActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustPan" />
         <!-- QR-Code Scanner -->
         <activity
             android:name="com.journeyapps.barcodescanner.CaptureActivity"
             android:screenOrientation="fullSensor"
-            tools:replace="screenOrientation" />
+            tools:replace="android:screenOrientation"/>
         <!-- WidgetConfigurationActivity -->
         <activity
-            android:name=".WidgetComponents.WidgetConfigurationActivity"
+            android:name=".ui.activity.WidgetConfigurationActivity"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustPan">
             <intent-filter>
@@ -152,15 +150,15 @@
         </activity>
         <!-- SyncService -->
         <service
-            android:name=".Services.SyncJobService"
+            android:name=".service.SyncJobService"
             android:enabled="true"
             android:exported="true"
             android:permission="android.permission.BIND_JOB_SERVICE" />
-        <service android:name=".Services.SyncService" />
+        <service android:name=".service.SyncService" />
         <!-- WebRealtimeSyncService -->
-        <service android:name=".Services.WebRealtimeSyncService" />
+        <service android:name=".service.WebRealtimeSyncService" />
         <!-- BootCompletedReceiver -->
-        <receiver android:name=".BroadcastReceivers.BootCompletedReceiver">
+        <receiver android:name=".tool.BootCompletedReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
@@ -180,7 +178,7 @@
         </provider>
         <!-- HomeScreen Widget -->
         <receiver
-            android:name=".WidgetComponents.WidgetProvider"
+            android:name=".widget.WidgetProvider"
             android:label="@string/widget_label">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -191,4 +189,5 @@
                 android:resource="@xml/widget_info" />
         </receiver>
     </application>
+
 </manifest>
diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png