Skip to content

refactor: auth module with loading animation #2957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 29, 2025
Merged

refactor: auth module with loading animation #2957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
727983f
refactor: auth module with loading animation
Nagarjuna0033 Aug 28, 2025
5bf4927
refactor: update kotlinx date time version & created constant for file
Nagarjuna0033 Aug 29, 2025
8ab8d42
fix: checks
Nagarjuna0033 Aug 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions cmp-android/dependencies/demoDebugRuntimeClasspath.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ com.russhwolf:multiplatform-settings-serialization:1.2.0
com.russhwolf:multiplatform-settings:1.2.0
com.squareup.okhttp3:okhttp-sse:4.12.0
com.squareup.okhttp3:okhttp:4.12.0
com.squareup.okio:okio-jvm:3.11.0
com.squareup.okio:okio:3.11.0
com.squareup.okio:okio-jvm:3.15.0
com.squareup.okio:okio:3.15.0
de.jensklingenberg.ktorfit:ktorfit-annotations-android-debug:2.2.0
de.jensklingenberg.ktorfit:ktorfit-annotations:2.2.0
de.jensklingenberg.ktorfit:ktorfit-lib-android-debug:2.2.0
Expand All @@ -211,6 +211,14 @@ io.coil-kt.coil3:coil-network-ktor3:3.0.4
io.coil-kt.coil3:coil-svg-android:3.0.4
io.coil-kt.coil3:coil-svg:3.0.4
io.coil-kt.coil3:coil:3.2.0
io.github.alexzhirkevich:compottie-core-android:2.0.0-rc05
io.github.alexzhirkevich:compottie-core:2.0.0-rc05
io.github.alexzhirkevich:compottie-lite-android:2.0.0-rc05
io.github.alexzhirkevich:compottie-lite:2.0.0-rc05
io.github.alexzhirkevich:compottie-resources-android:2.0.0-rc05
io.github.alexzhirkevich:compottie-resources:2.0.0-rc05
io.github.alexzhirkevich:keight-core-android:0.0.02
io.github.alexzhirkevich:keight-core:0.0.02
io.github.alexzhirkevich:qrose-android:1.0.1
io.github.alexzhirkevich:qrose-core-android:1.0.1
io.github.alexzhirkevich:qrose-core:1.0.1
Expand Down Expand Up @@ -333,15 +341,17 @@ org.jetbrains.kotlin:kotlin-reflect:2.1.0
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.23
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20
org.jetbrains.kotlin:kotlin-stdlib:2.1.21
org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
org.jetbrains.kotlinx:atomicfu:0.23.2
org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.8
org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2
org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.10.2
org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.2
org.jetbrains.kotlinx:kotlinx-datetime:0.6.2
org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.7.1-0.6.x-compat
org.jetbrains.kotlinx:kotlinx-datetime:0.7.1-0.6.x-compat
org.jetbrains.kotlinx:kotlinx-io-bytestring-jvm:0.7.0
org.jetbrains.kotlinx:kotlinx-io-bytestring:0.7.0
org.jetbrains.kotlinx:kotlinx-io-core-jvm:0.7.0
Expand Down
18 changes: 14 additions & 4 deletions cmp-android/dependencies/demoReleaseRuntimeClasspath.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ com.russhwolf:multiplatform-settings-serialization:1.2.0
com.russhwolf:multiplatform-settings:1.2.0
com.squareup.okhttp3:okhttp-sse:4.12.0
com.squareup.okhttp3:okhttp:4.12.0
com.squareup.okio:okio-jvm:3.11.0
com.squareup.okio:okio:3.11.0
com.squareup.okio:okio-jvm:3.15.0
com.squareup.okio:okio:3.15.0
de.jensklingenberg.ktorfit:ktorfit-annotations-android:2.2.0
de.jensklingenberg.ktorfit:ktorfit-annotations:2.2.0
de.jensklingenberg.ktorfit:ktorfit-lib-android:2.2.0
Expand All @@ -211,6 +211,14 @@ io.coil-kt.coil3:coil-network-ktor3:3.0.4
io.coil-kt.coil3:coil-svg-android:3.0.4
io.coil-kt.coil3:coil-svg:3.0.4
io.coil-kt.coil3:coil:3.2.0
io.github.alexzhirkevich:compottie-core-android:2.0.0-rc05
io.github.alexzhirkevich:compottie-core:2.0.0-rc05
io.github.alexzhirkevich:compottie-lite-android:2.0.0-rc05
io.github.alexzhirkevich:compottie-lite:2.0.0-rc05
io.github.alexzhirkevich:compottie-resources-android:2.0.0-rc05
io.github.alexzhirkevich:compottie-resources:2.0.0-rc05
io.github.alexzhirkevich:keight-core-android:0.0.02
io.github.alexzhirkevich:keight-core:0.0.02
io.github.alexzhirkevich:qrose-android:1.0.1
io.github.alexzhirkevich:qrose-core-android:1.0.1
io.github.alexzhirkevich:qrose-core:1.0.1
Expand Down Expand Up @@ -330,15 +338,17 @@ org.jetbrains.kotlin:kotlin-reflect:2.1.0
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.23
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20
org.jetbrains.kotlin:kotlin-stdlib:2.1.21
org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
org.jetbrains.kotlinx:atomicfu:0.23.2
org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.8
org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2
org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.10.2
org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.2
org.jetbrains.kotlinx:kotlinx-datetime:0.6.2
org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.7.1-0.6.x-compat
org.jetbrains.kotlinx:kotlinx-datetime:0.7.1-0.6.x-compat
org.jetbrains.kotlinx:kotlinx-io-bytestring-jvm:0.7.0
org.jetbrains.kotlinx:kotlinx-io-bytestring:0.7.0
org.jetbrains.kotlinx:kotlinx-io-core-jvm:0.7.0
Expand Down
18 changes: 14 additions & 4 deletions cmp-android/dependencies/prodDebugRuntimeClasspath.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ com.russhwolf:multiplatform-settings-serialization:1.2.0
com.russhwolf:multiplatform-settings:1.2.0
com.squareup.okhttp3:okhttp-sse:4.12.0
com.squareup.okhttp3:okhttp:4.12.0
com.squareup.okio:okio-jvm:3.11.0
com.squareup.okio:okio:3.11.0
com.squareup.okio:okio-jvm:3.15.0
com.squareup.okio:okio:3.15.0
de.jensklingenberg.ktorfit:ktorfit-annotations-android-debug:2.2.0
de.jensklingenberg.ktorfit:ktorfit-annotations:2.2.0
de.jensklingenberg.ktorfit:ktorfit-lib-android-debug:2.2.0
Expand All @@ -211,6 +211,14 @@ io.coil-kt.coil3:coil-network-ktor3:3.0.4
io.coil-kt.coil3:coil-svg-android:3.0.4
io.coil-kt.coil3:coil-svg:3.0.4
io.coil-kt.coil3:coil:3.2.0
io.github.alexzhirkevich:compottie-core-android:2.0.0-rc05
io.github.alexzhirkevich:compottie-core:2.0.0-rc05
io.github.alexzhirkevich:compottie-lite-android:2.0.0-rc05
io.github.alexzhirkevich:compottie-lite:2.0.0-rc05
io.github.alexzhirkevich:compottie-resources-android:2.0.0-rc05
io.github.alexzhirkevich:compottie-resources:2.0.0-rc05
io.github.alexzhirkevich:keight-core-android:0.0.02
io.github.alexzhirkevich:keight-core:0.0.02
io.github.alexzhirkevich:qrose-android:1.0.1
io.github.alexzhirkevich:qrose-core-android:1.0.1
io.github.alexzhirkevich:qrose-core:1.0.1
Expand Down Expand Up @@ -333,15 +341,17 @@ org.jetbrains.kotlin:kotlin-reflect:2.1.0
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.23
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20
org.jetbrains.kotlin:kotlin-stdlib:2.1.21
org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
org.jetbrains.kotlinx:atomicfu:0.23.2
org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.8
org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2
org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.10.2
org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.2
org.jetbrains.kotlinx:kotlinx-datetime:0.6.2
org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.7.1-0.6.x-compat
org.jetbrains.kotlinx:kotlinx-datetime:0.7.1-0.6.x-compat
org.jetbrains.kotlinx:kotlinx-io-bytestring-jvm:0.7.0
org.jetbrains.kotlinx:kotlinx-io-bytestring:0.7.0
org.jetbrains.kotlinx:kotlinx-io-core-jvm:0.7.0
Expand Down
18 changes: 14 additions & 4 deletions cmp-android/dependencies/prodReleaseRuntimeClasspath.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ com.russhwolf:multiplatform-settings-serialization:1.2.0
com.russhwolf:multiplatform-settings:1.2.0
com.squareup.okhttp3:okhttp-sse:4.12.0
com.squareup.okhttp3:okhttp:4.12.0
com.squareup.okio:okio-jvm:3.11.0
com.squareup.okio:okio:3.11.0
com.squareup.okio:okio-jvm:3.15.0
com.squareup.okio:okio:3.15.0
de.jensklingenberg.ktorfit:ktorfit-annotations-android:2.2.0
de.jensklingenberg.ktorfit:ktorfit-annotations:2.2.0
de.jensklingenberg.ktorfit:ktorfit-lib-android:2.2.0
Expand All @@ -211,6 +211,14 @@ io.coil-kt.coil3:coil-network-ktor3:3.0.4
io.coil-kt.coil3:coil-svg-android:3.0.4
io.coil-kt.coil3:coil-svg:3.0.4
io.coil-kt.coil3:coil:3.2.0
io.github.alexzhirkevich:compottie-core-android:2.0.0-rc05
io.github.alexzhirkevich:compottie-core:2.0.0-rc05
io.github.alexzhirkevich:compottie-lite-android:2.0.0-rc05
io.github.alexzhirkevich:compottie-lite:2.0.0-rc05
io.github.alexzhirkevich:compottie-resources-android:2.0.0-rc05
io.github.alexzhirkevich:compottie-resources:2.0.0-rc05
io.github.alexzhirkevich:keight-core-android:0.0.02
io.github.alexzhirkevich:keight-core:0.0.02
io.github.alexzhirkevich:qrose-android:1.0.1
io.github.alexzhirkevich:qrose-core-android:1.0.1
io.github.alexzhirkevich:qrose-core:1.0.1
Expand Down Expand Up @@ -330,15 +338,17 @@ org.jetbrains.kotlin:kotlin-reflect:2.1.0
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.23
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20
org.jetbrains.kotlin:kotlin-stdlib:2.1.21
org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
org.jetbrains.kotlinx:atomicfu:0.23.2
org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.8
org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2
org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.10.2
org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.2
org.jetbrains.kotlinx:kotlinx-datetime:0.6.2
org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.7.1-0.6.x-compat
org.jetbrains.kotlinx:kotlinx-datetime:0.7.1-0.6.x-compat
org.jetbrains.kotlinx:kotlinx-io-bytestring-jvm:0.7.0
org.jetbrains.kotlinx:kotlinx-io-bytestring:0.7.0
org.jetbrains.kotlinx:kotlinx-io-core-jvm:0.7.0
Expand Down
2 changes: 2 additions & 0 deletions core/common/src/commonMain/kotlin/org/mifos/mobile/core/common/DateHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import kotlinx.datetime.isoDayNumber
import kotlinx.datetime.minus
import kotlinx.datetime.toLocalDateTime
import kotlin.time.Duration.Companion.days
import kotlin.time.ExperimentalTime

@Suppress("TooManyFunctions")
@OptIn(FormatStringsInDatetimeFormats::class)
Expand Down Expand Up @@ -162,6 +163,7 @@ object DateHelper {

private val monthNumberToAbbreviation = monthMap.entries.associate { (k, v) -> v to k }

@OptIn(ExperimentalTime::class)
fun getDateAsLongFromList(integersOfDate: List<Int>?): Long? {
if (integersOfDate == null) return null
val dateStr = getDateAsString(integersOfDate)
Expand Down
5 changes: 3 additions & 2 deletions .../src/commonMain/kotlin/org/mifos/mobile/core/data/repositoryImpl/UserAuthRepositoryImp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,9 @@ class UserAuthRepositoryImp(
DataState.Error(Exception("Invalid Credentials"), null)
}
}
} catch (e: Exception) {
DataState.Error(e, null)
} catch (e: ClientRequestException) {
val errorMessage = extractErrorMessage(e.response)
DataState.Error(Exception(errorMessage), null)
}
}

Expand Down
2 changes: 2 additions & 0 deletions core/ui/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ kotlin{
implementation(libs.jb.composeNavigation)
implementation(libs.filekit.compose)
implementation(libs.filekit.core)
implementation(libs.compottie.resources)
implementation(libs.compottie.lite)
}
}
}
Expand Down
1 change: 1 addition & 0 deletions core/ui/src/commonMain/composeResources/files/loading_animation.json
View file
Open in desktop

Large diffs are not rendered by default.

76 changes: 59 additions & 17 deletions core/ui/src/commonMain/kotlin/org/mifos/mobile/core/ui/component/MifosProgressIndicator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,53 +9,95 @@
*/
package org.mifos.mobile.core.ui.component

import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import org.mifos.mobile.core.designsystem.theme.DesignToken
import org.mifos.mobile.core.ui.utils.DevicePreview
import io.github.alexzhirkevich.compottie.LottieCompositionSpec
import io.github.alexzhirkevich.compottie.animateLottieCompositionAsState
import io.github.alexzhirkevich.compottie.rememberLottieComposition
import io.github.alexzhirkevich.compottie.rememberLottiePainter
import mifos_mobile.core.ui.generated.resources.Res
import org.jetbrains.compose.ui.tooling.preview.Preview
import org.mifos.mobile.core.designsystem.theme.MifosMobileTheme
import org.mifos.mobile.core.ui.utils.LottieConstants

@DevicePreview
@Composable
fun MifosProgressIndicator(
modifier: Modifier = Modifier.fillMaxSize(),
) {
Column(
val composition by rememberLottieComposition {
LottieCompositionSpec.JsonString(
Res.readBytes(LottieConstants.LOADING_ANIMATION).decodeToString(),
)
}
val progress by animateLottieCompositionAsState(composition)

Box(
modifier = modifier,
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally,
contentAlignment = Alignment.Center,
) {
CircularProgressIndicator()
Image(
painter = rememberLottiePainter(
composition = composition,
progress = { progress },
),
contentDescription = "Lottie animation",
)
}
}

@DevicePreview
@Composable
fun MifosProgressIndicatorOverlay(
modifier: Modifier = Modifier.fillMaxSize(),
) {
Column(
val composition by rememberLottieComposition {
LottieCompositionSpec.JsonString(
Res.readBytes("files/loading_animation.json").decodeToString(),
)
}
val progress by animateLottieCompositionAsState(composition)

Box(
modifier = modifier
.padding(DesignToken.padding.large)
.background(MaterialTheme.colorScheme.background.copy(alpha = 0.7f))
.clickable(
enabled = false,
indication = null,
interactionSource = remember { MutableInteractionSource() },
) { },
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally,
contentAlignment = Alignment.Center,
) {
CircularProgressIndicator()
Image(
painter = rememberLottiePainter(
composition = composition,
progress = { progress },
),
contentDescription = "Loading animation",
)
}
}

@Preview
@Composable
private fun Loading_Preview() {
MifosMobileTheme {
MifosProgressIndicator()
}
}

@Preview
@Composable
private fun Overlay_Loading_Preview() {
MifosMobileTheme {
MifosProgressIndicatorOverlay()
}
}
14 changes: 14 additions & 0 deletions core/ui/src/commonMain/kotlin/org/mifos/mobile/core/ui/utils/LottieConstants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/*
* Copyright 2025 Mifos Initiative
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*
* See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
*/
package org.mifos.mobile.core.ui.utils

object LottieConstants {
const val LOADING_ANIMATION = "files/loading_animation.json"
}
Loading
Loading