X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fpatterns%2FPatternsActivity.java;h=ad8c23642ff43afd4715621e5e01c6d8b8a70132;hb=51671fdb430ff5a4ef2b5ed7c52ff22c56accf08;hp=da258d48a7a0ec12425802c1d61b26f0f8f766fc;hpb=4d2ce14d526978de65113314cc50ab5ecf9c7d09;p=mobile-ledger.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/patterns/PatternsActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/patterns/PatternsActivity.java
index da258d48..ad8c2364 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/patterns/PatternsActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/patterns/PatternsActivity.java
@@ -82,23 +82,19 @@ public class PatternsActivity extends CrashReportingActivity
 
         b.toolbarLayout.setTitle(getString(R.string.title_activity_patterns));
 
-        b.fabAdd.setOnClickListener(v -> onNewPattern());
+        b.fabAdd.setOnClickListener(v -> onEditPattern(null));
         b.fabSave.setOnClickListener(v -> onSavePattern());
     }
     @Override
-    public void onNewPattern() {
-        navController.navigate(R.id.action_patternListFragment_to_patternDetailsFragment);
-//        final Snackbar snackbar =
-//                Snackbar.make(b.fragmentContainer, "New pattern action coming up soon",
-//                        Snackbar.LENGTH_INDEFINITE);
-//        snackbar.setAction("Action", v -> snackbar.dismiss());
-//        snackbar.show();
-    }
-    @Override
-    public void onEditPattern(int id) {
-        Bundle bundle = new Bundle();
-        bundle.putInt(PatternDetailsFragment.ARG_PATTERN_ID, id);
-        navController.navigate(R.id.action_patternListFragment_to_patternDetailsFragment, bundle);
+    public void onEditPattern(Long id) {
+        if (id == null){
+            navController.navigate(R.id.action_patternListFragment_to_patternDetailsFragment);
+        }
+        else{
+            Bundle bundle = new Bundle();
+            bundle.putLong(PatternDetailsFragment.ARG_PATTERN_ID, id);
+            navController.navigate(R.id.action_patternListFragment_to_patternDetailsFragment, bundle);
+        }
     }
     @Override
     public void onSavePattern() {
@@ -108,7 +104,7 @@ public class PatternsActivity extends CrashReportingActivity
                 new ViewModelProvider(viewModelStoreOwner).get(PatternDetailsViewModel.class);
         Logger.debug("flow", "PatternsActivity.onSavePattern(): model=" + model);
         model.onSavePattern();
-        navController.navigate(R.id.patternListFragment);
+        navController.navigateUp();
     }
     public NavController getNavController() {
         return navController;