Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
22 changes: 22 additions & 0 deletions cmp-android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,28 @@ dependencyGuard {
configuration("prodReleaseRuntimeClasspath")
}

// Disambiguation rule so that Gradle resolves the correct artifact type when consuming
// cmp-shared (a KMP library module). Without this, the OssLicensesPlugin and similar
// tasks fail because multiple artifact variants share the same attributes.
dependencies {
attributesSchema {
attribute(Attribute.of("artifactType", String::class.java)) {
disambiguationRules.add(PreferJarRule::class.java)
}
}
}

abstract class PreferJarRule : AttributeDisambiguationRule<String> {
Comment thread
Aditya002500 marked this conversation as resolved.
Outdated
override fun execute(details: MultipleCandidatesDetails<String>) {
val candidates = details.candidateValues
when {
"android-classes-jar" in candidates -> details.closestMatch("android-classes-jar")
"jar" in candidates -> details.closestMatch("jar")
else -> { /* let Gradle decide */ }
}
}
}
Comment thread
Aditya002500 marked this conversation as resolved.
Outdated

dependencies {
implementation(projects.cmpShared)
implementation(projects.core.ui)
Expand Down
2 changes: 1 addition & 1 deletion cmp-android/prodRelease-badging.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package: name='org.mifos.mobile' versionCode='1' versionName='0.0.1-beta.0.1810' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
package: name='org.mifos.mobile' versionCode='1' versionName='0.0.4-beta.0.1' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
Comment thread
Aditya002500 marked this conversation as resolved.
Outdated
minSdkVersion:'26'
targetSdkVersion:'36'
uses-permission: name='android.permission.INTERNET'
Expand Down
15 changes: 7 additions & 8 deletions cmp-shared/cmp_shared.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'cmp_shared'
spec.version = '1.0'
spec.version = '0.0.4'
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
spec.homepage = 'https://github.com/openMF/mifos-mobile'
spec.source = { :http=> ''}
Comment thread
Aditya002500 marked this conversation as resolved.
spec.authors = ''
Expand All @@ -9,8 +9,8 @@ Pod::Spec.new do |spec|
spec.vendored_frameworks = 'build/cocoapods/framework/ComposeApp.framework'
spec.libraries = 'c++'
spec.ios.deployment_target = '16.0'


if !Dir.exist?('build/cocoapods/framework/ComposeApp.framework') || Dir.empty?('build/cocoapods/framework/ComposeApp.framework')
raise "

Expand All @@ -21,16 +21,16 @@ Pod::Spec.new do |spec|

Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
end

spec.xcconfig = {
'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
}

spec.pod_target_xcconfig = {
'KOTLIN_PROJECT_PATH' => ':cmp-shared',
'PRODUCT_MODULE_NAME' => 'ComposeApp',
}

spec.script_phases = [
{
:name => 'Build cmp_shared',
Expand All @@ -46,8 +46,7 @@ Pod::Spec.new do |spec|
"$REPO_ROOT/../gradlew" -p "$REPO_ROOT" $KOTLIN_PROJECT_PATH:syncFramework \
-Pkotlin.native.cocoapods.platform=$PLATFORM_NAME \
-Pkotlin.native.cocoapods.archs="$ARCHS" \
-Pkotlin.native.cocoapods.configuration="$CONFIGURATION" \
--no-configuration-cache
-Pkotlin.native.cocoapods.configuration="$CONFIGURATION"
SCRIPT
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ fun LoanTransactionDetailsResponseDto.toModel(): TransactionDetails {
return TransactionDetails(
id = this.id ?: -1L,
transactionName = type?.value ?: "Loan Transaction",
typeCode = type?.code,
Comment thread
Aditya002500 marked this conversation as resolved.
Outdated
isCredit = isCreditResolved,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here also this pr scope should not other other things than adding translation strings .

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The strings were missing so I simply added those

amount = this.amount ?: 0.0,
currencyCode = this.currency?.code ?: "USD",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ fun SavingsTransactionDetailsResponseDto.toModel(): TransactionDetails {
return TransactionDetails(
id = this.id ?: -1L,
transactionName = type?.value ?: "Savings Transaction",
typeCode = type?.code,
Comment thread
Aditya002500 marked this conversation as resolved.
Outdated
isCredit = isCreditResolved,
amount = this.amount ?: 0.0,
currencyCode = this.currency?.code ?: "USD",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ data class TransactionDetails(

val id: Long,
val transactionName: String,
val typeCode: String? = null,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be removed as well? Please review.

val isCredit: Boolean,
val amount: Double,
val currencyCode: String,
Expand Down
47 changes: 47 additions & 0 deletions core/ui/src/commonMain/composeResources/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,51 @@
<string name="feature_savings_filter">الفلاتر</string>
<string name="feature_savings_reset">إعادة تعيين</string>
<string name="feature_savings_apply">تطبيق</string>

<string name="tx_date_today">اليوم</string>
<string name="tx_date_yesterday">أمس</string>

<string name="tx_month_jan">يناير</string>
<string name="tx_month_feb">فبراير</string>
<string name="tx_month_mar">مارس</string>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please follow proper naming of string resources.

<string name="tx_month_apr">أبريل</string>
<string name="tx_month_may">مايو</string>
<string name="tx_month_jun">يونيو</string>
<string name="tx_month_jul">يوليو</string>
<string name="tx_month_aug">أغسطس</string>
<string name="tx_month_sep">سبتمبر</string>
<string name="tx_month_oct">أكتوبر</string>
<string name="tx_month_nov">نوفمبر</string>
<string name="tx_month_dec">ديسمبر</string>

<string name="tx_type_deposit">إيداع</string>
<string name="tx_type_withdrawal">سحب</string>
<string name="tx_type_interest_posting">تقييد الفائدة</string>
<string name="tx_type_fee_deduction">خصم الرسوم</string>
<string name="tx_type_initiate_transfer">بدء التحويل</string>
<string name="tx_type_approve_transfer">موافقة على التحويل</string>
<string name="tx_type_withdraw_transfer">سحب التحويل</string>
<string name="tx_type_reject_transfer">رفض التحويل</string>
<string name="tx_type_dividend_payout">صرف أرباح الأسهم</string>
<string name="tx_type_overpayment">دفع زائد</string>
<string name="tx_type_repayment">سداد</string>
<string name="tx_type_repayment_at_disbursement">سداد عند الصرف</string>
<string name="tx_type_waive_interest">إعفاء من الفائدة</string>
<string name="tx_type_waive_charges">إعفاء من الرسوم</string>
<string name="tx_type_write_off">شطب</string>
<string name="tx_type_accrual">استحقاق</string>
<string name="tx_type_approval">موافقة</string>
<string name="tx_type_undo_approval">تراجع عن الموافقة</string>
<string name="tx_type_undo_disbursal">تراجع عن الصرف</string>
<string name="tx_type_reschedule">إعادة جدولة</string>
<string name="tx_type_recalculate_interest">إعادة احتساب الفائدة</string>
<string name="tx_type_refund">استرداد</string>
<string name="tx_type_charge_payment">دفع الرسوم</string>
<string name="tx_type_loan_charge_added">إضافة رسوم القرض</string>
<string name="tx_type_interest_waiver">تنازل عن الفائدة</string>
<string name="tx_type_recover_repayment">استرداد السداد</string>
<string name="tx_type_credit_balance_refund">رد الرصيد الدائن</string>
<string name="tx_type_charge_off">إسقاط الدين</string>
<string name="tx_type_tax_withholding">اقتطاع ضريبي</string>
<string name="tx_digits">٠١٢٣٤٥٦٧٨٩</string>
</resources>
47 changes: 47 additions & 0 deletions core/ui/src/commonMain/composeResources/values-bn/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,51 @@
<string name="feature_savings_filter">ফিল্টার</string>
<string name="feature_savings_reset">রিসেট</string>
<string name="feature_savings_apply">প্রয়োগ করুন</string>

<string name="tx_date_today">আজ</string>
<string name="tx_date_yesterday">গতকাল</string>

<string name="tx_month_jan">জানু</string>
<string name="tx_month_feb">ফেব্রু</string>
<string name="tx_month_mar">মার্চ</string>
<string name="tx_month_apr">এপ্রিল</string>
<string name="tx_month_may">মে</string>
<string name="tx_month_jun">জুন</string>
<string name="tx_month_jul">জুলাই</string>
<string name="tx_month_aug">আগস্ট</string>
<string name="tx_month_sep">সেপ্টে</string>
<string name="tx_month_oct">অক্টো</string>
<string name="tx_month_nov">নভে</string>
<string name="tx_month_dec">ডিসে</string>

<string name="tx_type_deposit">জমা</string>
<string name="tx_type_withdrawal">উত্তোলন</string>
<string name="tx_type_interest_posting">সুদ জমা</string>
<string name="tx_type_fee_deduction">ফি কর্তন</string>
<string name="tx_type_initiate_transfer">স্থানান্তর শুরু</string>
<string name="tx_type_approve_transfer">স্থানান্তর অনুমোদিত</string>
<string name="tx_type_withdraw_transfer">স্থানান্তর প্রত্যাহার</string>
<string name="tx_type_reject_transfer">স্থানান্তর প্রত্যাখ্যাত</string>
<string name="tx_type_dividend_payout">লভ্যাংশ প্রদান</string>
<string name="tx_type_overpayment">অতিরিক্ত পেমেন্ট</string>
<string name="tx_type_repayment">পরিশোধ</string>
<string name="tx_type_repayment_at_disbursement">বিতরণের সময় পরিশোধ</string>
<string name="tx_type_waive_interest">সুদ মওকুফ</string>
<string name="tx_type_waive_charges">চার্জ মওকুফ</string>
<string name="tx_type_write_off">অনাদায়ী পাওনা লিখন</string>
<string name="tx_type_accrual">অর্জিত বকেয়া</string>
<string name="tx_type_approval">অনুমোদন</string>
<string name="tx_type_undo_approval">অনুমোদন বাতিল</string>
<string name="tx_type_undo_disbursal">বিতরণ বাতিল</string>
<string name="tx_type_reschedule">পুনঃনির্ধারণ</string>
<string name="tx_type_recalculate_interest">সুদ পুনঃগণনা</string>
<string name="tx_type_refund">ফেরত</string>
<string name="tx_type_charge_payment">চার্জ প্রদান</string>
<string name="tx_type_loan_charge_added">ঋণ চার্জ যোগ করা হয়েছে</string>
<string name="tx_type_interest_waiver">সুদ মওকুফ</string>
<string name="tx_type_recover_repayment">পরিশোধ পুনরুদ্ধার</string>
<string name="tx_type_credit_balance_refund">ক্রেডিট ব্যালেন্স ফেরত</string>
<string name="tx_type_charge_off">চার্জ অফ</string>
<string name="tx_type_tax_withholding">কর কর্তন</string>
<string name="tx_digits">০১২৩৪৫৬৭৮৯</string>
</resources>
47 changes: 47 additions & 0 deletions core/ui/src/commonMain/composeResources/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,51 @@
<string name="feature_savings_filter">Filter</string>
<string name="feature_savings_reset">Zurücksetzen</string>
<string name="feature_savings_apply">Anwenden</string>

<string name="tx_date_today">Heute</string>
<string name="tx_date_yesterday">Gestern</string>

<string name="tx_month_jan">Jan.</string>
<string name="tx_month_feb">Feb.</string>
<string name="tx_month_mar">März</string>
<string name="tx_month_apr">Apr.</string>
<string name="tx_month_may">Mai</string>
<string name="tx_month_jun">Juni</string>
<string name="tx_month_jul">Juli</string>
<string name="tx_month_aug">Aug.</string>
<string name="tx_month_sep">Sept.</string>
<string name="tx_month_oct">Okt.</string>
<string name="tx_month_nov">Nov.</string>
<string name="tx_month_dec">Dez.</string>

<string name="tx_type_deposit">Einzahlung</string>
<string name="tx_type_withdrawal">Auszahlung</string>
<string name="tx_type_interest_posting">Zinsbuchung</string>
<string name="tx_type_fee_deduction">Gebührenabzug</string>
<string name="tx_type_initiate_transfer">Überweisung eingeleitet</string>
<string name="tx_type_approve_transfer">Überweisung genehmigt</string>
<string name="tx_type_withdraw_transfer">Überweisung zurückgezogen</string>
<string name="tx_type_reject_transfer">Überweisung abgelehnt</string>
<string name="tx_type_dividend_payout">Dividendenauszahlung</string>
<string name="tx_type_overpayment">Überzahlung</string>
<string name="tx_type_repayment">Rückzahlung</string>
<string name="tx_type_repayment_at_disbursement">Rückzahlung bei Auszahlung</string>
<string name="tx_type_waive_interest">Zinsverzicht</string>
<string name="tx_type_waive_charges">Gebührenverzicht</string>
<string name="tx_type_write_off">Abschreibung</string>
<string name="tx_type_accrual">Abgrenzung</string>
<string name="tx_type_approval">Genehmigung</string>
<string name="tx_type_undo_approval">Genehmigung rückgängig</string>
<string name="tx_type_undo_disbursal">Auszahlung rückgängig</string>
<string name="tx_type_reschedule">Neuplanung</string>
<string name="tx_type_recalculate_interest">Zinsneuberechnung</string>
<string name="tx_type_refund">Rückerstattung</string>
<string name="tx_type_charge_payment">Gebührenzahlung</string>
<string name="tx_type_loan_charge_added">Kreditgebühr hinzugefügt</string>
<string name="tx_type_interest_waiver">Zinserlass</string>
<string name="tx_type_recover_repayment">Rückzahlungserholung</string>
<string name="tx_type_credit_balance_refund">Guthabenerstattung</string>
<string name="tx_type_charge_off">Ausbuchung</string>
<string name="tx_type_tax_withholding">Quellensteuer</string>
<string name="tx_digits">0123456789</string>
</resources>
48 changes: 48 additions & 0 deletions core/ui/src/commonMain/composeResources/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,52 @@
<string name="feature_savings_filter">Filtros</string>
<string name="feature_savings_reset">Limpiar</string>
<string name="feature_savings_apply">Aplicar</string>

<string name="tx_date_today">Hoy</string>
<string name="tx_date_yesterday">Ayer</string>

<string name="tx_month_jan">Ene</string>
<string name="tx_month_feb">Feb</string>
<string name="tx_month_mar">Mar</string>
<string name="tx_month_apr">Abr</string>
<string name="tx_month_may">May</string>
<string name="tx_month_jun">Jun</string>
<string name="tx_month_jul">Jul</string>
<string name="tx_month_aug">Ago</string>
<string name="tx_month_sep">Sep</string>
<string name="tx_month_oct">Oct</string>
<string name="tx_month_nov">Nov</string>
<string name="tx_month_dec">Dic</string>

<string name="tx_type_deposit">Depósito</string>
<string name="tx_type_withdrawal">Retiro</string>
<string name="tx_type_interest_posting">Registro de intereses</string>
<string name="tx_type_fee_deduction">Deducción de comisión</string>
<string name="tx_type_initiate_transfer">Iniciar transferencia</string>
<string name="tx_type_approve_transfer">Aprobar transferencia</string>
<string name="tx_type_withdraw_transfer">Retirar transferencia</string>
<string name="tx_type_reject_transfer">Rechazar transferencia</string>
<string name="tx_type_dividend_payout">Pago de dividendos</string>
<string name="tx_type_overpayment">Pago en exceso</string>
<string name="tx_type_repayment">Reembolso</string>
<string name="tx_type_repayment_at_disbursement">Reembolso al desembolso</string>
<string name="tx_type_waive_interest">Condonar intereses</string>
<string name="tx_type_waive_charges">Condonar cargos</string>
<string name="tx_type_write_off">Castigo de deuda</string>
<string name="tx_type_accrual">Devengo</string>
<string name="tx_type_approval">Aprobación</string>
<string name="tx_type_undo_approval">Deshacer aprobación</string>
<string name="tx_type_undo_disbursal">Deshacer desembolso</string>
<string name="tx_type_reschedule">Reprogramar</string>
<string name="tx_type_recalculate_interest">Recalcular intereses</string>
<string name="tx_type_refund">Reembolso</string>
<string name="tx_type_charge_payment">Pago de cargos</string>
<string name="tx_type_loan_charge_added">Cargo de préstamo añadido</string>
<string name="tx_type_interest_waiver">Exención de intereses</string>
<string name="tx_type_recover_repayment">Recuperar reembolso</string>
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
<string name="tx_type_credit_balance_refund">Reembolso de saldo acreedor</string>
<string name="tx_type_charge_off">Cancelación</string>
<string name="tx_type_tax_withholding">Retención de impuestos</string>
<string name="tx_digits">0123456789</string>

</resources>
Loading
Loading