From 577a420fac4e0cfa31ff31f50927184c6000f6d7 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 9 Sep 2021 13:53:24 +0200 Subject: [PATCH] nearby: switch back button to close icon when it will end session Clicking the toolbar button on the start screen will end the swap session. --- .../java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java index b0e3c399c..c0d85d69c 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java @@ -608,6 +608,11 @@ public class SwapWorkflowActivity extends AppCompatActivity { } inflateSwapView(currentSwapViewLayoutRes); }); + if (viewRes == R.layout.swap_start_swap) { + toolbar.setNavigationIcon(R.drawable.ic_close); + } else { + toolbar.setNavigationIcon(R.drawable.abc_ic_ab_back_material); + } container.addView(view); supportInvalidateOptionsMenu();