Release/3.3.1 (#110)

* Bump to 3.0.3 (#99) (cherry picked from commit fd10937) * Update docs (cherry picked from commit 018adae) * Update actions (cherry picked from commit 09a21d8) * Update actions (cherry picked from commit 5d539a1) * Set theme jekyll-theme-slate (cherry picked from commit e5af85e) * Set theme jekyll-theme-minimal (cherry picked from commit f63752c) * Change privacy police uri (#100) * Feature/exams UI (#102) * Fix icon badges * Update all schedules test * Update all schedules test * Dont throw exception if employee department is null * Load only exams for zaoch groups * Load only exams for part time groups * Move part-time classes to separate menu category * Change employee placeholder * Fix weeks for employees * Show dialog only in resumed state * Fix week numbers fetch * Split hints for exams and lessons * Small design fixes * Small design fixes * Small design fixes * Reformat code * Add exceptions to Analytics * Add Flurry analytics * Add Flurry * Add Flurry * Add Flurry * Code refactoring * Code refactoring * Code refactoring * Code refactoring * Code refactoring * Fix widget crash * Fix widget crash * Code refactoring * Fix rate app dialog displaying * Fix update dialog analytics * Add lesson types enum * Exclude google-services.json from gitignore * Release/3.2.0 (#105) (cherry picked from commit c2f0a92) * Release/3.3.0 (#106) (cherry picked from commit 246e9bc) * Update dependencies (#108) * Fix faculties loading (#109) * Bump version to 3.3.1
Ilyshka991 · Jul 17, 2021 · 8e07557 · 8e07557
1 parent 246e9bc
commit 8e07557
Show file tree

Hide file tree

Showing 18 changed files with 124 additions and 57 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/markdown-navigator-enh.xml b/.idea/markdown-navigator-enh.xml
diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -82,7 +82,6 @@ dependencies {
 
     kaptAndroidTest daggerProcessor
 
-    implementation ktxDependencies.values()
     implementation glide
     implementation lottie
 

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -0,0 +1,4 @@
+-repackageclasses
+-allowaccessmodification
+-optimizationpasses 10
+-keepattributes SourceFile, LineNumberTable
diff --git a/app/src/main/java/com/pechuro/bsuirschedule/common/LiveEvent.kt b/app/src/main/java/com/pechuro/bsuirschedule/common/LiveEvent.kt
@@ -28,21 +28,27 @@ class LiveEvent<T> : MediatorLiveData<T>() {
 
     @MainThread
     override fun observe(owner: LifecycleOwner, observer: Observer<in T>) {
+        observers.find { it.observer === observer }?.let { _ -> // existing
+            return
+        }
         val wrapper = ObserverWrapper(observer)
         observers.add(wrapper)
         super.observe(owner, wrapper)
     }
 
     @MainThread
     override fun observeForever(observer: Observer<in T>) {
+        observers.find { it.observer === observer }?.let { _ -> // existing
+            return
+        }
         val wrapper = ObserverWrapper(observer)
         observers.add(wrapper)
         super.observeForever(wrapper)
     }
 
     @MainThread
     override fun removeObserver(observer: Observer<in T>) {
-        if (observers.remove(observer)) {
+        if (observer is ObserverWrapper && observers.remove(observer)) {
             super.removeObserver(observer)
             return
         }

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -105,7 +105,7 @@
     <string name="staff_list_hint_enter_auditory">Введите номер аудитории</string>
 
     <string name="staff_list_msg_group_course">%1$d курс</string>
-    <string name="staff_list_msg_employee_department">Кафедра: %1$s</string>
+    <string name="staff_list_msg_employee_department">%1$s</string>
     <string name="staff_list_msg_auditory_capacity">Вместимость: %1$d</string>
     <string name="staff_list_msg_empty">Ничего не найдено</string>
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -106,7 +106,7 @@
     <string name="staff_list_hint_enter_employee_name">Enter employee name</string>
     <string name="staff_list_hint_enter_auditory">Enter auditory</string>
     <string name="staff_list_msg_group_course">%1$d course</string>
-    <string name="staff_list_msg_employee_department">Department: %1$s</string>
+    <string name="staff_list_msg_employee_department">%1$s</string>
     <string name="staff_list_msg_auditory_capacity">Capacity: %1$d</string>
     <string name="staff_list_msg_empty">Not found</string>
 

diff --git a/build.gradle b/build.gradle
@@ -1,22 +1,22 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.20"
-        classpath 'com.google.gms:google-services:4.3.4'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
-        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.2"
+        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20'
+        classpath 'com.google.gms:google-services:4.3.8'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
+        classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5'
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

diff --git a/configuration.gradle b/configuration.gradle
@@ -7,8 +7,8 @@ ext.configuration = [
         minSdkVersion     : 21,
         targetSdkVersion  : 30,
 
-        versionCode       : 20,
-        versionName       : '3.3.0',
+        versionCode       : 21,
+        versionName       : '3.3.1',
 
         flurryApiKey      : ""
 ]

diff --git a/data/src/main/java/com/pechuro/bsuirschedule/data/repository/SpecialityRepositoryImpl.kt b/data/src/main/java/com/pechuro/bsuirschedule/data/repository/SpecialityRepositoryImpl.kt
@@ -62,7 +62,6 @@ class SpecialityRepositoryImpl(
     override suspend fun isCached() = withContext(Dispatchers.IO) {
         listOf(
                 async { performDaoCall { dao.isDepartmentsNotEmpty() } },
-                async { performDaoCall { dao.isFacultiesNotEmpty() } },
                 async { performDaoCall { dao.isSpecialitiesNotEmpty() } }
         ).awaitAll().foldRight(true) { isNotEmpty, acc ->
             isNotEmpty and acc
@@ -103,7 +102,7 @@ class SpecialityRepositoryImpl(
                     }
 
     private suspend fun loadFacultiesFromApi(): List<Faculty> =
-            performApiCall { api.getAllFaculties() }
+        performApiCallCatching(emptyList()) { api.getAllFaculties() }
                     .map { dto ->
                         dto.toDomainEntity()
                     }

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,41 +1,40 @@
 def libraryVersions = [
-        kotlin            : '1.4.0',
-        coroutines        : '1.3.9',
-
-        core              : '1.2.0',
-        appCompat         : '1.1.0',
-        annotation        : '1.1.0',
-        activity          : '1.1.0',
-        fragment          : '1.2.1',
+        kotlin            : '1.5.20',
+        coroutines        : '1.5.1',
+
+        core              : '1.6.0',
+        appCompat         : '1.3.0',
+        annotation        : '1.2.0',
+        activity          : '1.2.3',
+        fragment          : '1.3.5',
         multidex          : '2.0.1',
 
-        materialComponents: '1.1.0',
+        materialComponents: '1.4.0',
         cardView          : '1.0.0',
-        constraintLayout  : '1.1.3',
+        constraintLayout  : '2.0.4',
         coordinatorlayout : '1.1.0',
-        recyclerView      : '1.1.0',
+        recyclerView      : '1.2.1',
         viewPager2        : '1.0.0',
 
-        workManager       : '2.3.1',
-        lifeCycle         : '2.2.0',
+        workManager       : '2.5.0',
+        lifeCycle         : '2.3.1',
 
-        room              : '2.2.3',
+        room              : '2.3.0',
 
-        dagger            : '2.26',
+        dagger            : '2.37',
         javax             : '1',
 
-        ktx               : '1.1.0',
-        leekcanary        : '2.2',
-        glide             : '4.11.0',
-        lottie            : '3.3.1',
+        leekcanary        : '2.7',
+        glide             : '4.12.0',
+        lottie            : '3.7.1',
 
         retrofit          : '2.9.0',
-        okHttp            : '4.9.0',
+        okHttp            : '4.9.1',
         moshiAdapter      : '2.9.0',
-        moshi             : '1.11.0',
+        moshi             : '1.12.0',
 
-        crashlytics       : '17.2.1',
-        analytics         : '17.5.0',
+        crashlytics       : '18.1.0',
+        analytics         : '19.0.0',
 
         junit             : '4.12',
 
@@ -44,7 +43,7 @@ def libraryVersions = [
         espresso          : '3.2.0-alpha03',
         junitExtVersion   : '1.1.1',
 
-        flurry            : '12.9.0'
+        flurry            : '12.13.0'
 ]
 
 ext {
@@ -76,7 +75,8 @@ ext {
             liveData           : "androidx.lifecycle:lifecycle-livedata-ktx:${libraryVersions.lifeCycle}",
             viewModel          : "androidx.lifecycle:lifecycle-viewmodel-ktx:${libraryVersions.lifeCycle}",
             viewModelSavedState: "androidx.lifecycle:lifecycle-viewmodel-savedstate:${libraryVersions.lifeCycle}",
-            extenssions        : "androidx.lifecycle:lifecycle-extensions:${libraryVersions.lifeCycle}"
+            process            : "androidx.lifecycle:lifecycle-process:${libraryVersions.lifeCycle}"
+
     ]
     archComponentsProcessor = "androidx.lifecycle:lifecycle-compiler:${libraryVersions.lifeCycle}"
 
@@ -90,9 +90,6 @@ ext {
     ]
     roomProcessor = "androidx.room:room-compiler:${libraryVersions.room}"
 
-    ktxDependencies = [
-            core: "androidx.core:core-ktx:${libraryVersions.ktx}"
-    ]
     leekcanary = "com.squareup.leakcanary:leakcanary-android:${libraryVersions.leekcanary}"
     glide = "com.github.bumptech.glide:glide:${libraryVersions.glide}"
     lottie = "com.airbnb.android:lottie:${libraryVersions.lottie}"

diff --git a/domain/src/main/java/com/pechuro/bsuirschedule/domain/entity/Building.kt b/domain/src/main/java/com/pechuro/bsuirschedule/domain/entity/Building.kt
@@ -5,18 +5,18 @@ import kotlinx.android.parcel.Parcelize
 
 @Parcelize
 data class Building(
-        val id: Long,
-        val name: String
+    val id: Long,
+    val name: String
 ) : Parcelable
 
 val Building.coordinates: LatLng?
-    get() = when (name) {
-        "1" -> LatLng(53.917750, 27.595138)
-        "2" -> LatLng(53.918812, 27.593705)
-        "3" -> LatLng(53.916677, 27.596191)
-        "4" -> LatLng(53.912343, 27.594539)
-        "5" -> LatLng(53.911641, 27.595961)
-        "7" -> LatLng(53.902895, 27.598172)
-        "8" -> LatLng(53.903092, 27.598119)
+    get() = when (name.firstOrNull()) {
+        '1' -> LatLng(53.917750, 27.595138)
+        '2' -> LatLng(53.918812, 27.593705)
+        '3' -> LatLng(53.916677, 27.596191)
+        '4' -> LatLng(53.912343, 27.594539)
+        '5' -> LatLng(53.911641, 27.595961)
+        '7' -> LatLng(53.902895, 27.598172)
+        '8' -> LatLng(53.903092, 27.598119)
         else -> null
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/local/src/main/java/com/pechuro/bsuirschedule/local/entity/education/SpecialityCached.kt b/local/src/main/java/com/pechuro/bsuirschedule/local/entity/education/SpecialityCached.kt
@@ -29,7 +29,7 @@ data class SpecialityCached(
         @ColumnInfo(name = "education_form_id", index = true)
         val educationFormId: Long,
         @ColumnInfo(name = "name")
-        var name: String,
+        val name: String,
         @ColumnInfo(name = "abbreviation")
         val abbreviation: String,
         @ColumnInfo(name = "code")