Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c829970
DTSERWFOUR-147-Alignment-Bug-fixes - Incorrect Spacing between Subhea…
pdamodarannair Nov 3, 2020
ce9c064
Merge branches 'development' and 'task/DTSERWFOUR-147-Alignment-Bug-f…
pdamodarannair Nov 4, 2020
3eaaa38
task/DTSERWFOUR-147-Alignment-Bug-fixes - Fixed header top
pdamodarannair Nov 6, 2020
af80a6e
Merge branches 'development' and 'task/DTSERWFOUR-147-Alignment-Bug-f…
pdamodarannair Nov 7, 2020
ad17e1a
task/DTSERWFOUR-147-Alignment-Bug-fixes - Transfer Method & Add Trans…
pdamodarannair Nov 10, 2020
4bccd24
Merge branches 'development' and 'task/DTSERWFOUR-147-Alignment-Bug-f…
pdamodarannair Nov 13, 2020
7b255cc
task/DTSERWFOUR-147-Alignment-Bug-fixes Align the headers to the same…
pdamodarannair Nov 13, 2020
ed423a5
task/DTSERWFOUR-147-Alignment-Bug-fixes Review comments updated
pdamodarannair Nov 17, 2020
77e3fa3
task/DTSERWFOUR-147-Alignment-Bug-fixes Transfer fund alignment issue…
pdamodarannair Nov 18, 2020
da54291
task/DTSERWFOUR-147-Alignment-Bug-fixes Transfer Method & Add Transfe…
pdamodarannair Nov 20, 2020
fe7fc5c
Merge branches 'development' and 'task/DTSERWFOUR-147-Alignment-Bug-f…
pdamodarannair Nov 20, 2020
277c630
task/DTSERWFOUR-147-Alignment-Bug-fixes Review comments updated
pdamodarannair Nov 20, 2020
75c0199
Merge branches 'development' and 'task/DTSERWFOUR-147-Alignment-Bug-f…
pdamodarannair Nov 23, 2020
0386e05
task/DTSERWFOUR-147-Alignment-Bug-fixes Review comments updated
pdamodarannair Nov 23, 2020
18e0991
Merge branch 'development' into task/DTSERWFOUR-147-Alignment-Bug-fixes
malaw-hw Nov 24, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion commonui/src/main/res/values/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<dimen name="horizontal_spacer_height">16dp</dimen>
<dimen name="default_info_margin">40dp</dimen>
<dimen name="description_max_layout_width">300dp</dimen>
<dimen name="section_header_height">64dp</dimen>
<dimen name="section_header_height">16dp</dimen>
<dimen name="loader_inset_margin">155dp</dimen>
<dimen name="edit_text_layout_padding_start_offset">4dp</dimen>
<dimen name="progress_bar_elevation">7dp</dimen>
Expand Down
4 changes: 3 additions & 1 deletion receiptui/src/main/res/layout/fragment_receipt_detail.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">

<TextView
Expand Down Expand Up @@ -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">

<TextView
Expand Down Expand Up @@ -354,6 +355,7 @@
android:id="@+id/fee_details_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/grid_margin_top"
style="@style/HeaderTitleAppearance">

<TextView
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginTop="@dimen/default_margin"
android:paddingBottom="@dimen/item_horizontal_padding"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
Expand Down
2 changes: 1 addition & 1 deletion receiptui/src/main/res/values/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<dimen name="ellipsis_spacing">10dp</dimen>
<dimen name="item_text_top_bottom_margin">8dp</dimen>
<dimen name="item_receipt_information_height">80dp</dimen>
<dimen name="receipt_tab_margin_top">32dp</dimen>
<dimen name="receipt_tab_margin_top">48dp</dimen>
</resources>
2 changes: 1 addition & 1 deletion transfermethodui/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<activity
android:name="com.hyperwallet.android.ui.transfermethod.view.SelectTransferMethodActivity"
android:label="@string/title_activity_select_transfer_method"
android:label="@string/mobileAddTransferMethodHeader"
android:theme="@style/AppTheme.NoActionBar">
<!-- This setting is removed temporarily [android:exported="false"] since it will not work functionally
team is looking into fixing the security issue from another ticket -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -72,7 +73,8 @@ 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);
toolbar.setNavigationOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -68,10 +69,11 @@ 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);
toolbar.setNavigationOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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">

<TextView
android:id="@+id/toolbar_title"
style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:textStyle="bold"
android:textColor="@android:color/white" />
</androidx.appcompat.widget.Toolbar>

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,16 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:popupTheme="@style/AppTheme.PopupOverlay" />
app:popupTheme="@style/AppTheme.PopupOverlay" >

<TextView
android:id="@+id/toolbar_title"
style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:textColor="@android:color/white" />
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.CollapsingToolbarLayout>

</com.google.android.material.appbar.AppBarLayout>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
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">

<LinearLayout
Expand Down