Merge branch 'release/v0.2.0'

.gitignore

@@ -77,4 +77,8 @@ lint/intermediates/
 lint/generated/
 lint/outputs/
 lint/tmp/
-# lint/reports/
+# lint/reports/
+
+# json
+*.json
+StuDo_GP/

README.md

@@ -1,11 +1,12 @@
 # StuDo
 
-![Release](https://img.shields.io/badge/Release-v0.1.1-informational.svg?style=flat)
-![Android 6.0+](https://img.shields.io/badge/Android-6.0%2B-informational.svg)
+![Release](https://img.shields.io/badge/Release-v0.2.0-informational.svg?style=flat)
+![Android version](https://img.shields.io/badge/Android-7.0%2B-informational.svg)
 
 Android app for [StuDo](https://studo.rtuitlab.ru) –– the service for event organization and promotion inside RTU university
 
 ## APK download
+* [Download on Google Play](https://play.google.com/store/apps/details?id=ru.rtuitlab.studo)
 * [Download on GitHub](https://github.com/RTUITLab/StuDo-Android/releases)
 
 ## Building

app/build.gradle

@@ -4,14 +4,9 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 Properties properties = new Properties()
-def propertiesFile = project.rootProject.file('local.properties')
-if (propertiesFile.exists()) {
-    properties.load(propertiesFile.newDataInputStream())
-}
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
 def apiUrl = properties.getProperty('api.url')
-def appVersionCode = properties.getProperty('version.code')
 def defaultApiUrl = "https://studo.rtuitlab.ru/api/"
-def defaultAppVersionCode = "1.0.0"
 
 android {
     compileSdkVersion 29
@@ -26,54 +21,54 @@ android {
     }
 
     defaultConfig {
-        applicationId "com.rtuitlab.studo"
-        minSdkVersion 23
+        applicationId "ru.rtuitlab.studo"
+        minSdkVersion 24
         targetSdkVersion 29
         versionCode 1
-        versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        versionName "0.2.0"
     }
 
     buildTypes {
         debug {
             minifyEnabled false
-            buildConfigField ("String", "API_URL", apiUrl != null ? "\"$apiUrl\"" : "\"$defaultApiUrl\"")
-            buildConfigField ("String", "APP_VERSION_CODE", appVersionCode != null ? "\"$appVersionCode\"" : "\"$defaultAppVersionCode\"")
+            buildConfigField (
+                    "String", "API_URL",
+                    apiUrl != null ? "\"$apiUrl\"" : "\"$defaultApiUrl\""
+            )
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             debuggable true
         }
         release {
-            minifyEnabled false
-            buildConfigField ("String", "API_URL", apiUrl != null ? "\"$apiUrl\"" : "\"$defaultApiUrl\"")
-            buildConfigField ("String", "APP_VERSION_CODE", appVersionCode != null ? "\"$appVersionCode\"" : "\"$defaultAppVersionCode\"")
+            minifyEnabled true
+            shrinkResources true
+            buildConfigField (
+                    "String", "API_URL",
+                    apiUrl != null ? "\"$apiUrl\"" : "\"$defaultApiUrl\""
+            )
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 
-    dataBinding {
-        enabled = true
+    buildFeatures {
+        dataBinding true
     }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.2.0-beta01'
-    implementation 'com.google.android.material:material:1.2.0-alpha06'
-    implementation 'androidx.core:core-ktx:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.fragment:fragment-ktx:1.2.4'
+    implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'
+    implementation 'com.google.android.material:material:1.3.0-alpha03'
+    implementation 'androidx.core:core-ktx:1.3.2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
+    implementation 'androidx.fragment:fragment-ktx:1.3.0-beta01'
     implementation 'androidx.preference:preference-ktx:1.1.1'
-    testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01'
-    implementation 'androidx.fragment:fragment-ktx:1.3.0-alpha04'
+
+    // Kotlin
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
     // Coroutines
-    def coroutines_version = "1.3.4"
+    def coroutines_version = "1.3.9"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
 
@@ -83,16 +78,15 @@ dependencies {
     implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
 
     // Navigation
-    def nav_version = "2.3.0-alpha06"
+    def nav_version = "2.3.1"
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 
     // Lifecycle
-    def lifecycle_version = "2.3.0-alpha02"
+    def lifecycle_version = "2.3.0-beta01"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
 
     // Data Binding
     def binding_version = "3.1.4"
@@ -103,9 +97,6 @@ dependencies {
     implementation "org.koin:koin-android:$koin_version"
     implementation "org.koin:koin-core:$koin_version"
     implementation "org.koin:koin-androidx-viewmodel:$koin_version"
-    implementation "org.koin:koin-androidx-fragment:$koin_version"
-    implementation "org.koin:koin-androidx-scope:$koin_version"
-    implementation "org.koin:koin-androidx-ext:$koin_version"
 
     // Multiline collapsing toolbar
     def multiline_toolbar_version = "27.1.1"
@@ -122,4 +113,8 @@ dependencies {
     // Progress buttons
     def progress_buttons_version = "2.1.0"
     implementation "com.github.razir.progressbutton:progressbutton:$progress_buttons_version"
+
+    // LeakCanary
+    def leak_canary_version = "2.3"
+    debugImplementation "com.squareup.leakcanary:leakcanary-android:$leak_canary_version"
 }

app/proguard-rules.pro

@@ -19,3 +19,13 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+##---------------Begin: proguard configuration for Gson  ----------
+
+# Application classes that will be serialized/deserialized over Gson
+-keep class ru.rtuitlab.studo.server.auth.models.* { <fields>; }
+-keep class ru.rtuitlab.studo.server.general.ads.models.* { <fields>; }
+-keep class ru.rtuitlab.studo.server.general.resumes.models.* { <fields>; }
+-keep class ru.rtuitlab.studo.server.general.users.models.* { <fields>; }
+
+##---------------End: proguard configuration for Gson  ----------

app/src/main/AndroidManifest.xml

@@ -2,26 +2,28 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.rtuitlab.studo"
+    package="ru.rtuitlab.studo"
     android:hardwareAccelerated="true">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
-        android:name=".App"
+        android:name="ru.rtuitlab.studo.App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme.Launcher">
+        android:theme="@style/AppTheme.Launcher"
+        android:fullBackupContent="@xml/backup_descriptor">
         <activity
             android:name=".ui.auth.AuthActivity"
             android:theme="@style/AppTheme"
             android:screenOrientation="portrait"
             android:configChanges="keyboardHidden|orientation"
             tools:ignore="LockedOrientationActivity" />
-        <activity android:name=".ui.general.MainActivity"
+        <activity
+            android:name=".ui.general.MainActivity"
             android:windowSoftInputMode="adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />