Use flexbox for main activity layout

eltos · Sep 24, 2021 · 155de69 · 155de69
1 parent c1512a1
commit 155de69
Show file tree

Hide file tree

Showing 3 changed files with 128 additions and 348 deletions.
diff --git a/testApp/build.gradle b/testApp/build.gradle
@@ -23,6 +23,7 @@ dependencies {
     testImplementation  'junit:junit:4.12'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.google.android.flexbox:flexbox:3.0.0'
     implementation 'com.google.zxing:core:3.3.3'
     api project(path: ':simpledialogfragments')
 }
diff --git a/testApp/src/main/java/eltos/simpledialogfragments/MainActivity.java b/testApp/src/main/java/eltos/simpledialogfragments/MainActivity.java
@@ -262,7 +262,7 @@ public void run() {
                         .pos(R.string.nevermind)
                         .show(MainActivity.this, null, YES_NO_DIALOG);
             }
-        }, 3000);
+        }, 7000);
 
         /** Results: {@link MainActivity#onResult} **/
 
@@ -708,9 +708,11 @@ public boolean onResult(@NonNull String dialogTag, int which, @NonNull Bundle ex
                     return true;
                 case BUTTON_NEGATIVE:
                     Toast.makeText(this, R.string.discarded, Toast.LENGTH_SHORT).show();
+                    handler.removeCallbacksAndMessages(null);
                     return true;
                 case BUTTON_NEUTRAL:
                 case CANCELED:
+                    handler.removeCallbacksAndMessages(null);
                     Toast.makeText(this, R.string.canceled, Toast.LENGTH_SHORT).show();
                     return true;
             }