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

Send Money view fixes

master
preyearegmi 6 years ago
parent
0696d07d54
commit
28d89b80e6
10 changed files with 78 additions and 29 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. 15
      app/src/main/java/com/gmeremit/online/gmeremittance_native/home/model/HomeModel.java
  2. 39
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2Activity.java
  3. 4
      app/src/main/res/drawable-xxhdpi/circular_empty_bg.xml
  4. 4
      app/src/main/res/drawable-xxhdpi/circular_invalid_bg.xml
  5. 4
      app/src/main/res/drawable-xxhdpi/circular_valid_bg.xml
  6. 16
      app/src/main/res/layout/activity_send_money_v2.xml
  7. 5
      app/src/main/res/layout/fragment_amount_detail_send_money_v2.xml
  8. 11
      app/src/main/res/layout/fragment_payout_mode_send_money_v2.xml
  9. 5
      app/src/main/res/layout/fragment_verification_send_money_v2.xml
  10. 4
      app/src/main/res/values/colors.xml

15
app/src/main/java/com/gmeremit/online/gmeremittance_native/home/model/HomeModel.java
View File

@ -136,13 +136,14 @@ public class HomeModel implements HomeContract.HomeModel {
RefreshModal modal = new RefreshModal(context);
modal.performLogout();
} else {
Gson gson = new GsonBuilder().create();
APIRequestErrorReturn statusErrorReturn = new APIRequestErrorReturn();
try {
statusErrorReturn = gson.fromJson(response.errorBody().string(), APIRequestErrorReturn.class);
listener.onNotificationForHomeUnknown(statusErrorReturn.message);
} catch (IOException e) {
}
//TODO commented to avoid crash
// Gson gson = new GsonBuilder().create();
// APIRequestErrorReturn statusErrorReturn = new APIRequestErrorReturn();
// try {
// statusErrorReturn = gson.fromJson(response.errorBody().string(), APIRequestErrorReturn.class);
// listener.onNotificationForHomeUnknown(statusErrorReturn.message);
// } catch (IOException e) {
// }
}
}

39
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2Activity.java
View File

@ -5,6 +5,7 @@ import android.support.v4.app.FragmentTransaction;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.ViewCompat;
import android.view.View;
import android.widget.TextView;
import com.gmeremit.online.gmeremittance_native.R;
@ -22,7 +23,7 @@ import butterknife.ButterKnife;
import static com.gmeremit.online.gmeremittance_native.recipientV2.view.recipientadd.RecipientAddV2Activity.RECIPIENT_INFO_BUNDLE_KEY;
public class SendMoneyV2Activity extends BaseActivity implements SendMoneyActionListener, SendMoneyV2PresenterInterface.SendMoneyV2ContractInterface {
public class SendMoneyV2Activity extends BaseActivity implements SendMoneyActionListener, SendMoneyV2PresenterInterface.SendMoneyV2ContractInterface, View.OnClickListener {
private android.support.v4.app.FragmentManager fragmentManager;
private AddNewRecipientListener addNewRecipientListener;
@ -36,6 +37,12 @@ public class SendMoneyV2Activity extends BaseActivity implements SendMoneyAction
@BindView(R.id.page3TxtView)
TextView page3TxtView;
@BindView(R.id.iv_back)
View iv_back;
@BindView(R.id.iv_cancel)
View iv_cancel;
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -113,6 +120,21 @@ public class SendMoneyV2Activity extends BaseActivity implements SendMoneyAction
}
@Override
protected void onStart() {
super.onStart();
iv_back.setOnClickListener(this);
iv_cancel.setOnClickListener(this);
}
@Override
protected void onStop() {
super.onStop();
iv_back.setOnClickListener(null);
iv_cancel.setOnClickListener(null);
}
@Override
public void requestToAddNewRecipient(AddNewRecipientListener listener) {
this.addNewRecipientListener = listener;
@ -195,4 +217,19 @@ public class SendMoneyV2Activity extends BaseActivity implements SendMoneyAction
break;
}
}
@Override
public void onClick(View v) {
switch(v.getId())
{
case R.id.iv_back:
onBackPressed();
break;
case R.id.iv_cancel:
finish();
break;
}
}
}

4
app/src/main/res/drawable-xxhdpi/circular_empty_bg.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<stroke android:width="1dp" android:color="@color/background_gray" />
<size android:width="40dp" android:height="40dp"/>
<stroke android:width="1dp" android:color="@color/dark_background_gray" />
<size android:width="30dp" android:height="30dp"/>
</shape>

4
app/src/main/res/drawable-xxhdpi/circular_invalid_bg.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<stroke android:width="1dp" android:color="@color/background_gray" />
<stroke android:width="1dp" android:color="@color/dark_background_gray" />
<solid android:width="1dp" android:color="@color/colorPrimary" />
<size android:width="40dp" android:height="40dp"/>
<size android:width="30dp" android:height="30dp"/>
</shape>

4
app/src/main/res/drawable-xxhdpi/circular_valid_bg.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<stroke android:width="1dp" android:color="@color/background_gray" />
<stroke android:width="1dp" android:color="@color/dark_background_gray" />
<solid android:width="1dp" android:color="@color/green" />
<size android:width="40dp" android:height="40dp"/>
<size android:width="30dp" android:height="30dp"/>
</shape>

16
app/src/main/res/layout/activity_send_money_v2.xml
View File

@ -3,12 +3,13 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/send_money_bg_grey"
tools:context=".sendmoneyV2.view.SendMoneyV2Activity"
android:orientation="vertical">
<include layout="@layout/layout_sendmoney_toolbar" />
<LinearLayout
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingTop="30dp"
android:layout_gravity="center_horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -19,12 +20,13 @@
android:layout_height="wrap_content"
android:textColor="@color/dark_gray"
android:text="1"
android:textSize="12sp"
android:background="@drawable/circular_empty_bg"
android:gravity="center"/>
<View
android:layout_width="70dp"
android:layout_height="3dp"
android:background="@color/background_gray"
android:background="@color/dark_background_gray"
android:layout_gravity="center_vertical"/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/page2TxtView"
@ -33,18 +35,22 @@
android:layout_height="wrap_content"
android:textColor="@color/white"
android:text="2"
android:textSize="12sp"
android:background="@drawable/circular_invalid_bg"
android:gravity="center"/>
<View
android:layout_width="70dp"
android:layout_height="3dp"
android:background="@color/background_gray"
android:background="@color/dark_background_gray"
android:layout_gravity="center_vertical"/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/page3TxtView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textColor="@color/dark_background_gray"
android:textSize="12sp"
android:text="3"
android:background="@drawable/circular_valid_bg"
android:gravity="center"/>

5
app/src/main/res/layout/fragment_amount_detail_send_money_v2.xml
View File

@ -4,11 +4,12 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent"
android:clickable="true"
android:background="@color/white"
android:background="@color/send_money_bg_grey"
tools:context="com.gmeremit.online.gmeremittance_native.exchange_rate.view.ExchangeMethodV2Activity"
android:layout_width="match_parent">
<LinearLayout
android:paddingTop="30dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
@ -216,7 +217,7 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
android:id="@+id/amountDetailContinueButton"
android:layout_marginTop="20dp"
android:layout_marginTop="40dp"
android:layout_marginBottom="20dp"
android:layout_width="200dp"
android:layout_height="50dp"

11
app/src/main/res/layout/fragment_payout_mode_send_money_v2.xml
View File

@ -2,17 +2,18 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:clickable="true"
android:background="@color/white"
android:background="@color/send_money_bg_grey"
android:layout_height="match_parent">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:paddingTop="30dp"
android:orientation="vertical">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:paddingTop="10dp"
android:id="@+id/paymentModeTitle"
android:padding="20dp"
android:layout_width="match_parent"
android:singleLine="false"
android:gravity="center"
@ -24,8 +25,8 @@
/>
<android.support.v7.widget.RecyclerView
android:layout_marginTop="50dp"
android:layout_marginBottom="50dp"
android:layout_marginTop="80dp"
android:layout_marginBottom="80dp"
android:id="@+id/paymentModeRV"
android:layout_width="wrap_content"
android:layout_height="0dp"
@ -33,7 +34,7 @@
android:layout_marginLeft="6dp"
android:layout_marginRight="6dp"
android:orientation="horizontal"
android:layout_gravity="center_vertical|start"
android:layout_gravity="center"
app:layoutManager="android.support.v7.widget.LinearLayoutManager" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton

5
app/src/main/res/layout/fragment_verification_send_money_v2.xml
View File

@ -4,11 +4,12 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:clickable="true"
android:focusable="true"
android:background="@color/white"
android:background="@color/send_money_bg_grey"
android:layout_height="match_parent">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:paddingTop="30dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:paddingLeft="20dp"
@ -16,7 +17,7 @@
android:layout_height="wrap_content">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:paddingTop="20dp"
android:paddingTop="10dp"
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"

4
app/src/main/res/values/colors.xml
View File

@ -22,7 +22,9 @@
<color name="dialog_bg">#D9FFFFFF</color>
<color name="dialog_btn">#0076ff</color>
<color name="btn_disabled">#d6e3ee</color>
<color name="green">#6CD856</color>
<color name="green">#40BF39</color>
<color name="send_money_bg_grey">#FAFAFA</color>
<color name="send_money_bg_pager">#EDF1F5</color>
<color name="invite_blue">#92DAEA</color>

Write Preview
Loading…
Cancel
Save