diff --git a/commonui/src/main/res/values/dimens.xml b/commonui/src/main/res/values/dimens.xml index cfe004ca0..f695af3a0 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_receipt_detail.xml b/receiptui/src/main/res/layout/fragment_receipt_detail.xml index 0ccda245e..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"> diff --git a/receiptui/src/main/res/values/dimens.xml b/receiptui/src/main/res/values/dimens.xml index f529c8727..7f97cbc6b 100644 --- a/receiptui/src/main/res/values/dimens.xml +++ b/receiptui/src/main/res/values/dimens.xml @@ -3,5 +3,5 @@ 10dp 8dp 80dp - 32dp + 48dp 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..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 @@ -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,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) { 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..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 @@ -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,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) { 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..6089873e7 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,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" > + + + diff --git a/transferui/src/main/res/layout/fragment_create_transfer.xml b/transferui/src/main/res/layout/fragment_create_transfer.xml index 973be8168..85f0f012f 100644 --- a/transferui/src/main/res/layout/fragment_create_transfer.xml +++ b/transferui/src/main/res/layout/fragment_create_transfer.xml @@ -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">