better intro

brodeurlv · Sep 19, 2018 · c8962f7 · c8962f7
1 parent aa8181d
commit c8962f7
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 64 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,9 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.easyfitness"
-    android:versionCode="19"
-    android:versionName="0.15.1">
-    <!-- Current versionCode on Google Play : 18 -->
+    android:versionCode="20"
+    android:versionName="0.15.2">
 
     <uses-sdk
         android:minSdkVersion="16"

diff --git a/app/src/main/java/com/easyfitness/intro/MainIntroActivity.java b/app/src/main/java/com/easyfitness/intro/MainIntroActivity.java
@@ -42,7 +42,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         setButtonBackFunction(skipEnabled ? BUTTON_BACK_FUNCTION_SKIP : BUTTON_BACK_FUNCTION_BACK);
-        setButtonNextFunction( finishEnabled ? BUTTON_NEXT_FUNCTION_NEXT_FINISH : BUTTON_NEXT_FUNCTION_NEXT);
+        setButtonNextFunction(finishEnabled ? BUTTON_NEXT_FUNCTION_NEXT_FINISH : BUTTON_NEXT_FUNCTION_NEXT);
         setButtonBackVisible(showBack);
         setButtonNextVisible(showNext);
         setButtonCtaVisible(getStartedEnabled);
@@ -115,58 +115,5 @@ protected void onCreate(Bundle savedInstanceState) {
                     .build();
             addSlide(profileSlide);
         }
-
-        //Feel free to add a navigation policy to define when users can go forward/backward
-        /*
-        setNavigationPolicy(new NavigationPolicy() {
-            @Override
-            public boolean canGoForward(int position) {
-                return true;
-            }
-
-            @Override
-            public boolean canGoBackward(int position) {
-                return true;
-            }
-        });
-        */
-/*
-        addOnNavigationBlockedListener(new OnNavigationBlockedListener() {
-            @Override
-            public void onNavigationBlocked(int position, int direction) {
-                View contentView = findViewById(android.R.id.content);
-                if (contentView != null) {
-                    Slide slide = getSlide(position);
-
-                    if (slide == permissionsSlide) {
-                        Snackbar.make(contentView, R.string.label_grant_permissions, Snackbar.LENGTH_LONG)
-                                .show();
-                    } else if (slide == loginSlide) {
-                        Snackbar.make(contentView, R.string.label_fill_out_form, Snackbar.LENGTH_LONG).show();
-                    }
-                }
-            }
-        });
-*/
-        //Feel free to add and remove page change listeners
-        /*
-        addOnPageChangeListener(new ViewPager.OnPageChangeListener(){
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-
-            }
-
-            @Override
-            public void onPageSelected(int position) {
-
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-
-            }
-        });
-        */
     }
-
 }
diff --git a/app/src/main/java/com/easyfitness/intro/NewProfileFragment.java b/app/src/main/java/com/easyfitness/intro/NewProfileFragment.java
@@ -43,6 +43,7 @@
 import com.easyfitness.MainActivity;
 import com.easyfitness.R;
 import com.easyfitness.utils.DateConverter;
+import com.heinrichreimersoftware.materialintro.app.OnNavigationBlockedListener;
 import com.heinrichreimersoftware.materialintro.app.SlideFragment;
 import com.onurkaganaldemir.ktoastlib.KToast;
 
@@ -109,10 +110,27 @@ public void onFocusChange(View v, boolean hasFocus) {
 		/* Initialisation des boutons */
         mBtCreate.setOnClickListener(clickCreateButton);
 
+        getIntroActivity().addOnNavigationBlockedListener(new OnNavigationBlockedListener() {
+            @Override
+            public void onNavigationBlocked(int position, int direction) {
+                //Slide slide = getIntroActivity().getSlide(position);
+
+                if (position == 5) {
+                    mBtCreate.callOnClick();
+                }
+            }
+        });
+
         // Inflate the layout for this fragment
         return view;
     }
 
+    ;
+
+    private NewProfileFragment getThis() {
+        return this;
+    }
+
     private final View.OnClickListener clickCreateButton = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
@@ -121,7 +139,7 @@ public void onClick(View v) {
 
             if (mName.getText().toString().isEmpty()) {
                 //Toast.makeText(getActivity().getBaseContext(), R.string.fillAllFields, Toast.LENGTH_SHORT).show();
-                KToast.warningToast(getActivity(), getResources().getText(R.string.fillNameField).toString(), Gravity.BOTTOM, KToast.LENGTH_LONG);
+                KToast.warningToast(getActivity(), getResources().getText(R.string.fillNameField).toString(), Gravity.BOTTOM, KToast.LENGTH_SHORT);
             } else {
                 int size = 0;
                 try {
@@ -144,7 +162,6 @@ public void onClick(View v) {
                             .setConfirmClickListener(new SweetAlertDialog.OnSweetClickListener() {
                                 @Override
                                 public void onClick(SweetAlertDialog sDialog) {
-
                                     nextSlide();
                                 }
                             })
@@ -153,7 +170,6 @@ public void onClick(SweetAlertDialog sDialog) {
                 } else {
                     KToast.errorToast(getActivity(), "An error occurred in profile creation", Gravity.BOTTOM, KToast.LENGTH_LONG);
                 }
-
             }
         }
     };
@@ -167,5 +183,13 @@ public void onDestroy() {
     public boolean canGoForward() {
         return mProfilCreated;
     }
+
+    public MainIntroActivity getIntroActivity() {
+        if (getActivity() instanceof MainIntroActivity) {
+            return (MainIntroActivity) getActivity();
+        } else {
+            throw new IllegalStateException("SlideFragment's must be attached to MainIntroActivity.");
+        }
+    }
 }
 
diff --git a/app/src/main/res/layout/introfragment_newprofile.xml b/app/src/main/res/layout/introfragment_newprofile.xml
@@ -22,10 +22,12 @@
   ~ SOFTWARE.
   -->
 
-<layout xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
+<layout xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -36,6 +38,7 @@
         android:padding="@dimen/mi_baseline"
         android:weightSum="1">
 
+
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -95,5 +98,5 @@
             android:text="@string/create" />
 
     </LinearLayout>
-
+    </ScrollView>
 </layout>
diff --git a/app/src/main/res/values/about.xml b/app/src/main/res/values/about.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="app_version" translatable="false">0.15.1</string>
+    <string name="app_version" translatable="false">0.15.2</string>
     <string name="database_version_label" translatable="false">Database version: </string>
     <string name="author_label" translatable="false">Author: </string>
 	<string name="author" translatable="false">Charles Combes</string>
@@ -10,6 +10,8 @@
     <string name="email_url" translatable="false">[email protected]</string>
     <string name="revision_history_label" translatable="false">Revision History: </string>
 	<string name="revision_history" translatable="false">\n
+        V0.15.2 : 19/09/2018 \n
+            \t - Enhancement : Better intro for profile creation\n
         V0.15.1 : 13/09/2018 \n
 			\t - Bug : Fixed float issue for profile size\n
             \t - Bug : Fixed wrong image rotation\n