Merge branch 'develop' into prod

Author: MishkaV

.detekt/detekt-config.yml

@@ -163,11 +163,11 @@ complexity:
   TooManyFunctions:
     active: true
     excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
-    thresholdInFiles: 11
-    thresholdInClasses: 11
-    thresholdInInterfaces: 11
-    thresholdInObjects: 11
-    thresholdInEnums: 11
+    thresholdInFiles: 15
+    thresholdInClasses: 15
+    thresholdInInterfaces: 15
+    thresholdInObjects: 15
+    thresholdInEnums: 15
     ignoreDeprecated: false
     ignorePrivate: false
     ignoreOverridden: false
@@ -534,7 +534,6 @@ style:
     values:
       - 'FIXME:'
       - 'STOPSHIP:'
-      - 'TODO:'
     allowedPatterns: ''
     customMessage: ''
   ForbiddenImport:
@@ -644,7 +643,7 @@ style:
     active: false
   ReturnCount:
     active: true
-    max: 2
+    max: 3
     excludedFunctions:
       - 'equals'
     excludeLabeled: false

README.md

@@ -1,6 +1,8 @@
 # OdooApp
 
-<a href=''><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png' width=300/></a>
+<a href=''><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png' width=200 align="middle"/></a>
+<a href='https://apps.rustore.ru/app/odoo.miem.android'><img alt='Get it on Rustore' src='documentation/stores/Rustore_logo.webp' width=200 align="middle"/></a>
+
 
 ## Description
 > This is **unofficial** [Odoo](https://www.odoo.com/) mobile client for Android with [HSE](https://www.hse.ru/en/) support. Enjoy!
@@ -9,13 +11,32 @@
 - Authorization
   - General
   - HSE
-- Selecting modules, pick your favorite
-- Recruitment module `coming soon!`
-- CRM module `coming soon!`
-- Profile `coming soon!`
+- Selecting modules
+  - Pick your favorite
+  - Looking for the right module
+- Recruitment module
+  - View available job
+  - Open or close a job post, also get link of job
+  - Start hiring or finish
+  - Kanban of applications for vacancies
+  - Search for kanban applications and view detailed information
+- CRM module
+  - Viewing the CRM kanban
+  - Creating CRM kanban statuses
+  - Viewing detailed information
+  - Viewing of Log notes and Schedule activities
+- Profile
+  - Viewing of general info about user
+  - Log out from current session
 
 ## Example of screens
-<img src="documentation/screenshots/Authorization_light.webp" width=300/> <img src="documentation/screenshots/Authorization_dark.webp" width=300/>
+<img src="documentation/screenshots/Auth.webp" width=300/> <img src="documentation/screenshots/Selecting_modules.webp" width=300/>
+
+<img src="documentation/screenshots/Selecting_modules_search.webp" width=300/> <img src="documentation/screenshots/Log_notes.webp" width=300/> 
+
+<img src="documentation/screenshots/Jobs.webp" width=300/> <img src="documentation/screenshots/Jobs_status.webp" width=300/>
+
+<img src="documentation/screenshots/Kaban_full.webp" width=300/> <img src="documentation/screenshots/Kanban_empty.webp" width=300/>
 
 ## Stack
 - Kotlin
@@ -27,5 +48,4 @@
 ## Are you a developer?
 Check [README](documentation/README.md) for developers
 
-## Download
-Stable release coming soon, keep in touch ＼(＾▽＾)／
+Keep in touch ＼(＾▽＾)／

build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
     id("org.jetbrains.kotlin.android") apply false
     id("org.jetbrains.kotlin.jvm") apply false
     id("io.gitlab.arturbosch.detekt") version Dependencies.Plugins.DETEKT_VERSION
+    `kotlin-parcelize` apply false
 }
 
 buildscript {

buildSrc/src/main/kotlin/consts/CompileVersions.kt

@@ -12,5 +12,5 @@ object CompileVersions {
     const val KOTLIN_LANGUAGE_VERSION = "1.7"
 
     const val CURRENT_COMPILE_VERSION = 33
-    const val MINIMUM_COMPILE_VERSION = 21
+    const val MINIMUM_COMPILE_VERSION = 24
 }

buildSrc/src/main/kotlin/consts/Dependencies.kt

@@ -129,6 +129,18 @@ object Dependencies {
             val ALL_SHARED_ELEMENTS_DEPS = listOf(SHARED_ELEMENTS)
         }
 
+        object SwipableCard {
+            private const val VERSION = "1.1.1"
+
+            const val SWIPABLE_CARD = "me.saket.swipe:swipe:$VERSION"
+        }
+
+        object HtmlText {
+            private const val VERSION = "1.3.1"
+
+            const val HTML_TEXT = "de.charlex.compose:html-text:$VERSION"
+        }
+
         object UiTest {
 
             // add to build.gradle with androidTestImplementation()
@@ -216,16 +228,23 @@ object Dependencies {
             "com.google.firebase:firebase-crashlytics-gradle:$CRASHLYTICS_GRADLE_VERSION"
 
         const val FIREBASE_BOM = "com.google.firebase:firebase-bom:$BOM_VERSION"
+
         const val FIREBASE_ANALYTICS = "com.google.firebase:firebase-analytics-ktx"
         const val FIREBASE_CRASHLYTICS = "com.google.firebase:firebase-crashlytics-ktx"
+
         const val FIREBASE_CONFIG = "com.google.firebase:firebase-config-ktx"
 
+        const val FIREBASE_FIRESTORE = "com.google.firebase:firebase-firestore-ktx"
+        const val FIREBASE_STORAGE = "com.google.firebase:firebase-storage-ktx"
+
         val GRADLE_PLUGINS =
             listOf(GOOGLE_SERVICES_GRADLE_PLUGIN, FIREBASE_CRASHLYTICS_GRADLE_PLUGIN)
 
         val APPLICATION_DEPS = listOf(FIREBASE_ANALYTICS, FIREBASE_CRASHLYTICS)
 
         val MODULE_DEPS = listOf(FIREBASE_ANALYTICS, FIREBASE_CONFIG)
+
+        val DATABASE_DEPS = listOf(FIREBASE_FIRESTORE, FIREBASE_STORAGE)
     }
 
     object Plugins {

buildSrc/src/main/kotlin/conventions/base/conventions.base-app.gradle.kts

@@ -19,7 +19,7 @@ android {
         applicationId = "odoo.miem.android"
         minSdk = CompileVersions.MINIMUM_COMPILE_VERSION
         targetSdk = CompileVersions.CURRENT_COMPILE_VERSION
-        versionCode = 1
+        versionCode = 4
         versionName = "1.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

buildSrc/src/main/kotlin/conventions/module_advanced/api/conventions.module-core-network-api.gradle.kts

@@ -12,4 +12,6 @@ plugins {
 dependencies {
     implementation(Dependencies.Network.MOSHI_KOTLIN)
     implementation(Dependencies.RxJava.RXJAVA_DEPENDENCE)
+
+    api(project(":core:converter:api"))
 }

common/network/authorization/impl/src/main/kotlin/odoo/miem/android/common/network/authorization/impl/AuthorizationInteractor.kt

@@ -30,7 +30,7 @@ class AuthorizationInteractor @Inject constructor() : IAuthorizationInteractor {
     ): ResultSingle<Unit> {
         Timber.d("generalAuthorization(): baseUrl = $baseUrl, login = $login, password = $password")
 
-        dataStore.setUrl(proceedUrl(baseUrl))
+        dataStore.setUrl(urlProcessing(baseUrl))
 
         return authorizationRepository.generalAuthorization(
             login = login,
@@ -49,12 +49,12 @@ class AuthorizationInteractor @Inject constructor() : IAuthorizationInteractor {
             }
             .onErrorReturn {
                 Timber.e("generalAuthorization(): error message = ${it.message}")
-                ErrorResult(R.string.general_authorization_error)
+                ErrorResult(
+                    isSessionExpired = ErrorResult.isSessionExpiredMessage(it.message)
+                )
             }
     }
 
-    private fun proceedUrl(inputUrl: String): String = "${urlProcessing(inputUrl)}web/"
-
     private companion object {
         const val COOKIE_SPLIT_SIGN = ";"
         const val FIELD_SESSION_ID = "session_id"