diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0ee0d3e..34c9165 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -30,8 +30,8 @@ android { applicationId = "com.oqba26.monthlypaymentapp" minSdk = 25 targetSdk = 34 - versionCode = 12 - versionName = "1.1.1" + versionCode = 13 + versionName = "1.1.2" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { useSupportLibrary = true } } diff --git a/app/src/main/java/com/oqba26/monthlypaymentapp/ui/screens/PersonScreen.kt b/app/src/main/java/com/oqba26/monthlypaymentapp/ui/screens/PersonScreen.kt index a234e94..05eb1ad 100644 --- a/app/src/main/java/com/oqba26/monthlypaymentapp/ui/screens/PersonScreen.kt +++ b/app/src/main/java/com/oqba26/monthlypaymentapp/ui/screens/PersonScreen.kt @@ -30,7 +30,6 @@ import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.Message import androidx.compose.material.icons.filled.Archive -import androidx.compose.material.icons.filled.Assessment import androidx.compose.material.icons.filled.Check import androidx.compose.material.icons.filled.Close import androidx.compose.material.icons.filled.Sync @@ -117,7 +116,6 @@ fun PersonScreen( val dashboardData by viewModel.dashboardData.collectAsState() val financialReportData by viewModel.financialReportData.collectAsState() val showFinancialReportDialog by viewModel.showFinancialReportDialog.collectAsState() - val isOperatorMode by viewModel.isOperatorMode.collectAsState() val defaultPaymentAmount by viewModel.defaultPaymentAmountFlow.collectAsState(initial = 0.0) val cardNumbers by viewModel.cardNumbersFlow.collectAsState(initial = emptyList()) val personForPaymentDialog by viewModel.personForPaymentDialog.collectAsState() @@ -188,8 +186,7 @@ fun PersonScreen( DashboardCard( data = dashboardData, financialReportData = financialReportData, - isOperatorMode = isOperatorMode, - onOpenReportClick = { viewModel.onShowFinancialReport() } + isMosqueCategory = (currentCategory == "mosque") ) OutlinedTextField( @@ -582,7 +579,7 @@ fun AddNewPersonDialog( val currentShamsiYear = getCurrentShamsiYear() val currentShamsiMonth = getCurrentShamsiMonth() - var startMonth by remember { mutableIntStateOf(currentShamsiMonth) } + var startMonth by remember { mutableIntStateOf(if (isMosqueCategory) currentShamsiMonth else 1) } var startYear by remember { mutableIntStateOf(currentShamsiYear) } var similarContacts by remember { mutableStateOf>(emptyList()) } @@ -1072,8 +1069,7 @@ fun SelectCardDialog( fun DashboardCard( data: DashboardUiModel, financialReportData: FinancialReportData, - isOperatorMode: Boolean = false, - onOpenReportClick: () -> Unit + isMosqueCategory: Boolean = false ) { val animatedProgress by animateFloatAsState( targetValue = data.progress, @@ -1110,7 +1106,11 @@ fun DashboardCard( horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically ) { - Text("مجموع درآمد ماه جاری", style = MaterialTheme.typography.titleSmall, fontWeight = FontWeight.Bold) + Text( + text = if (isMosqueCategory) "کمک‌های جمع‌آوری شده ماه جاری" else "حقوق جمع‌آوری شده ماه جاری", + style = MaterialTheme.typography.titleSmall, + fontWeight = FontWeight.Bold + ) Text("${formatNumberAsPersian(data.totalIncome)} تومان", style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.Bold) } @@ -1136,24 +1136,6 @@ fun DashboardCard( ) } } - - if (!isOperatorMode) { - OutlinedButton( - onClick = onOpenReportClick, - modifier = Modifier - .fillMaxWidth() - .padding(top = 2.dp), - shape = MaterialTheme.shapes.medium - ) { - Icon( - imageVector = Icons.Default.Assessment, - contentDescription = null, - modifier = Modifier.size(18.dp) - ) - Spacer(modifier = Modifier.width(6.dp)) - Text("مشاهده گزارش کامل مالی و درآمدهای گذشته", style = MaterialTheme.typography.labelLarge) - } - } } } } diff --git a/update.json b/update.json index 3c0c6dd..7a29d7d 100644 --- a/update.json +++ b/update.json @@ -1,7 +1,7 @@ { - "versionCode": 12, - "versionName": "1.1.1", - "url": "https://github.com/oqba26/MonthlyPaymentApp/releases/download/v1.1.1/MonthlyPaymentApp-v1.1.1.apk", - "releaseNotes": "بهبودهای همگام‌سازی شبکه و پایداری لایو PocketBase", + "versionCode": 13, + "versionName": "1.1.2", + "url": "https://github.com/oqba26/MonthlyPaymentApp/releases/download/v1.1.2/MonthlyPaymentApp-v1.1.2.apk", + "releaseNotes": "بهبودهای پایداری و عملکرد همگام‌سازی", "isForceUpdate": false }