Skip to content

Commit c43c96e

Browse files
committed
conflicts resolved
2 parents 3284046 + 544af47 commit c43c96e

File tree

115 files changed

+2076
-4651
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+2076
-4651
lines changed

.editorconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# https://editorconfig.org/
2+
# This configuration is used by ktlint when spotless invokes it
3+
4+
[*.{kt,kts}]
5+
ij_kotlin_allow_trailing_comma=true
6+
ij_kotlin_allow_trailing_comma_on_call_site=true
7+
ktlint_function_naming_ignore_when_annotated_with=Composable, Test, Preview

config/detekt/.editorconfig

Whitespace-only changes.

config/detekt/detekt.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ complexity:
168168
threshold: 600
169169
LongMethod:
170170
active: true
171-
threshold: 180 #60
171+
threshold: 360 #180 #60
172172
LongParameterList:
173173
active: true
174174
# Updating Common values based on current scenario
@@ -785,7 +785,7 @@ style:
785785
maxChainedCalls: 5
786786
MaxLineLength:
787787
active: true
788-
maxLineLength: 120
788+
maxLineLength: 150
789789
excludePackageStatements: true
790790
excludeImportStatements: true
791791
excludeCommentStatements: false
@@ -828,7 +828,7 @@ style:
828828
active: false
829829
ReturnCount:
830830
active: true
831-
max: 2
831+
max: 4
832832
excludedFunctions:
833833
- "equals"
834834
excludeLabeled: false

core/designsystem/src/main/java/com/mifos/core/designsystem/component/MifosEmptyContent.kt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import androidx.compose.material.icons.Icons
99
import androidx.compose.material.icons.filled.Error
1010
import androidx.compose.material3.Button
1111
import androidx.compose.material3.Icon
12+
import androidx.compose.material3.MaterialTheme
1213
import androidx.compose.material3.Text
1314
import androidx.compose.runtime.Composable
1415
import androidx.compose.ui.Alignment
@@ -24,20 +25,24 @@ fun MifosErrorContent(
2425
isRefreshEnabled: Boolean = false,
2526
imageVector: ImageVector? = null,
2627
onRefresh: () -> Unit = {},
27-
refreshButtonText: String = ""
28+
refreshButtonText: String = "",
2829
) {
2930
Column(
3031
modifier = Modifier.fillMaxSize(),
3132
horizontalAlignment = Alignment.CenterHorizontally,
32-
verticalArrangement = Arrangement.Center
33+
verticalArrangement = Arrangement.Center,
3334
) {
3435
Icon(
3536
imageVector = imageVector ?: Icons.Default.Error,
3637
contentDescription = null,
37-
modifier = Modifier.size(48.dp)
38+
modifier = Modifier.size(48.dp),
3839
)
3940
if (isRefreshEnabled) {
40-
Text(text = message, modifier = Modifier.padding(vertical = 16.dp))
41+
Text(
42+
text = message,
43+
modifier = Modifier.padding(vertical = 16.dp),
44+
color = MaterialTheme.colorScheme.onBackground,
45+
)
4146
Button(onClick = onRefresh) {
4247
Text(text = refreshButtonText)
4348
}

feature/checker-inbox-task/build.gradle.kts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*
2+
* Copyright 2024 Mifos Initiative
3+
*
4+
* This Source Code Form is subject to the terms of the Mozilla Public
5+
* License, v. 2.0. If a copy of the MPL was not distributed with this
6+
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
7+
*
8+
* See https://github.com/openMF/android-client/blob/master/LICENSE.md
9+
*/
110
plugins {
211
alias(libs.plugins.mifos.android.feature)
312
alias(libs.plugins.mifos.android.library.compose)
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Copyright 2024 Mifos Initiative
4+
5+
This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
6+
If a copy of the MPL was not distributed with this file,
7+
You can obtain one at https://mozilla.org/MPL/2.0/.
8+
9+
See https://github.com/openMF/android-client/blob/master/LICENSE.md
10+
-->
211
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
312

413
</manifest>

0 commit comments

Comments
 (0)