Merge pull request #6 from delacrixmorgan/develop

v2.3.0 - Persistent Multiplier, Restructure

.gitignore

@@ -1,7 +1,12 @@
+
+# Created by https://www.gitignore.io/api/android
+# Edit at https://www.gitignore.io/?templates=android
+
 ### Android ###
 # Built application files
 *.apk
 *.ap_
+*.aab
 
 # Files for the ART/Dalvik VM
 *.dex
@@ -33,12 +38,23 @@ proguard/
 # Android Studio captures folder
 captures/
 
-# Intellij
+# IntelliJ
 *.iml
-.idea/*
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+.idea/caches
+# Android Studio 3 in .gitignore file.
+.idea/caches/build_file_checksums.ser
+.idea/modules.xml
 
 # Keystore files
-*.jks
+# Uncomment the following lines if you do not want to check your keystore files in.
+#*.jks
+#*.keystore
 
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
@@ -51,12 +67,28 @@ freeline.py
 freeline/
 freeline_project_description.json
 
-### Android Patch ###
-gen-external-apklibs
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
 
-.DS_STORE
+# Version control
+vcs.xml
 
-app/release
+# lint
+lint/intermediates/
+lint/generated/
+lint/outputs/
+lint/tmp/
+# lint/reports/
+
+### Android Patch ###
+gen-external-apklibs
+output.json
 
 # API Keys
-/data/src/main/res/values/secrets.xml
+/data/src/main/res/values/secrets.xml
+
+# End of https://www.gitignore.io/api/android

app/build.gradle

@@ -1,20 +1,21 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.google.firebase.firebase-perf'
-apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'androidx.navigation.safeargs.kotlin'
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    compileSdkVersion 28
     dataBinding {
         enabled = true
     }
     defaultConfig {
         applicationId "com.delacrixmorgan.squark"
         minSdkVersion 22
-        targetSdkVersion rootProject.ext.compileSdkVersion
-        versionCode 10
-        versionName "2.2.3"
+        targetSdkVersion 28
+        versionCode 11
+        versionName "2.3.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
@@ -36,31 +37,32 @@ android {
 dependencies {
     implementation project(':data')
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestImplementation 'androidx.test:runner:1.1.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.0.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0-beta02', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 
     testImplementation 'junit:junit:4.12'
 
-    implementation "com.google.firebase:firebase-core:$firebaseCoreVersion"
-    implementation "com.google.firebase:firebase-perf:$firebasePrefVersion"
-    implementation "com.google.android.material:material:$androidMaterialVersion"
+    implementation "com.google.firebase:firebase-core:16.0.9"
+    implementation "com.google.firebase:firebase-perf:17.0.2"
+    implementation "com.google.android.material:material:1.0.0"
 
-    implementation "androidx.appcompat:appcompat:$androidxAppcompatVersion"
-    implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion"
+    implementation "androidx.core:core-ktx:1.0.2"
+    implementation "androidx.fragment:fragment-ktx:1.0.0"
+    implementation "androidx.appcompat:appcompat:1.0.2"
+    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
 
-    implementation "org.parceler:parceler-api:$parcelerVersion"
-    implementation "io.reactivex.rxjava2:rxandroid:$rxJavaVersion"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    implementation "androidx.navigation:navigation-ui-ktx:2.0.0"
+    implementation "androidx.navigation:navigation-fragment-ktx:2.0.0"
 
-    annotationProcessor "org.parceler:parceler:$parcelerVersion"
-}
+    implementation "org.parceler:parceler-api:1.1.12"
+    implementation "io.reactivex.rxjava2:rxandroid:2.0.1"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
 
-repositories {
-    mavenCentral()
+    annotationProcessor "org.parceler:parceler:1.1.12"
 }
 
 apply plugin: 'com.google.gms.google-services'

app/src/main/AndroidManifest.xml

@@ -34,23 +34,11 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".country.CountryActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustPan">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="country"
-                    android:scheme="squark" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".CountryNavigationActivity"
+            android:name=".preference.PreferenceNavigationActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name="com.delacrixmorgan.squark.preference.credit.CreditActivity"
+            android:screenOrientation="portrait" />
     </application>
 </manifest>