Skip to content

Commit 6da834e

Browse files
DTSERWFOUR-147-Alignment-Bug-fixes - Incorrect Spacing between Subhea… (#203)
* DTSERWFOUR-147-Alignment-Bug-fixes - Incorrect Spacing between Subheader and content * task/DTSERWFOUR-147-Alignment-Bug-fixes - Fixed header top * task/DTSERWFOUR-147-Alignment-Bug-fixes - Transfer Method & Add Transfer Method * task/DTSERWFOUR-147-Alignment-Bug-fixes Align the headers to the same Height * task/DTSERWFOUR-147-Alignment-Bug-fixes Review comments updated * task/DTSERWFOUR-147-Alignment-Bug-fixes Transfer fund alignment issue fixed * task/DTSERWFOUR-147-Alignment-Bug-fixes Transfer Method & Add Transfer Method * task/DTSERWFOUR-147-Alignment-Bug-fixes Review comments updated * task/DTSERWFOUR-147-Alignment-Bug-fixes Review comments updated Co-authored-by: Rita Law <51347548+malaw-hw@users.noreply.github.com>
1 parent 32b10fb commit 6da834e

File tree

10 files changed

+35
-8
lines changed

10 files changed

+35
-8
lines changed

commonui/src/main/res/values/dimens.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<dimen name="horizontal_spacer_height">16dp</dimen>
7272
<dimen name="default_info_margin">40dp</dimen>
7373
<dimen name="description_max_layout_width">300dp</dimen>
74-
<dimen name="section_header_height">64dp</dimen>
74+
<dimen name="section_header_height">16dp</dimen>
7575
<dimen name="loader_inset_margin">155dp</dimen>
7676
<dimen name="edit_text_layout_padding_start_offset">4dp</dimen>
7777
<dimen name="progress_bar_elevation">7dp</dimen>

receiptui/src/main/res/layout/fragment_receipt_detail.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
android:id="@+id/transaction_header"
2323
style="@style/HeaderTitleAppearance"
2424
android:layout_width="match_parent"
25-
android:layout_height="@dimen/section_header_height"
25+
android:layout_height="wrap_content"
2626
android:paddingTop="@dimen/grid_padding_top">
2727

2828
<TextView
@@ -55,6 +55,7 @@
5555
android:id="@+id/receipt_details_header"
5656
android:layout_width="match_parent"
5757
android:layout_height="wrap_content"
58+
android:layout_marginTop="@dimen/grid_margin_top"
5859
style="@style/HeaderTitleAppearance">
5960

6061
<TextView
@@ -354,6 +355,7 @@
354355
android:id="@+id/fee_details_header"
355356
android:layout_width="match_parent"
356357
android:layout_height="wrap_content"
358+
android:layout_marginTop="@dimen/grid_margin_top"
357359
style="@style/HeaderTitleAppearance">
358360

359361
<TextView

receiptui/src/main/res/layout/fragment_tabbed_list_receipt.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
android:layout_width="match_parent"
1313
android:layout_height="wrap_content"
1414
android:layout_alignParentTop="true"
15+
android:layout_marginTop="@dimen/default_margin"
1516
android:paddingBottom="@dimen/item_horizontal_padding"
1617
app:layout_constraintEnd_toEndOf="parent"
1718
app:layout_constraintTop_toTopOf="parent">

receiptui/src/main/res/values/dimens.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<dimen name="ellipsis_spacing">10dp</dimen>
44
<dimen name="item_text_top_bottom_margin">8dp</dimen>
55
<dimen name="item_receipt_information_height">80dp</dimen>
6-
<dimen name="receipt_tab_margin_top">32dp</dimen>
6+
<dimen name="receipt_tab_margin_top">48dp</dimen>
77
</resources>

transfermethodui/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<activity
1616
android:name="com.hyperwallet.android.ui.transfermethod.view.SelectTransferMethodActivity"
17-
android:label="@string/title_activity_select_transfer_method"
17+
android:label="@string/mobileAddTransferMethodHeader"
1818
android:theme="@style/AppTheme.NoActionBar">
1919
<!-- This setting is removed temporarily [android:exported="false"] since it will not work functionally
2020
team is looking into fixing the security issue from another ticket -->

transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/ListTransferMethodActivity.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import android.content.pm.ActivityInfo;
2424
import android.os.Bundle;
2525
import android.view.View;
26+
import android.widget.TextView;
2627

2728
import androidx.annotation.NonNull;
2829
import androidx.appcompat.app.AppCompatActivity;
@@ -72,7 +73,8 @@ protected void onCreate(Bundle savedInstanceState) {
7273
setSupportActionBar(toolbar);
7374
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
7475
getSupportActionBar().setDisplayShowHomeEnabled(true);
75-
getSupportActionBar().setTitle(R.string.mobileTransferMethodsHeader);
76+
77+
TextView titleText = findViewById(R.id.toolbar_title);
7678
toolbar.setNavigationOnClickListener(new View.OnClickListener() {
7779
@Override
7880
public void onClick(View v) {

transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/SelectTransferMethodActivity.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import android.os.Bundle;
2525
import android.view.View;
2626
import android.view.WindowManager;
27+
import android.widget.TextView;
2728

2829
import androidx.annotation.NonNull;
2930
import androidx.annotation.Nullable;
@@ -68,10 +69,11 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
6869
setContentView(R.layout.activity_select_transfer_method);
6970

7071
Toolbar toolbar = findViewById(R.id.toolbar);
71-
toolbar.setTitle(R.string.mobileAddTransferMethodHeader);
7272
setSupportActionBar(toolbar);
7373
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
7474
getSupportActionBar().setDisplayShowHomeEnabled(true);
75+
76+
TextView titleText = findViewById(R.id.toolbar_title);
7577
toolbar.setNavigationOnClickListener(new View.OnClickListener() {
7678
@Override
7779
public void onClick(View v) {

transfermethodui/src/main/res/layout/activity_list_transfer_method.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,17 @@
2424
android:layout_width="match_parent"
2525
android:layout_height="?attr/actionBarSize"
2626
app:layout_collapseMode="pin"
27-
app:popupTheme="@style/AppTheme.PopupOverlay" />
27+
app:popupTheme="@style/AppTheme.PopupOverlay">
28+
29+
<TextView
30+
android:id="@+id/toolbar_title"
31+
style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
32+
android:layout_width="wrap_content"
33+
android:layout_height="wrap_content"
34+
android:layout_gravity="left"
35+
android:textStyle="bold"
36+
android:textColor="@android:color/white" />
37+
</androidx.appcompat.widget.Toolbar>
2838

2939
</com.google.android.material.appbar.CollapsingToolbarLayout>
3040

transfermethodui/src/main/res/layout/activity_select_transfer_method.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,16 @@
2222
android:layout_width="match_parent"
2323
android:layout_height="?attr/actionBarSize"
2424
app:layout_collapseMode="pin"
25-
app:popupTheme="@style/AppTheme.PopupOverlay" />
25+
app:popupTheme="@style/AppTheme.PopupOverlay" >
26+
27+
<TextView
28+
android:id="@+id/toolbar_title"
29+
style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
30+
android:layout_width="wrap_content"
31+
android:layout_height="wrap_content"
32+
android:layout_gravity="left"
33+
android:textColor="@android:color/white" />
34+
</androidx.appcompat.widget.Toolbar>
2635
</com.google.android.material.appbar.CollapsingToolbarLayout>
2736

2837
</com.google.android.material.appbar.AppBarLayout>

transferui/src/main/res/layout/fragment_create_transfer.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
android:id="@+id/create_transfer_container"
1616
android:layout_width="match_parent"
1717
android:layout_height="wrap_content"
18+
android:layout_marginTop="@dimen/section_header_height"
1819
android:orientation="vertical">
1920

2021
<LinearLayout

0 commit comments

Comments
 (0)