IME-LONDON
/
Android_London
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Icon fixes

master
Preyea Regmi 5 years ago
parent
30b6422335
commit
618040a76e
13 changed files with 77 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      app/src/main/AndroidManifest.xml
  2. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/inboundaccountmanage/InboundAccountAddV2Presenter.java
  3. 14
      app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/model/HomeViewRelatedDTOV2.java
  4. 4
      app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java
  5. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2PresenterInterface.java
  6. 12
      app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java
  7. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java
  8. BIN
      app/src/main/res/drawable/ic_delete.png
  9. 21
      app/src/main/res/layout/auto_debit_account_list_item.xml
  10. 4
      app/src/main/res/layout/fragment_home_v3.xml
  11. 23
      app/src/main/res/layout/inbound_account_list_item.xml
  12. 1
      app/src/main/res/layout/layout_sendmoney_toolbar.xml
  13. 35
      app/src/main/res/layout/nav_drawer_fragment.xml

3
app/src/main/AndroidManifest.xml
View File

@ -23,11 +23,10 @@
android:label="@string/app_name"
android:largeHeap="true"
android:networkSecurityConfig="@xml/network_security_config"
android:supportsRtl="false"
android:roundIcon="@mipmap/ic_launcher"
android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning"
tools:replace="android:allowBackup,android:supportsRtl">
tools:replace="android:allowBackup">
<activity android:name="com.gmeremit.online.gmeremittance_native.inboundreceipt.view.InboundRemitReceiptActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/accountmanage/presenter/inboundaccountmanage/InboundAccountAddV2Presenter.java
View File

@ -165,7 +165,7 @@ public class InboundAccountAddV2Presenter extends BasePresenter implements Inbou
@Override
protected void onSuccess(GenericResponseDataModel<MessageResponseDataModel> t) {
if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
InboundAddAccountPennyTestFragment.InboundPennyTestViewDTO pennyTestViewDTO = new InboundAddAccountPennyTestFragment.InboundPennyTestViewDTO(pennyTestRequestBody.getBankName(), pennyTestRequestBody.getBankCode(), pennyTestRequestBody.getAccountNo(), t.getMsg());
InboundAddAccountPennyTestFragment.InboundPennyTestViewDTO pennyTestViewDTO = new InboundAddAccountPennyTestFragment.InboundPennyTestViewDTO(pennyTestRequestBody.getBankName(), pennyTestRequestBody.getBankCode(), pennyTestRequestBody.getAccountNo(), getStringfromStringId(R.string.pennytest_information_text));
view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.SUCCESS, alertType -> {
pennyTestDataSubject.onNext(pennyTestViewDTO);
view.showPennyTestScreen();

14
app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/model/HomeViewRelatedDTOV2.java
View File

@ -5,7 +5,7 @@ public class HomeViewRelatedDTOV2 {
private HomeNotificationViewDTO homeNotificationViewDTO;
private String userName;
private String yearlyLimit;
private String availableBalance;
private String rewardPoint;
private boolean shouldShowKJBankNotice;
@ -16,9 +16,9 @@ public class HomeViewRelatedDTOV2 {
private String autoDebitNoticeBody;
public HomeViewRelatedDTOV2(boolean shouldShowKycView, String kycMessage, String kycTitle, boolean disableKYCViewClick, String userName, String yearlyLimit, String rewardPoint, boolean isPennyTestPending, boolean hasRequestedPennyTest, String pennyTestTitle, String pennyTestMessage, boolean shouldShowAutoDebitNotice, String autoDebitTitle, String autoDebitBody, boolean shouldShowKJBankNotice) {
public HomeViewRelatedDTOV2(boolean shouldShowKycView, String kycMessage, String kycTitle, boolean disableKYCViewClick, String userName, String availableBalance, String rewardPoint, boolean isPennyTestPending, boolean hasRequestedPennyTest, String pennyTestTitle, String pennyTestMessage, boolean shouldShowAutoDebitNotice, String autoDebitTitle, String autoDebitBody, boolean shouldShowKJBankNotice) {
this.userName = userName;
this.yearlyLimit = yearlyLimit;
this.availableBalance = availableBalance;
this.rewardPoint = rewardPoint;
this.shouldShowAutoDebitNotice = shouldShowAutoDebitNotice;
this.shouldShowKJBankNotice = shouldShowKJBankNotice;
@ -26,9 +26,9 @@ public class HomeViewRelatedDTOV2 {
this.autoDebitNoticeBody = autoDebitBody;
}
public HomeViewRelatedDTOV2( String userName, String yearlyLimit, String rewardPoint, boolean shouldShowAutoDebitNotice, String autoDebitTitle, String autoDebitBody, boolean shouldShowKJBankNotice,HomeNotificationViewDTO homeNotificationViewDTO) {
public HomeViewRelatedDTOV2(String userName, String availableBalance, String rewardPoint, boolean shouldShowAutoDebitNotice, String autoDebitTitle, String autoDebitBody, boolean shouldShowKJBankNotice, HomeNotificationViewDTO homeNotificationViewDTO) {
this.userName = userName;
this.yearlyLimit = yearlyLimit;
this.availableBalance = availableBalance;
this.rewardPoint = rewardPoint;
this.shouldShowAutoDebitNotice = shouldShowAutoDebitNotice;
this.shouldShowKJBankNotice = shouldShowKJBankNotice;
@ -40,8 +40,8 @@ public class HomeViewRelatedDTOV2 {
return userName;
}
public String getYearlyLimit() {
return yearlyLimit;
public String getAvailableBalance() {
return availableBalance;
}
public String getRewardPoint() {

4
app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java
View File

@ -218,7 +218,7 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt
String fullName = userInfoModelV2.getFirstName();
view.showInfoInDrawer(fullName, userInfoModelV2.getEmail(), userInfoModelV2.getAvailableBalance(), userInfoModelV2.getWalletNumber(), userInfoModelV2.getPrimaryBankName(), userInfoModelV2.getMobileNumber());
view.showInfoInDrawer(fullName, userInfoModelV2.getEmail(), userInfoModelV2.getYearlyLimit(), userInfoModelV2.getWalletNumber(), userInfoModelV2.getPrimaryBankName(), userInfoModelV2.getMobileNumber());
long dateDifference = checkIfAutoDebitRenewIsRequired(userInfoModelV2.getAccessTokenRegTime(), userInfoModelV2.getAccessTokenExpTime());
String autoDebitTitle = getStringfromStringId(R.string.token_renewal_confirm_text);
@ -233,7 +233,7 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt
HomeNotificationViewDTO notificationViewDTO = new HomeNotificationHandler(GmeApplication.getStringExtractor(), userInfoModelV2.getKyc(), userInfoModelV2.isVerified(), userInfoModelV2.getPennyTestStatus(), userInfoModelV2.getRedirectTo())
.generateAppropriateHomeNotificationViewDTO();
homeFragmentRelatedSubjectV2.onNext(new HomeViewRelatedDTOV2(fullName, userInfoModelV2.getYearlyLimit(),
homeFragmentRelatedSubjectV2.onNext(new HomeViewRelatedDTOV2(fullName, userInfoModelV2.getAvailableBalance(),
userInfoModelV2.getRewardPoint(), shouldShowAutoDebitNotice, autoDebitTitle, autoDebitBody, shouldShowKJBankNotice, notificationViewDTO));
//If no notification is generated then we can show privileged Operation View

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2PresenterInterface.java
View File

@ -55,7 +55,7 @@ public interface HomeV2PresenterInterface extends BasePresenterInterface {
interface HomeV2ContractInterface extends BaseContractInterface
{
void showInfoInDrawer(String fullname, String email, String balance, String walletNumber, String bankName, String contact);
void showInfoInDrawer(String fullname, String email, String yearlyLimit, String walletNumber, String bankName, String contact);
void showKYCVerifiedIfRequired(boolean shouldShowView, String message, String title, boolean disableKYCViewClick,Runnable callback);

12
app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java
View File

@ -470,7 +470,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
}
@Override
public void showInfoInDrawer(String fullname, String email, String balance, String walletNumber, String bankName, String contact) {
public void showInfoInDrawer(String fullname, String email, String yearlyLimit, String walletNumber, String bankName, String contact) {
TextView txtUserName = nav_drawer.findViewById(R.id.txt_user_name);
@ -486,12 +486,12 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
if (contact != null) {
txtContact.setText(contact);
}
if (balance != null) {
if (balance.length() > 0)
if (yearlyLimit != null) {
if (yearlyLimit.length() > 0)
try {
txtBalance.setText(Utils.amountFormat(Double.parseDouble(balance)));
txtBalance.setText(Utils.amountFormat(Double.parseDouble(yearlyLimit)));
} catch (Exception e) {
txtBalance.setText(balance);
txtBalance.setText(yearlyLimit);
}
else
txtBalance.setText(getString(R.string.na_text));
@ -606,7 +606,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
bankName = " (" + bankName + ") ";
String gmeWalletNo = getString(R.string.gme_wallet_no_text);
controlNo.setText(Html.fromHtml(gmeWalletNo + " <b><font color='#ed1c24'> " + walletNumber + "</font></b>" + bankName));
controlNo.setText(Html.fromHtml(gmeWalletNo + "\n <b><font color='#ed1c24'> " + walletNumber + "</font></b>" + bankName));
}

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java
View File

@ -316,7 +316,7 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2.
@Override
protected void onSuccess(HomeViewRelatedDTOV2 homeViewRelatedDTOV2) {
if(isUIReady()) {
updateInfo(homeViewRelatedDTOV2.getUserName(), homeViewRelatedDTOV2.getYearlyLimit(), homeViewRelatedDTOV2.getRewardPoint());
updateInfo(homeViewRelatedDTOV2.getUserName(), homeViewRelatedDTOV2.getAvailableBalance(), homeViewRelatedDTOV2.getRewardPoint());
showAutoDebitNoticeViewIfRequiredInPopup(homeViewRelatedDTOV2.shouldShowAutoDebitNotice(), homeViewRelatedDTOV2.getAutoDebitNoticeTitle(), homeViewRelatedDTOV2.getAutoDebitNoticeBody(), () -> {
showNotificationView(homeViewRelatedDTOV2.getHomeNotificationViewDTO());
});

BIN
app/src/main/res/drawable/ic_delete.png
View File

Side by Side

After

Width: 48  |  Height: 48  |  Size: 16 KiB

21
app/src/main/res/layout/auto_debit_account_list_item.xml
View File

@ -4,10 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="3dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="3dp"
android:layout_margin="@dimen/_8sdp"
android:background="@drawable/ic_rounded_white">
<ImageView
@ -67,15 +64,15 @@
android:layout_width="@dimen/_22sdp"
android:layout_height="@dimen/_22sdp"
android:layout_centerVertical="true"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:scaleType="centerCrop"
android:src="@drawable/ch_plugin_delete_all"
android:src="@drawable/ic_delete"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/iv_link_acc"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.62" />
<ImageView
android:id="@+id/iv_link_acc"
@ -84,11 +81,11 @@
android:layout_centerVertical="true"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginEnd="12dp"
android:scaleType="centerCrop"
android:src="@drawable/ic_register_inbound"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.32" />
app:layout_constraintEnd_toStartOf="@+id/iv_remove_acc"
app:layout_constraintTop_toTopOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/fragment_home_v3.xml
View File

@ -45,7 +45,7 @@
android:layout_centerHorizontal="true"
android:gravity="center_horizontal"
android:padding="2dp"
android:text="@string/remaining_limit_text"
android:text="@string/available_balance_text"
android:textSize="13sp"
app:fontFamily="@string/bold"
app:layout_constraintEnd_toEndOf="parent"
@ -74,7 +74,7 @@
android:layout_below="@id/tv_balance_label"
android:layout_centerHorizontal="true"
android:paddingLeft="4dp"
android:text="@string/usd_text"
android:text="@string/krw_text"
android:textColor="@color/darkgray"
android:textSize="18sp"
android:visibility="visible"

23
app/src/main/res/layout/inbound_account_list_item.xml
View File

@ -4,10 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="3dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="3dp"
android:layout_margin="@dimen/_8sdp"
android:background="@drawable/ic_rounded_white">
<ImageView
@ -65,27 +62,29 @@
<ImageView
android:id="@+id/iv_delete_inbound"
android:layout_width="@dimen/_22sdp"
android:layout_height="@dimen/_22sdp"
android:layout_width="@dimen/_26sdp"
android:layout_height="@dimen/_26sdp"
android:layout_centerVertical="true"
android:layout_marginEnd="8dp"
android:layout_marginEnd="4dp"
android:layout_marginStart="8dp"
android:scaleType="centerCrop"
android:src="@drawable/ch_plugin_delete_all"
android:src="@drawable/ic_delete"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/iv_link_inbound"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
/>
<ImageView
android:id="@+id/iv_link_inbound"
android:layout_width="@dimen/_22sdp"
android:layout_height="@dimen/_22sdp"
android:layout_centerVertical="true"
android:layout_marginEnd="8dp"
android:layout_marginEnd="4dp"
android:layout_marginStart="8dp"
android:scaleType="centerCrop"
android:src="@drawable/alert"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toStartOf="@+id/iv_delete_inbound"
app:layout_constraintTop_toTopOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>

1
app/src/main/res/layout/layout_sendmoney_toolbar.xml
View File

@ -27,6 +27,7 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/iv_cancel"
android:visibility="invisible"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true"

35
app/src/main/res/layout/nav_drawer_fragment.xml
View File

@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/white"
android:orientation="vertical">
@ -99,7 +100,7 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/available_balance_text"
android:text="@string/remaining_limit_text"
android:textColor="@color/darkgray"
android:textSize="14sp" />
@ -127,35 +128,43 @@
android:layout_height="wrap_content"
android:layout_marginLeft="3dp"
android:layout_marginStart="3dp"
android:text="@string/krw_text" />
android:text="@string/usd_text" />
</LinearLayout>
<LinearLayout
android:layout_marginTop="@dimen/_6sdp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_marginTop="3dp"
android:layout_marginBottom="3dp"
android:layout_gravity="start"
android:id="@+id/tv_gme_control_no"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/gme_wallet_no_text"
android:textColor="@color/darkgray"
android:textSize="15sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_gravity="bottom"
android:visibility="visible"
android:id="@+id/btn_withdraw"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="24dp"
android:layout_marginRight="24dp"
android:layout_marginStart="10dp"
android:layout_marginLeft="10dp"
android:background="@drawable/ic_rounded_background_gray_nav"
android:gravity="center"
android:text="@string/withdraw_text"
android:textAllCaps="false"
android:textColor="@color/darkgray"
android:textSize="12sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/tv_gme_control_no"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="@string/gme_wallet_no_text"
android:textColor="@color/darkgray"
android:textSize="15sp" />
</LinearLayout>
</LinearLayout>

Write Preview
Loading…
Cancel
Save