Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d4805219f4
|
||
|
|
4c680ad22c
|
||
|
|
494a42c1a8
|
||
|
|
9ace8dd724
|
||
|
|
a3449167db
|
||
|
|
1612e21471
|
||
|
|
f02b05b180
|
@@ -24,20 +24,11 @@ jobs:
|
||||
echo "version=$VERSION" >> $GITHUB_OUTPUT
|
||||
echo "version_code=$VERSION_CODE" >> $GITHUB_OUTPUT
|
||||
|
||||
BEFORE="${{ github.event.before }}"
|
||||
if [ -z "$BEFORE" ] || ! git cat-file -e "${BEFORE}^{commit}" 2>/dev/null; then
|
||||
BEFORE="HEAD~1"
|
||||
fi
|
||||
PREV_VERSION_CODE=$(git show "${BEFORE}:app/build.gradle.kts" 2>/dev/null | grep 'versionCode = ' | sed 's/.*versionCode = \([0-9]*\).*/\1/')
|
||||
|
||||
if [ "$VERSION_CODE" = "$PREV_VERSION_CODE" ]; then
|
||||
echo "versionCode unchanged (${VERSION_CODE}), skipping"
|
||||
if git tag -l | grep -q "^v${VERSION}$"; then
|
||||
echo "Tag v${VERSION} already exists, skipping"
|
||||
echo "should_release=false" >> $GITHUB_OUTPUT
|
||||
elif git tag -l | grep -q "^v${VERSION}$"; then
|
||||
echo "versionCode changed (${PREV_VERSION_CODE} -> ${VERSION_CODE}) but tag v${VERSION} already exists; bump versionName"
|
||||
exit 1
|
||||
else
|
||||
echo "New versionCode detected: ${PREV_VERSION_CODE} -> ${VERSION_CODE} (v${VERSION})"
|
||||
echo "New version detected: v${VERSION}"
|
||||
echo "should_release=true" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@ android {
|
||||
applicationId = "sh.sar.basedbank"
|
||||
minSdk = 26
|
||||
targetSdk = 36
|
||||
versionCode = 34
|
||||
versionName = "1.0.33"
|
||||
versionCode = 35
|
||||
versionName = "1.0.35"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
|
||||
|
||||
@@ -1126,7 +1126,7 @@ class TransferFragment : Fragment() {
|
||||
|
||||
binding.etTo.setOnItemClickListener { _, _, position, _ ->
|
||||
val contact = adapter.getContact(position) ?: return@setOnItemClickListener
|
||||
if (applyFahipayContact(contact.benefAccount, contact.benefCategoryId, contact.benefNickName)) {
|
||||
if (applyServiceContact(contact.benefAccount, contact.benefCategoryId, contact.benefNickName)) {
|
||||
return@setOnItemClickListener
|
||||
}
|
||||
prefillToDirectly(
|
||||
|
||||
@@ -261,7 +261,6 @@
|
||||
<string name="transfer_to">އެކައުންޓް ނަންބަރު ނުވަތަ ފަވާރާ އައިޑީ</string>
|
||||
<string name="transfer_label_from">ފޮނުވާ އެކައުންޓް</string>
|
||||
<string name="transfer_label_to">ލިބޭ އެކައުންޓް</string>
|
||||
<string name="transfer_select_service">ޚިދުމަތް އިޚްތިޔާރުކުރޭ</string>
|
||||
<string name="transfer_fahipay_phone_only">ފަހިޕޭއިން ފައިސާ ފޮނުވޭނީ 7 އަދަދުގެ ފޯނު ނަންބަރަކަށް</string>
|
||||
<string name="transfer_my_accounts">އަމިއްލަ އެކައުންޓްތައް</string>
|
||||
<string name="transfer_same_as_from">މިއީ ފައިސާ ފޮނުވާ އެކައުންޓް</string>
|
||||
|
||||
@@ -105,7 +105,7 @@ Each Fahipay favourites list is one payout service (`FahipayService.contactCateg
|
||||
| `FAHIPAY_OOREDOO_BILL` | Ooredoo Bill Pay |
|
||||
| `FAHIPAY_DHIRAAGU_BILL` | Dhiraagu Bill Pay |
|
||||
|
||||
So picking a favourite skips the carrier lookup and the picker. That service is offered as the only transfer type, so it's picked straight away (`TransferFragment.applyFahipayContact`). As with a searched number, that switches the source to the Fahipay wallet and applies the service's amount rules. This happens wherever a favourite is picked:
|
||||
So picking a favourite skips the carrier lookup and the picker. That service is offered as the only transfer type, so it's picked straight away (`TransferFragment.applyServiceContact`). As with a searched number, that switches the source to the Fahipay wallet and applies the service's amount rules. This happens wherever a favourite is picked:
|
||||
|
||||
- the contact picker sheet (the row's category goes back as `ContactPickerSheetFragment.KEY_CATEGORY`)
|
||||
- the "To" field's search-as-you-type dropdown
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
- updated dhivehi transaltions (thank you @quillfires)
|
||||
- improved fahipay support
|
||||
- new UI to select transfer type (Favara, Reload, Raastas, Billpay)
|
||||
- Ooredoo Raastas via Fahipay
|
||||
- Ooredo Billpay via Fahipay
|
||||
- Dhiraagu reload via Fahipay
|
||||
- Dhiraagu billpay via Fahipay
|
||||
- Ooredoo Raastas via BML verified cards
|
||||
- Ooredoo Billpay via BML verified cards
|
||||
- Dhiraagu Reload via BML verifed cards
|
||||
- Dhiraagu billpay via BML verified cards
|
||||
Reference in New Issue
Block a user