From 568abe9f3b19c772299ceacd47f98efc24640514 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 6 May 2019 11:57:18 +0200 Subject: [PATCH] rename swap_blank to swap_start_swap to match View name --- .../org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java | 4 ++-- app/src/full/res/layout-sw480dp/start_swap_header.xml | 2 +- .../full/res/layout/{swap_blank.xml => swap_start_swap.xml} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename app/src/full/res/layout/{swap_blank.xml => swap_start_swap.xml} (100%) diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java index c55d773b6..99000ac0d 100644 --- a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java +++ b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java @@ -349,7 +349,7 @@ public class SwapWorkflowActivity extends AppCompatActivity { break; case SwapService.STEP_CONNECTING: // TODO: Properly decide what to do here (i.e. returning to the activity after it was connecting)... - inflateInnerView(R.layout.swap_blank); + inflateInnerView(R.layout.swap_start_swap); break; } } @@ -414,7 +414,7 @@ public class SwapWorkflowActivity extends AppCompatActivity { } } - inflateInnerView(R.layout.swap_blank); + inflateInnerView(R.layout.swap_start_swap); } private void showConfirmSwap(@NonNull NewRepoConfig config) { diff --git a/app/src/full/res/layout-sw480dp/start_swap_header.xml b/app/src/full/res/layout-sw480dp/start_swap_header.xml index 39c24a221..049c2d4fe 100644 --- a/app/src/full/res/layout-sw480dp/start_swap_header.xml +++ b/app/src/full/res/layout-sw480dp/start_swap_header.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="130dp" android:layout_alignParentTop="true" - tools:showIn="@layout/swap_blank"> + tools:showIn="@layout/swap_start_swap">