From 291e4c4c3c90cd605406add3aef0da6800b472ce Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 7 May 2019 11:17:37 +0200 Subject: [PATCH] change 'fragment' name to avoid confusion, Swap doesn't use Fragments --- .../java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java | 2 +- app/src/full/res/layout/swap_activity.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 3410b5356..ee92c4dca 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 @@ -217,7 +217,7 @@ public class SwapWorkflowActivity extends AppCompatActivity { toolbar.setTitleTextAppearance(getApplicationContext(), R.style.SwapTheme_Wizard_Text_Toolbar); setSupportActionBar(toolbar); - container = (ViewGroup) findViewById(R.id.fragment_container); + container = (ViewGroup) findViewById(R.id.container); localBroadcastManager = LocalBroadcastManager.getInstance(this); wifiManager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE); diff --git a/app/src/full/res/layout/swap_activity.xml b/app/src/full/res/layout/swap_activity.xml index 517f6621e..6d25e3a3d 100644 --- a/app/src/full/res/layout/swap_activity.xml +++ b/app/src/full/res/layout/swap_activity.xml @@ -17,7 +17,7 @@ tools:ignore="UnusedAttribute"/>