From c829970e5d806b3e09482d8860048c35ae8d2353 Mon Sep 17 00:00:00 2001 From: Prasanth Date: Tue, 3 Nov 2020 20:11:26 +0530 Subject: [PATCH 1/9] DTSERWFOUR-147-Alignment-Bug-fixes - Incorrect Spacing between Subheader and content --- receiptui/src/main/res/layout/fragment_receipt_detail.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/receiptui/src/main/res/layout/fragment_receipt_detail.xml b/receiptui/src/main/res/layout/fragment_receipt_detail.xml index 0ccda245e..5a52bf666 100644 --- a/receiptui/src/main/res/layout/fragment_receipt_detail.xml +++ b/receiptui/src/main/res/layout/fragment_receipt_detail.xml @@ -55,6 +55,7 @@ android:id="@+id/receipt_details_header" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/grid_margin_top" style="@style/HeaderTitleAppearance"> Date: Fri, 6 Nov 2020 18:39:29 +0530 Subject: [PATCH 2/9] task/DTSERWFOUR-147-Alignment-Bug-fixes - Fixed header top --- commonui/src/main/res/values/dimens.xml | 2 +- receiptui/src/main/res/layout/fragment_tabbed_list_receipt.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/commonui/src/main/res/values/dimens.xml b/commonui/src/main/res/values/dimens.xml index bc0c2a4fd..76c124012 100644 --- a/commonui/src/main/res/values/dimens.xml +++ b/commonui/src/main/res/values/dimens.xml @@ -71,7 +71,7 @@ 16dp 40dp 300dp - 64dp + 16dp 155dp 4dp 7dp diff --git a/receiptui/src/main/res/layout/fragment_tabbed_list_receipt.xml b/receiptui/src/main/res/layout/fragment_tabbed_list_receipt.xml index fa0195f51..8c12deedf 100644 --- a/receiptui/src/main/res/layout/fragment_tabbed_list_receipt.xml +++ b/receiptui/src/main/res/layout/fragment_tabbed_list_receipt.xml @@ -12,6 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentTop="true" + android:layout_marginTop="16dp" android:paddingBottom="@dimen/item_horizontal_padding" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent"> From ad17e1a8f02f46aef7a0d104e175f12f87d862c0 Mon Sep 17 00:00:00 2001 From: Prasanth Date: Tue, 10 Nov 2020 20:25:59 +0530 Subject: [PATCH 3/9] task/DTSERWFOUR-147-Alignment-Bug-fixes - Transfer Method & Add Transfer Method --- transfermethodui/src/main/AndroidManifest.xml | 2 +- .../view/ListTransferMethodActivity.java | 5 ++++- .../view/SelectTransferMethodActivity.java | 5 ++++- .../res/layout/activity_list_transfer_method.xml | 12 +++++++++++- .../res/layout/activity_select_transfer_method.xml | 12 +++++++++++- 5 files changed, 31 insertions(+), 5 deletions(-) diff --git a/transfermethodui/src/main/AndroidManifest.xml b/transfermethodui/src/main/AndroidManifest.xml index 0706f95dd..2a97d4dee 100644 --- a/transfermethodui/src/main/AndroidManifest.xml +++ b/transfermethodui/src/main/AndroidManifest.xml @@ -14,7 +14,7 @@ diff --git a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/ListTransferMethodActivity.java b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/ListTransferMethodActivity.java index cdca8f901..7a1226b91 100644 --- a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/ListTransferMethodActivity.java +++ b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/ListTransferMethodActivity.java @@ -23,6 +23,7 @@ import android.content.pm.ActivityInfo; import android.os.Bundle; import android.view.View; +import android.widget.TextView; import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; @@ -72,7 +73,9 @@ protected void onCreate(Bundle savedInstanceState) { setSupportActionBar(toolbar); getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayShowHomeEnabled(true); - getSupportActionBar().setTitle(R.string.mobileTransferMethodsHeader); + + TextView titleText = findViewById(R.id.toolbar_title); + titleText.setText(R.string.mobileTransferMethodsHeader); toolbar.setNavigationOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/SelectTransferMethodActivity.java b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/SelectTransferMethodActivity.java index 4136ebc9e..905b6ec3d 100644 --- a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/SelectTransferMethodActivity.java +++ b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/SelectTransferMethodActivity.java @@ -24,6 +24,7 @@ import android.os.Bundle; import android.view.View; import android.view.WindowManager; +import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -68,10 +69,12 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { setContentView(R.layout.activity_select_transfer_method); Toolbar toolbar = findViewById(R.id.toolbar); - toolbar.setTitle(R.string.mobileAddTransferMethodHeader); setSupportActionBar(toolbar); getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayShowHomeEnabled(true); + + TextView titleText = findViewById(R.id.toolbar_title); + titleText.setText(R.string.mobileAddTransferMethodHeader); toolbar.setNavigationOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/transfermethodui/src/main/res/layout/activity_list_transfer_method.xml b/transfermethodui/src/main/res/layout/activity_list_transfer_method.xml index a065a9e0e..dc65a5587 100644 --- a/transfermethodui/src/main/res/layout/activity_list_transfer_method.xml +++ b/transfermethodui/src/main/res/layout/activity_list_transfer_method.xml @@ -24,7 +24,17 @@ android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" app:layout_collapseMode="pin" - app:popupTheme="@style/AppTheme.PopupOverlay" /> + app:popupTheme="@style/AppTheme.PopupOverlay"> + + + diff --git a/transfermethodui/src/main/res/layout/activity_select_transfer_method.xml b/transfermethodui/src/main/res/layout/activity_select_transfer_method.xml index 90158490d..881852c73 100644 --- a/transfermethodui/src/main/res/layout/activity_select_transfer_method.xml +++ b/transfermethodui/src/main/res/layout/activity_select_transfer_method.xml @@ -22,7 +22,17 @@ android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" app:layout_collapseMode="pin" - app:popupTheme="@style/AppTheme.PopupOverlay" /> + app:popupTheme="@style/AppTheme.PopupOverlay" > + + + From 7b255ccac6876018ef012c34fd43a111adb6fe6b Mon Sep 17 00:00:00 2001 From: Prasanth Date: Fri, 13 Nov 2020 21:40:05 +0530 Subject: [PATCH 4/9] task/DTSERWFOUR-147-Alignment-Bug-fixes Align the headers to the same Height --- receiptui/src/main/res/layout/fragment_receipt_detail.xml | 2 +- receiptui/src/main/res/values/dimens.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/receiptui/src/main/res/layout/fragment_receipt_detail.xml b/receiptui/src/main/res/layout/fragment_receipt_detail.xml index 5a52bf666..3d4421c6e 100644 --- a/receiptui/src/main/res/layout/fragment_receipt_detail.xml +++ b/receiptui/src/main/res/layout/fragment_receipt_detail.xml @@ -22,7 +22,7 @@ android:id="@+id/transaction_header" style="@style/HeaderTitleAppearance" android:layout_width="match_parent" - android:layout_height="@dimen/section_header_height" + android:layout_height="wrap_content" android:paddingTop="@dimen/grid_padding_top"> 10dp 8dp 80dp - 32dp + 48dp From ed423a5811d166c4a8a1f87304cecf894fa5c4b6 Mon Sep 17 00:00:00 2001 From: Prasanth Date: Tue, 17 Nov 2020 11:46:42 +0530 Subject: [PATCH 5/9] task/DTSERWFOUR-147-Alignment-Bug-fixes Review comments updated --- receiptui/src/main/res/layout/fragment_tabbed_list_receipt.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/receiptui/src/main/res/layout/fragment_tabbed_list_receipt.xml b/receiptui/src/main/res/layout/fragment_tabbed_list_receipt.xml index 8c12deedf..342a5e04c 100644 --- a/receiptui/src/main/res/layout/fragment_tabbed_list_receipt.xml +++ b/receiptui/src/main/res/layout/fragment_tabbed_list_receipt.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentTop="true" - android:layout_marginTop="16dp" + android:layout_marginTop="@dimen/default_margin" android:paddingBottom="@dimen/item_horizontal_padding" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent"> From 77e3fa338776720ed42a44fd59fdbce6fc4bdad4 Mon Sep 17 00:00:00 2001 From: Prasanth Date: Wed, 18 Nov 2020 15:46:56 +0530 Subject: [PATCH 6/9] task/DTSERWFOUR-147-Alignment-Bug-fixes Transfer fund alignment issue fixed --- transferui/src/main/res/layout/fragment_create_transfer.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/transferui/src/main/res/layout/fragment_create_transfer.xml b/transferui/src/main/res/layout/fragment_create_transfer.xml index 973be8168..ed8707148 100644 --- a/transferui/src/main/res/layout/fragment_create_transfer.xml +++ b/transferui/src/main/res/layout/fragment_create_transfer.xml @@ -15,8 +15,10 @@ android:id="@+id/create_transfer_container" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/section_header_height" android:orientation="vertical"> + Date: Sat, 21 Nov 2020 00:07:08 +0530 Subject: [PATCH 7/9] task/DTSERWFOUR-147-Alignment-Bug-fixes Transfer Method & Add Transfer Method --- .../ui/transfermethod/view/ListTransferMethodActivity.java | 1 - .../ui/transfermethod/view/SelectTransferMethodActivity.java | 1 - 2 files changed, 2 deletions(-) diff --git a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/ListTransferMethodActivity.java b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/ListTransferMethodActivity.java index 7a1226b91..9af12b35a 100644 --- a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/ListTransferMethodActivity.java +++ b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/ListTransferMethodActivity.java @@ -75,7 +75,6 @@ protected void onCreate(Bundle savedInstanceState) { getSupportActionBar().setDisplayShowHomeEnabled(true); TextView titleText = findViewById(R.id.toolbar_title); - titleText.setText(R.string.mobileTransferMethodsHeader); toolbar.setNavigationOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/SelectTransferMethodActivity.java b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/SelectTransferMethodActivity.java index 905b6ec3d..7c5488704 100644 --- a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/SelectTransferMethodActivity.java +++ b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/SelectTransferMethodActivity.java @@ -74,7 +74,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { getSupportActionBar().setDisplayShowHomeEnabled(true); TextView titleText = findViewById(R.id.toolbar_title); - titleText.setText(R.string.mobileAddTransferMethodHeader); toolbar.setNavigationOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { From 277c630d0e202ef50c652d909a8993e8a2c3e321 Mon Sep 17 00:00:00 2001 From: Prasanth Date: Sat, 21 Nov 2020 00:30:01 +0530 Subject: [PATCH 8/9] task/DTSERWFOUR-147-Alignment-Bug-fixes Review comments updated --- transferui/src/main/res/layout/fragment_create_transfer.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/transferui/src/main/res/layout/fragment_create_transfer.xml b/transferui/src/main/res/layout/fragment_create_transfer.xml index ed8707148..85f0f012f 100644 --- a/transferui/src/main/res/layout/fragment_create_transfer.xml +++ b/transferui/src/main/res/layout/fragment_create_transfer.xml @@ -18,7 +18,6 @@ android:layout_marginTop="@dimen/section_header_height" android:orientation="vertical"> - Date: Mon, 23 Nov 2020 21:05:55 +0530 Subject: [PATCH 9/9] task/DTSERWFOUR-147-Alignment-Bug-fixes Review comments updated --- .../src/main/res/layout/activity_select_transfer_method.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/transfermethodui/src/main/res/layout/activity_select_transfer_method.xml b/transfermethodui/src/main/res/layout/activity_select_transfer_method.xml index 881852c73..6089873e7 100644 --- a/transfermethodui/src/main/res/layout/activity_select_transfer_method.xml +++ b/transfermethodui/src/main/res/layout/activity_select_transfer_method.xml @@ -30,8 +30,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="left" - android:textColor="@android:color/white" - android:textStyle="italic" /> + android:textColor="@android:color/white" />