stay on the "generate seed" view after user swipes there

plus, layout fixes on information layout

Author: gsora

app/src/main/java/xyz/gsora/siacold/WelcomeUI/GenerateSeed.java

@@ -75,25 +75,22 @@ public void onActivityCreated(Bundle bundle) {
         importSeed.setOnClickListener(this::showImportSeed);
     }
 
-    public void importSeed(View v) {
-
-    }
-
     public void showImportSeed(View v) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         // Get the layout inflater
         LayoutInflater inflater = getActivity().getLayoutInflater();
         View dia = inflater.inflate(R.layout.import_seed, null);
         EditText e = (EditText) dia.findViewById(R.id.importSeedText);
+        byte[] seedByte = e.getText().toString().getBytes(StandardCharsets.UTF_8);
 
         Fragment thisFragment = this;
         builder.setView(dia)
                 // Add action buttons
                 .setPositiveButton("Save", (dialog, id) -> {
-                    c = new Crypto(getActivity(), getContext(), thisFragment, e.getText().toString().getBytes(StandardCharsets.UTF_8));
+                    c = new Crypto(getActivity(), getContext(), thisFragment, seedByte);
                     c.tryEncrypt();
                     try {
-                        setSeed(new Wallet(), c);
+                        setSeed(c);
                     } catch (NoDecryptedDataException ee) {
                         ee.printStackTrace();
                     }
@@ -130,7 +127,7 @@ public void generateSeed(View v) {
                     c = new Crypto(getActivity(), getContext(), thisFragment, seed.getBytes(StandardCharsets.UTF_8));
                     c.tryEncrypt();
                     try {
-                        setSeed(new Wallet(), c);
+                        setSeed(c);
                     } catch (NoDecryptedDataException e) {
                         e.printStackTrace();
                     }
@@ -148,9 +145,8 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                 // Challenge completed, proceed with using cipher
                 if (resultCode == RESULT_OK) {
                     if (c.tryEncrypt()) {
-                        Wallet w = new Wallet();
                         try {
-                            setSeed(w, c);
+                            setSeed(c);
                         } catch (NoDecryptedDataException e) {
                             e.printStackTrace();
                         }
@@ -168,7 +164,8 @@ private void writeDefaultPreferences(String address) {
         spEdit.apply();
     }
 
-    private void setSeed(Wallet w, Crypto c) throws NoDecryptedDataException {
+    private void setSeed(Crypto c) throws NoDecryptedDataException {
+        Wallet w = new Wallet();
         c.tryDecrypt();
         w.setSeed(c.getDecryptedData());
         Realm r = Utils.getRealm();

app/src/main/java/xyz/gsora/siacold/WelcomeUI/NonSwipeableViewPager.java

@@ -0,0 +1,48 @@
+package xyz.gsora.siacold.WelcomeUI;
+
+import android.content.Context;
+import android.support.v4.view.ViewPager;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+
+/**
+ * Created by gsora on 7/7/17.
+ * <p>
+ * ViewPager that scrolls or not.
+ * Credits: https://stackoverflow.com/questions/9650265/how-do-disable-paging-by-swiping-with-finger-in-viewpager-but-still-be-able-to-s
+ */
+public class NonSwipeableViewPager extends ViewPager {
+
+    private boolean swipeable;
+
+    public NonSwipeableViewPager(Context context) {
+        super(context);
+    }
+
+    public NonSwipeableViewPager(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        this.swipeable = true;
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (this.swipeable) {
+            return super.onTouchEvent(event);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent event) {
+        if (this.swipeable) {
+            return super.onInterceptTouchEvent(event);
+        }
+
+        return false;
+    }
+
+    public void setSwipeable(boolean swipeable) {
+        this.swipeable = swipeable;
+    }
+}

app/src/main/java/xyz/gsora/siacold/WelcomeUI/WelcomeActivity.java

@@ -18,7 +18,7 @@
 public class WelcomeActivity extends AppCompatActivity {
 
     @BindView(R.id.tutorialViewPager)
-    ViewPager tutorialViewPager;
+    NonSwipeableViewPager tutorialViewPager;
 
     @BindView(R.id.tabDots)
     TabLayout tabDots;
@@ -37,9 +37,11 @@ protected void onCreate(Bundle savedInstanceState) {
 
         WelcomeUIAdapter adapter = new WelcomeUIAdapter(getSupportFragmentManager());
         tutorialViewPager.setAdapter(adapter);
+        tutorialViewPager.setSwipeable(true);
 
         tabDots.setupWithViewPager(tutorialViewPager, true);
         checkIfSecureAndUsable();
+        setupViewPagerListener();
     }
 
     public void checkIfSecureAndUsable() {
@@ -58,7 +60,34 @@ public void checkIfSecureAndUsable() {
         }
     }
 
-    public void moveToNextPage() {
+    void setupViewPagerListener() {
+        // Attach the page change listener inside the activity
+        tutorialViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+
+            // This method will be invoked when a new page becomes selected.
+            @Override
+            public void onPageSelected(int position) {
+                if (position == 1) {
+                    tutorialViewPager.setSwipeable(false);
+                }
+            }
+
+            // This method will be invoked when the current page is scrolled
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+                // Code goes here
+            }
+
+            // Called when the scroll state changes:
+            // SCROLL_STATE_IDLE, SCROLL_STATE_DRAGGING, SCROLL_STATE_SETTLING
+            @Override
+            public void onPageScrollStateChanged(int state) {
+                // Code goes here
+            }
+        });
+    }
+
+    void moveToNextPage() {
         tutorialViewPager.setCurrentItem(tutorialViewPager.getCurrentItem() + 1);
     }
 

app/src/main/res/layout/content_welcome.xml

@@ -14,16 +14,16 @@
     tools:context="xyz.gsora.siacold.WelcomeUI.WelcomeActivity"
     tools:showIn="@layout/activity_welcome">
 
-    <android.support.v4.view.ViewPager
+    <xyz.gsora.siacold.WelcomeUI.NonSwipeableViewPager
         android:id="@+id/tutorialViewPager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
     <android.support.design.widget.TabLayout
         android:id="@+id/tabDots"
-        android:layout_alignParentBottom="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
         app:tabBackground="@drawable/tab_selector"
         app:tabGravity="center"
         app:tabIndicatorHeight="0dp"/>

app/src/main/res/layout/fragment_information.xml

@@ -8,7 +8,7 @@
     <android.support.v4.widget.SwipeRefreshLayout
         android:id="@+id/refreshInfo"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">4
+        android:layout_height="wrap_content">
 
         <Space
             android:layout_width="wrap_content"
@@ -21,6 +21,8 @@
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
         android:layout_marginTop="42dp">
 
         <TextView
@@ -29,10 +31,8 @@
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
             android:layout_centerHorizontal="true"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_marginTop="30dp"
             android:maxLines="1"
+            android:text="memes"
             android:textAlignment="center"
             android:textSize="75sp"/>
     </me.grantland.widget.AutofitLayout>