Browse Source

add few final app feedback uncommitted changes and add send money screen feature to automatically populate amount from home screen

ui-enhancement
Mukesh Dhungana 8 months ago
parent
commit
bdd4e4f45d
  1. 12
      .idea/assetWizardSettings.xml
  2. 5
      .idea/gradle.xml
  3. 4
      app/build.gradle
  4. BIN
      app/src/main/ic_launcher-playstore.png
  5. 2
      app/src/main/java/com/remit/jmecustomer/features/appupdate/AppUpdateActivity.java
  6. 5
      app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt
  7. 5
      app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailSendMoneyFragment.java
  8. 2
      app/src/main/java/com/remit/jmecustomer/utils/Constants.java
  9. 2
      app/src/main/res/layout/activity_app_update.xml
  10. BIN
      app/src/main/res/mipmap-hdpi/ic_launcher.png
  11. BIN
      app/src/main/res/mipmap-hdpi/ic_launcher.webp
  12. BIN
      app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
  13. BIN
      app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
  14. BIN
      app/src/main/res/mipmap-hdpi/ic_launcher_round.png
  15. BIN
      app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
  16. BIN
      app/src/main/res/mipmap-ldpi/ic_launcher.png
  17. BIN
      app/src/main/res/mipmap-mdpi/ic_launcher.png
  18. BIN
      app/src/main/res/mipmap-mdpi/ic_launcher.webp
  19. BIN
      app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
  20. BIN
      app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
  21. BIN
      app/src/main/res/mipmap-mdpi/ic_launcher_round.png
  22. BIN
      app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
  23. BIN
      app/src/main/res/mipmap-xhdpi/ic_launcher.png
  24. BIN
      app/src/main/res/mipmap-xhdpi/ic_launcher.webp
  25. BIN
      app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
  26. BIN
      app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
  27. BIN
      app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
  28. BIN
      app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
  29. BIN
      app/src/main/res/mipmap-xxhdpi/ic_launcher.png
  30. BIN
      app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
  31. BIN
      app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
  32. BIN
      app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
  33. BIN
      app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
  34. BIN
      app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
  35. BIN
      app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
  36. BIN
      app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
  37. BIN
      app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
  38. BIN
      app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
  39. BIN
      app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
  40. BIN
      app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp

12
.idea/assetWizardSettings.xml

@ -24,7 +24,7 @@
<option name="values">
<map>
<entry key="color" value="000000" />
<entry key="imagePath" value="/private/var/folders/k5/znryrgx56hv6cn9d7mdt2j280000gn/T/ic_android_black_24dp.xml" />
<entry key="imagePath" value="/private/var/folders/fq/rmfd4q755dnb8bpn1nvtgstm0000gn/T/ic_android_black_24dp.xml" />
</map>
</option>
</PersistentState>
@ -73,7 +73,7 @@
<PersistentState>
<option name="values">
<map>
<entry key="imagePath" value="/private/var/folders/k5/znryrgx56hv6cn9d7mdt2j280000gn/T/ic_android_black_24dp.xml" />
<entry key="imagePath" value="/private/var/folders/fq/rmfd4q755dnb8bpn1nvtgstm0000gn/T/ic_android_black_24dp.xml" />
</map>
</option>
</PersistentState>
@ -85,7 +85,7 @@
<option name="values">
<map>
<entry key="color" value="000000" />
<entry key="imagePath" value="$USER_HOME$/Desktop/jme.png" />
<entry key="imagePath" value="$USER_HOME$/Downloads/image_2023_12_06T14_30_18_570Z.png" />
<entry key="scalingPercent" value="68" />
</map>
</option>
@ -130,7 +130,7 @@
<option name="values">
<map>
<entry key="color" value="000000" />
<entry key="imagePath" value="/private/var/folders/k5/znryrgx56hv6cn9d7mdt2j280000gn/T/ic_android_black_24dp.xml" />
<entry key="imagePath" value="/private/var/folders/fq/rmfd4q755dnb8bpn1nvtgstm0000gn/T/ic_android_black_24dp.xml" />
</map>
</option>
</PersistentState>
@ -174,7 +174,7 @@
<option name="values">
<map>
<entry key="color" value="000000" />
<entry key="imagePath" value="/private/var/folders/k5/znryrgx56hv6cn9d7mdt2j280000gn/T/ic_android_black_24dp.xml" />
<entry key="imagePath" value="/private/var/folders/fq/rmfd4q755dnb8bpn1nvtgstm0000gn/T/ic_android_black_24dp.xml" />
</map>
</option>
</PersistentState>
@ -238,7 +238,7 @@
<PersistentState>
<option name="values">
<map>
<entry key="imagePath" value="/private/var/folders/k5/znryrgx56hv6cn9d7mdt2j280000gn/T/ic_android_black_24dp.xml" />
<entry key="imagePath" value="/private/var/folders/fq/rmfd4q755dnb8bpn1nvtgstm0000gn/T/ic_android_black_24dp.xml" />
</map>
</option>
</PersistentState>

5
.idea/gradle.xml

@ -4,10 +4,8 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="jbr-17" />
<option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
@ -16,6 +14,7 @@
<option value="$PROJECT_DIR$/httpclient-release" />
</set>
</option>
<option name="resolveExternalAnnotations" value="false" />
</GradleProjectSettings>
</option>
</component>

4
app/build.gradle

@ -127,8 +127,8 @@ android {
signingConfig signingConfigs.debug
// buildConfigField 'String', 'BASE_URL', '"http://202.166.220.36:8083/api/"'
//buildConfigField 'String', 'BASE_URL', '"https://sandboxapi.japanremit.com:8083/api/"'
//buildConfigField 'String', 'BASE_URL', '"http://77.68.15.91:1082/api/"'
buildConfigField 'String', 'BASE_URL', '"https://mobile.imelondon.co.uk:2086/api/"'
buildConfigField 'String', 'BASE_URL', '"http://77.68.15.91:1082/api/"'
//buildConfigField 'String', 'BASE_URL', '"https://mobile.imelondon.co.uk:2086/api/"'
buildConfigField 'String', 'API_VERSION', '"v1"'
buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"'
buildConfigField 'String', 'GME_TOKEN', '"39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru"'

BIN
app/src/main/ic_launcher-playstore.png

Before

Width: 512  |  Height: 512  |  Size: 33 KiB

After

Width: 512  |  Height: 512  |  Size: 59 KiB

2
app/src/main/java/com/remit/jmecustomer/features/appupdate/AppUpdateActivity.java

@ -119,7 +119,7 @@ public class AppUpdateActivity extends AppCompatActivity {
for (ResolveInfo otherApp : otherApps) {
// look for Google Play application
if (otherApp.activityInfo.applicationInfo.packageName
.contains("com.remit.jmecustomer")) {
.contains("com.inficare.iremit.imelondon")) {
ActivityInfo otherAppActivity = otherApp.activityInfo;
ComponentName componentName = new ComponentName(

5
app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt

@ -329,6 +329,9 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
Constants.ENTERED_SENDING_AMOUNT = Utils.removeCommaFromAmount(
sendMoneyEditText?.text.toString().trim()
)
Constants.ENTERED_RECEIVING_AMOUNT = Utils.removeCommaFromAmount(
recieveMoneyEditText?.text.toString().trim()
)
}
R.id.countrySelectionSpinner, R.id.recepientCurrencyTextView, R.id.iv_currency_2, R.id.cl_country -> showCountryListinDialog()
@ -571,6 +574,7 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
// Toast.makeText(getContext(), "unfocus", Toast.LENGTH_SHORT).show();
presenter.setCalcByPayoutAmount(false)
presenter.calcExrate()
Constants.SHOW_CALCULATED_BY_RECIPIENT = false
}
}
@ -580,6 +584,7 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
// Toast.makeText(getContext(), "unfocus", Toast.LENGTH_SHORT).show();
presenter.setCalcByPayoutAmount(true)
presenter.calcExrate()
Constants.SHOW_CALCULATED_BY_RECIPIENT = true
}
}
}

5
app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailSendMoneyFragment.java

@ -179,7 +179,7 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements Payme
this.recepientAmountTextWatcher = new RecipientAmountTextWatcher();
interpolator = new AccelerateDecelerateInterpolator();
setupRecyclerView();
registerTextWatchers(true);
//registerTextWatchers(true);
viewmodel.fetchRewardsLiveData();
viewmodel.subscribeToRewardsPoint().observe(getViewLifecycleOwner(), this::updateRewardDetails);
}
@ -192,6 +192,8 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements Payme
//
// } else {
sendMoneyEditText.setText(Constants.ENTERED_SENDING_AMOUNT);
shouldCaulatedByRecipient = Constants.SHOW_CALCULATED_BY_RECIPIENT;
recieveMoneyEditText.setText(Constants.ENTERED_RECEIVING_AMOUNT);
// }
getForex();
@ -289,6 +291,7 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements Payme
updateButtonToCalculate(true);
}
setDefaultAmount();
registerTextWatchers(true);
});
viewmodel.subscribeToExRateData().observe(getViewLifecycleOwner(), data -> {

2
app/src/main/java/com/remit/jmecustomer/utils/Constants.java

@ -138,6 +138,8 @@ public class Constants {
public static String CURRENT_COUNTRY_ID = "151";
public static String ENTERED_SENDING_AMOUNT = "";
public static String ENTERED_RECEIVING_AMOUNT = "";
public static boolean SHOW_CALCULATED_BY_RECIPIENT = false;
public static int UPDATE_DELETE_CODE = 2008;
}

2
app/src/main/res/layout/activity_app_update.xml

@ -12,7 +12,7 @@
android:layout_height="100dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:src="@drawable/ic_logo_white_large"
android:src="@drawable/ic_logo_london"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

BIN
app/src/main/res/mipmap-hdpi/ic_launcher.png

Before

Width: 72  |  Height: 72  |  Size: 2.8 KiB

BIN
app/src/main/res/mipmap-hdpi/ic_launcher.webp

BIN
app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png

Before

Width: 72  |  Height: 72  |  Size: 1.2 KiB

BIN
app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp

BIN
app/src/main/res/mipmap-hdpi/ic_launcher_round.png

Before

Width: 72  |  Height: 72  |  Size: 5.8 KiB

BIN
app/src/main/res/mipmap-hdpi/ic_launcher_round.webp

BIN
app/src/main/res/mipmap-ldpi/ic_launcher.png

Before

Width: 36  |  Height: 36  |  Size: 1.1 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher.png

Before

Width: 48  |  Height: 48  |  Size: 1.5 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher.webp

BIN
app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png

Before

Width: 48  |  Height: 48  |  Size: 812 B

BIN
app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp

BIN
app/src/main/res/mipmap-mdpi/ic_launcher_round.png

Before

Width: 48  |  Height: 48  |  Size: 1.9 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher_round.webp

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.png

Before

Width: 96  |  Height: 96  |  Size: 3.9 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.webp

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png

Before

Width: 96  |  Height: 96  |  Size: 1.5 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_round.png

Before

Width: 96  |  Height: 96  |  Size: 8.8 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher.png

Before

Width: 144  |  Height: 144  |  Size: 6.4 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher.webp

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png

Before

Width: 144  |  Height: 144  |  Size: 5.3 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png

Before

Width: 144  |  Height: 144  |  Size: 15 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png

Before

Width: 196  |  Height: 196  |  Size: 9.3 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png

Before

Width: 192  |  Height: 192  |  Size: 8.0 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png

Before

Width: 192  |  Height: 192  |  Size: 22 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp

Loading…
Cancel
Save