Merge pull request #47 from mrgames13/beta

Release of version 3.4.5
chillibits · Jan 19, 2020 · 860cf06 · 860cf06
2 parents 8297917 + 0dcc33d
commit 860cf06
Show file tree

Hide file tree

Showing 178 changed files with 1,399 additions and 935 deletions.
diff --git a/.idea/copyright/Marc_Auberer.xml b/.idea/copyright/Marc_Auberer.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/README.md b/README.md
@@ -11,24 +11,24 @@ The Particulate Matter App is an app for visualizing and collecting particulate
 - Link your own sensor in the app
 - Visualize and analyze every sensor worldwide
 - Compare several (up to 15 in cluster mode) sensors in parallel
-- Have access to the [web version](https://pm.mrgames-server.de/) of the app (Also on GitHub: [https://github.com/mrgames13/feinstaub-app-web](https://github.com/mrgames13/feinstaub-app-web))
+- Have access to the [web version](https://pm.chillibits.com) of the app (Also on GitHub: [https://github.com/chillibits/particulate-matter-app-web](https://github.com/chillibits/particulate-matter-app-web))
 - Export graphs as well as data records
 - Export / backup your favorites and own sensors to a XML file
 - Push notification when a pm threshold exceeds
 - Push notification on a sensor breakdown
 - etc ...
 
 ## Screenshots (Android 10)
-<img src="https://github.com/mrgames13/feinstaub-app/raw/master/screenshots/1.png" width="256" title="Screenshot 1"><img src="https://github.com/mrgames13/feinstaub-app/raw/master/screenshots/2.png" width="256" title="Screenshot 2"><img src="https://github.com/mrgames13/feinstaub-app/raw/master/screenshots/3.png" width="256" title="Screenshot 3"><img src="https://github.com/mrgames13/feinstaub-app/raw/master/screenshots/4.png" width="256" title="Screenshot 4"><img src="https://github.com/mrgames13/feinstaub-app/raw/master/screenshots/5.png" width="256" title="Screenshot 5"><img src="https://github.com/mrgames13/feinstaub-app/raw/master/screenshots/6.png" width="256" title="Screenshot 6"><img src="https://github.com/mrgames13/feinstaub-app/raw/master/screenshots/7.png" width="768" title="Screenshot 7">
+<img src="https://github.com/chillibits/particulate-matter-app/raw/master/screenshots/1.png" width="256" title="Screenshot 1"><img src="https://github.com/chillibits/particulate-matter-app/raw/master/screenshots/2.png" width="256" title="Screenshot 2"><img src="https://github.com/chillibits/particulate-matter-app/raw/master/screenshots/3.png" width="256" title="Screenshot 3"><img src="https://github.com/chillibits/particulate-matter-app/raw/master/screenshots/4.png" width="256" title="Screenshot 4"><img src="https://github.com/chillibits/particulate-matter-app/raw/master/screenshots/5.png" width="256" title="Screenshot 5"><img src="https://github.com/chillibits/particulate-matter-app/raw/master/screenshots/6.png" width="256" title="Screenshot 6"><img src="https://github.com/chillibits/particulate-matter-app/raw/master/screenshots/7.png" width="768" title="Screenshot 7">
 
 
 ## Contribute to this project
 
 You can contribute to this project by doing following things:
 
 - If you want to contribute new features, please fork this repository to your own GitHub account. Then build your awesome feature and post a pull request back to this repo. We will check your changes and merge your contribution asap.
-- If you want to add a new translation language or improve an existing translation, please write an email to: [mrgames@outlook.de](mailto:mrgames@outlook.de&subject=Add%20translation)
-- If you want to submit a request for a new feature, please also write an email to: [mrgames@outlook.de](mailto:mrgames@outlook.de&subject=Feature%20request)
+- If you want to add a new translation language or improve an existing translation, please write an email to: [contact@chillibits.com](mailto:contact@chillibits.com&subject=Add%20translation)
+- If you want to submit a request for a new feature, please also write an email to: [contact@chillibits.com](mailto:contact@chillibits.com&subject=Feature%20request)
 
 ## Used third party libraries
 
@@ -46,6 +46,6 @@ Thanks to following people:
 - [android-gif-drawable](https://github.com/koral--/android-gif-drawable) by Karol Wrótniak
 - [FilePicker](https://github.com/TutorialsAndroid/FilePicker) by Akshay Sunil Masram
 
-Thanks to all contributers and translators!
+Thanks to all contributors and translators!
 
-© M&R Games 2017-2020 (Designed and developed by Marc Auberer from 2017 to 2020)
+© ChilliBits 2017-2020 (Designed and developed by Marc Auberer from 2017 to 2020)
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019 Marc Auberer. All rights reserved.
+ * Copyright © Marc Auberer 2020. All rights reserved
  */
 
 apply plugin: 'com.android.application'
@@ -14,8 +14,8 @@ android {
         applicationId "com.mrgames13.jimdo.feinstaubapp"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 3402
-        versionName "3.4.2"
+        versionCode 3405
+        versionName "3.4.5"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
     }
@@ -67,7 +67,7 @@ dependencies {
     implementation 'com.google.android.libraries.places:places:2.1.0'
     implementation 'com.google.maps.android:android-maps-utils:0.6.2'
     implementation 'com.google.zxing:core:3.4.0'
-    implementation 'com.google.firebase:firebase-database:19.2.0'
+    implementation 'com.google.firebase:firebase-database-ktx:19.2.0'
 
     // Ktor dependencies
     implementation "io.ktor:ktor-client-android:$ktor_version"
@@ -78,15 +78,15 @@ dependencies {
     implementation 'com.jjoe64:graphview:4.2.2'
     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.ChilliBits:splash-screen:1.1.1'
     implementation 'com.github.coyarzun89:fabtransitionactivity:0.2.0'
     implementation 'com.github.rtchagas:pingplacepicker:1.1.6'
     implementation 'eu.davidea:flipview:1.2.0'
     implementation 'com.miguelcatalan:materialsearchview:1.4.0'
     implementation 'com.journeyapps:zxing-android-embedded:4.0.0'
     implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19'
-    implementation 'com.github.TutorialsAndroid:FilePicker:v6.0.19'
+    implementation 'com.github.TutorialsAndroid:FilePicker:v7.0.19'
 }
 
 apply plugin: 'com.google.gms.google-services'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright © Marc Auberer 2020. 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"
@@ -29,7 +33,8 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:targetApi="q">
 
         <meta-data
             android:name="com.google.android.gms.version"
@@ -46,7 +51,7 @@
             android:required="false" />
         <!-- SplashActivity -->
         <activity
-            android:name=".ui.activity.SplashActivity"
+            android:name="com.chillibits.pmapp.ui.activity.SplashActivity"
             android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -56,22 +61,24 @@
         </activity>
         <!-- MainActivity -->
         <activity
-            android:name=".ui.activity.MainActivity"
+            android:name="com.chillibits.pmapp.ui.activity.MainActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustPan"
             android:configChanges="uiMode">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
             </intent-filter>
-            <intent-filter>
+            <intent-filter
+                android:autoVerify="true"
+                tools:targetApi="m">
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:host="feinstaub.mrgames-server.de"
+                    android:host="feinstaub.chillibits.com"
                     android:scheme="https" />
             </intent-filter>
             <intent-filter>
@@ -81,24 +88,24 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:host="pm.mrgames-server.de"
+                    android:host="pm.chillibits.com"
                     android:scheme="https" />
             </intent-filter>
         </activity>
         <!-- SettingsActivity -->
         <activity
-            android:name=".ui.activity.SettingsActivity"
+            android:name="com.chillibits.pmapp.ui.activity.SettingsActivity"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan"/>
+            android:windowSoftInputMode="adjustPan" />
         <!-- DiagramActivity -->
         <activity
-            android:name=".ui.activity.DiagramActivity"
+            android:name="com.chillibits.pmapp.ui.activity.DiagramActivity"
             android:screenOrientation="landscape"
             android:theme="@style/Theme.AppCompat.DayNight.NoActionBar.Fullscreen"
             android:windowSoftInputMode="adjustPan" />
         <!-- SensorActivity -->
         <activity
-            android:name=".ui.activity.SensorActivity"
+            android:name="com.chillibits.pmapp.ui.activity.SensorActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustPan">
@@ -109,9 +116,9 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:host="feinstaub.mrgames-server.de"
-                    android:pathPattern="/sensor"
-                    android:scheme="https" />
+                    android:host="feinstaub.chillibits.com"
+                    android:scheme="https"
+                    android:pathPattern="/sensor" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -120,31 +127,31 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:host="pm.mrgames-server.de"
-                    android:pathPattern="/sensor"
-                    android:scheme="https" />
+                    android:host="pm.chillibits.com"
+                    android:scheme="https"
+                    android:pathPattern="/sensor" />
             </intent-filter>
         </activity>
         <!-- AddSensorActivity -->
         <activity
-            android:name=".ui.activity.AddSensorActivity"
+            android:name="com.chillibits.pmapp.ui.activity.AddSensorActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustPan" />
         <!-- CompareActivity -->
         <activity
-            android:name=".ui.activity.CompareActivity"
+            android:name="com.chillibits.pmapp.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="android:screenOrientation"/>
+            tools:replace="android:screenOrientation" />
         <!-- WidgetConfigurationActivity -->
         <activity
-            android:name=".ui.activity.WidgetConfigurationActivity"
+            android:name="com.chillibits.pmapp.ui.activity.WidgetConfigurationActivity"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustPan">
             <intent-filter>
@@ -153,15 +160,14 @@
         </activity>
         <!-- SyncService -->
         <service
-            android:name=".service.SyncJobService"
+            android:name="com.chillibits.pmapp.service.SyncJobService"
             android:enabled="true"
             android:exported="true"
             android:permission="android.permission.BIND_JOB_SERVICE" />
-        <service android:name=".service.SyncService" />
         <!-- WebRealtimeSyncService -->
-        <service android:name=".service.WebRealtimeSyncService" />
+        <service android:name="com.chillibits.pmapp.service.WebRealtimeSyncService" />
         <!-- BootCompletedReceiver -->
-        <receiver android:name=".tool.BootCompletedReceiver">
+        <receiver android:name="com.chillibits.pmapp.tool.BootCompletedReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
@@ -172,7 +178,7 @@
         <!-- ContentProviderExport -->
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="com.mrgames13.jimdo.feinstaubapp"
+            android:authorities="com.chillibits.pmapp"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
@@ -181,7 +187,7 @@
         </provider>
         <!-- HomeScreen Widget -->
         <receiver
-            android:name=".widget.WidgetProvider"
+            android:name="com.chillibits.pmapp.widget.WidgetProvider"
             android:label="@string/widget_label">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -192,5 +198,4 @@
                 android:resource="@xml/widget_info" />
         </receiver>
     </application>
-
 </manifest>
diff --git a/app/src/main/gen/com/mrgames13/jimdo/feinstaubapp/BuildConfig.kt b/app/src/main/gen/com/mrgames13/jimdo/feinstaubapp/BuildConfig.kt
@@ -1,6 +1,10 @@
+/*
+ * Copyright © Marc Auberer 2020. All rights reserved
+ */
+
 /*___Generated_by_IDEA___*/
 
-package com.mrgames13.jimdo.feinstaubapp
+package com.chillibits.pmapp
 
 /* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
 object BuildConfig {

diff --git a/app/src/main/gen/com/mrgames13/jimdo/feinstaubapp/Manifest.kt b/app/src/main/gen/com/mrgames13/jimdo/feinstaubapp/Manifest.kt
@@ -1,6 +1,10 @@
+/*
+ * Copyright © Marc Auberer 2020. All rights reserved
+ */
+
 /*___Generated_by_IDEA___*/
 
-package com.mrgames13.jimdo.feinstaubapp
+package com.chillibits.pmapp
 
 /* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
 class Manifest
diff --git a/app/src/main/gen/com/mrgames13/jimdo/feinstaubapp/R.kt b/app/src/main/gen/com/mrgames13/jimdo/feinstaubapp/R.kt
@@ -1,6 +1,10 @@
+/*
+ * Copyright © Marc Auberer 2020. All rights reserved
+ */
+
 /*___Generated_by_IDEA___*/
 
-package com.mrgames13.jimdo.feinstaubapp
+package com.chillibits.pmapp
 
 /* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
 class R
diff --git a/...13/jimdo/feinstaubapp/model/DataRecord.kt → .../com/chillibits/pmapp/model/DataRecord.kt b/...13/jimdo/feinstaubapp/model/DataRecord.kt → .../com/chillibits/pmapp/model/DataRecord.kt
@@ -1,10 +1,10 @@
 /*
- * Copyright © 2019 Marc Auberer. All rights reserved.
+ * Copyright © Marc Auberer 2020. All rights reserved
  */
 
-package com.mrgames13.jimdo.feinstaubapp.model
+package com.chillibits.pmapp.model
 
-import com.mrgames13.jimdo.feinstaubapp.ui.activity.SensorActivity
+import com.chillibits.pmapp.ui.activity.SensorActivity
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.StringDescriptor
 import java.util.*

diff --git a/...imdo/feinstaubapp/model/ExternalSensor.kt → .../chillibits/pmapp/model/ExternalSensor.kt b/...imdo/feinstaubapp/model/ExternalSensor.kt → .../chillibits/pmapp/model/ExternalSensor.kt
@@ -1,8 +1,8 @@
 /*
- * Copyright © 2019 Marc Auberer. All rights reserved.
+ * Copyright © Marc Auberer 2020. All rights reserved
  */
 
-package com.mrgames13.jimdo.feinstaubapp.model
+package com.chillibits.pmapp.model
 
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.StringDescriptor
@@ -44,4 +44,4 @@ data class ExternalSensorCompressed (
     val i: String,
     val l: Double,
     val b: Double
-)
+)
diff --git a/app/src/main/java/com/chillibits/pmapp/model/Highscore.kt b/app/src/main/java/com/chillibits/pmapp/model/Highscore.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright © Marc Auberer 2020. All rights reserved
+ */
+
+package com.chillibits.pmapp.model
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Highscore (
+    val country: String,
+    val city: String,
+    val sensors: Int
+)
+
+@Serializable
+data class HighScoreList (
+    val items: List<Highscore>
+)
diff --git a/...ames13/jimdo/feinstaubapp/model/Sensor.kt → ...java/com/chillibits/pmapp/model/Sensor.kt b/...ames13/jimdo/feinstaubapp/model/Sensor.kt → ...java/com/chillibits/pmapp/model/Sensor.kt
@@ -1,8 +1,8 @@
 /*
- * Copyright © 2019 Marc Auberer. All rights reserved.
+ * Copyright © Marc Auberer 2020. All rights reserved
  */
 
-package com.mrgames13.jimdo.feinstaubapp.model
+package com.chillibits.pmapp.model
 
 import java.io.Serializable