From f7da73a493d5c03065ddce0184726036ae7a3474 Mon Sep 17 00:00:00 2001
From: zak <jawas.zakaria@gmail.com>
Date: Fri, 1 May 2020 01:13:59 +0300
Subject: [PATCH] Support RTL layout

---
 .idea/codeStyles/Project.xml                  | 116 ++++++++++++++++
 .idea/gradle.xml                              |   2 +
 .idea/modules.xml                             |   3 +
 .idea/vcs.xml                                 |   6 +
 .../fancywalkthroughlibrary/MainActivity.java |   5 +-
 build.gradle                                  |   2 +-
 .../FancyWalkthroughActivity.java             | 126 ++++++++++++++----
 .../FancyWalkthroughAdapter.java              |   8 +-
 .../FancyWalkthroughFragment.java             |  22 ++-
 .../src/main/res/layout/activity_ahoy.xml     |   2 -
 .../src/main/res/layout/fragment_ahoy.xml     |   6 +-
 gradle/wrapper/gradle-wrapper.properties      |   4 +-
 12 files changed, 260 insertions(+), 42 deletions(-)
 create mode 100644 .idea/codeStyles/Project.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..681f41a
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,116 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 81b2cf3..e5312bb 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 1f535fb..dc7a2e6 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,6 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/FancyWalkthrough-Android.iml" filepath="$PROJECT_DIR$/FancyWalkthrough-Android.iml" group="FancyWalkthrough-Android" />
+      <module fileurl="file://$PROJECT_DIR$/app/FancyWalkthrough-Android-app.iml" filepath="$PROJECT_DIR$/app/FancyWalkthrough-Android-app.iml" group="FancyWalkthrough-Android/app" />
+      <module fileurl="file://$PROJECT_DIR$/fancywalkthroughlib/FancyWalkthrough-Android-fancywalkthroughlib.iml" filepath="$PROJECT_DIR$/fancywalkthroughlib/FancyWalkthrough-Android-fancywalkthroughlib.iml" group="FancyWalkthrough-Android/fancywalkthroughlib" />
       <module fileurl="file://$PROJECT_DIR$/FancyWalkthroughLibrary.iml" filepath="$PROJECT_DIR$/FancyWalkthroughLibrary.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/fancywalkthroughlib/fancywalkthroughlib.iml" filepath="$PROJECT_DIR$/fancywalkthroughlib/fancywalkthroughlib.iml" />
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/shashank/sony/fancywalkthroughlibrary/MainActivity.java b/app/src/main/java/com/shashank/sony/fancywalkthroughlibrary/MainActivity.java
index 06a591b..59949ae 100644
--- a/app/src/main/java/com/shashank/sony/fancywalkthroughlibrary/MainActivity.java
+++ b/app/src/main/java/com/shashank/sony/fancywalkthroughlibrary/MainActivity.java
@@ -14,6 +14,7 @@ public class MainActivity extends FancyWalkthroughActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
         FancyWalkthroughCard fancywalkthroughCard1 = new FancyWalkthroughCard("Find Restaurant", "Find the best restaurant in your neighborhood.",R.drawable.find_restaurant1);
         FancyWalkthroughCard fancywalkthroughCard2 = new FancyWalkthroughCard("Pick the best", "Pick the right place using trusted ratings and reviews.",R.drawable.pickthebest);
         FancyWalkthroughCard fancywalkthroughCard3 = new FancyWalkthroughCard("Choose your meal", "Easily find the type of food you're craving.",R.drawable.chooseurmeal);
@@ -44,8 +45,10 @@ protected void onCreate(Bundle savedInstanceState) {
         //setImageBackground(R.drawable.restaurant);
         setInactiveIndicatorColor(R.color.grey_600);
         setActiveIndicatorColor(R.color.colorGreen);
-        setOnboardPages(pages);
 
+        //to allow for RTL layout
+        setRTL(true);
+        setOnboardPages(pages);
     }
 
     @Override
diff --git a/build.gradle b/build.gradle
index 44ee108..9ea030d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.6.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/fancywalkthroughlib/src/main/java/com/shashank/sony/fancywalkthroughlib/FancyWalkthroughActivity.java b/fancywalkthroughlib/src/main/java/com/shashank/sony/fancywalkthroughlib/FancyWalkthroughActivity.java
index 3d5b2d1..70329e8 100644
--- a/fancywalkthroughlib/src/main/java/com/shashank/sony/fancywalkthroughlib/FancyWalkthroughActivity.java
+++ b/fancywalkthroughlib/src/main/java/com/shashank/sony/fancywalkthroughlib/FancyWalkthroughActivity.java
@@ -9,9 +9,11 @@
 import android.support.annotation.ColorRes;
 import android.support.annotation.RequiresApi;
 import android.support.annotation.StringRes;
+import android.support.design.widget.FloatingActionButton;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
 import android.view.View;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.AlphaAnimation;
@@ -25,6 +27,8 @@
 import com.shashank.sony.fancywalkthroughlib.utils.ShadowTransformer;
 import com.shashank.sony.fancywalkthroughlib.views.CircleIndicatorView;
 
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 public abstract class FancyWalkthroughActivity extends AppCompatActivity implements View.OnClickListener, ViewPager.OnPageChangeListener {
@@ -44,6 +48,7 @@ public abstract class FancyWalkthroughActivity extends AppCompatActivity impleme
     private List<Integer> colorList;
     private boolean solidBackground = false;
     private List<FancyWalkthroughCard> pages;
+    private boolean isRTL = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -52,34 +57,53 @@ protected void onCreate(Bundle savedInstanceState) {
         setStatusBackgroundColor();
         hideActionBar();
 
-        parentLayout = (RelativeLayout) findViewById(R.id.parent_layout);
-        circleIndicatorView = (CircleIndicatorView) findViewById(R.id.circle_indicator_view);
-        btnSkip = (TextView) findViewById(R.id.btn_skip);
-        buttonsLayout = (FrameLayout) findViewById(R.id.buttons_layout);
-        navigationControls = (FrameLayout) findViewById(R.id.navigation_layout);
-        ivNext = (ImageView) findViewById(R.id.ivNext);
-        ivPrev = (ImageView) findViewById(R.id.ivPrev);
-        backgroundImage = (ImageView) findViewById(R.id.background_image);
-        vpOnboarderPager = (ViewPager) findViewById(R.id.vp_pager);
+        parentLayout = findViewById(R.id.parent_layout);
+        circleIndicatorView = findViewById(R.id.circle_indicator_view);
+        btnSkip = findViewById(R.id.btn_skip);
+        buttonsLayout = findViewById(R.id.buttons_layout);
+        navigationControls = findViewById(R.id.navigation_layout);
+        ivNext = findViewById(R.id.ivNext);
+        ivPrev = findViewById(R.id.ivPrev);
+        backgroundImage = findViewById(R.id.background_image);
+        vpOnboarderPager = findViewById(R.id.vp_pager);
         vpOnboarderPager.addOnPageChangeListener(this);
         btnSkip.setOnClickListener(this);
         ivPrev.setOnClickListener(this);
         ivNext.setOnClickListener(this);
 
         hideFinish(false);
-        fadeOut(ivPrev, false);
     }
 
-    public void setOnboardPages(List<FancyWalkthroughCard> pages) {
+    public void setOnboardPages(final List<FancyWalkthroughCard> pages) {
 
         this.pages = pages;
-        ahoyOnboarderAdapter = new FancyWalkthroughAdapter(pages, getSupportFragmentManager(), dpToPixels(0, this), typeface);
+        if(isRTL) { //reverse the order of pages so first page is the last
+
+            Collections.reverse(this.pages);
+            fadeOut(ivNext, false);
+        } else {
+
+            fadeOut(ivPrev, false);
+        } //end if
+
+        ahoyOnboarderAdapter = new FancyWalkthroughAdapter(pages, getSupportFragmentManager(), dpToPixels(0, this), typeface, isRTL);
         mCardShadowTransformer = new ShadowTransformer(vpOnboarderPager, ahoyOnboarderAdapter);
         mCardShadowTransformer.enableScaling(true);
         vpOnboarderPager.setAdapter(ahoyOnboarderAdapter);
         vpOnboarderPager.setPageTransformer(false, mCardShadowTransformer);
         circleIndicatorView.setPageIndicators(pages.size());
 
+        if(isRTL) { // start from the last page
+
+            //without postdelayed, a rectangle is drawn around the first page
+            vpOnboarderPager.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    vpOnboarderPager.setCurrentItem(pages.size() - 1, true);
+                }
+            },1);
+            circleIndicatorView.setCurrentPage(ahoyOnboarderAdapter.getCount() - 1);
+        } //end if
     }
 
     public float dpToPixels(int dp, Context context) {
@@ -101,12 +125,34 @@ public void onClick(View v) {
         boolean isInFirstPage = vpOnboarderPager.getCurrentItem() == 0;
         boolean isInLastPage = vpOnboarderPager.getCurrentItem() == ahoyOnboarderAdapter.getCount() - 1;
 
+        if (isRTL) { //if RTL, reverse the order
+            isInFirstPage = vpOnboarderPager.getCurrentItem() == ahoyOnboarderAdapter.getCount() - 1;
+            isInLastPage = vpOnboarderPager.getCurrentItem() == 0;
+        }
         if (i == R.id.btn_skip && isInLastPage) {
             onFinishButtonPressed();
-        } else if (i == R.id.ivPrev && !isInFirstPage) {
-            vpOnboarderPager.setCurrentItem(vpOnboarderPager.getCurrentItem() - 1);
-        } else if (i == R.id.ivNext && !isInLastPage) {
-            vpOnboarderPager.setCurrentItem(vpOnboarderPager.getCurrentItem() + 1);
+        } else if (i == R.id.ivPrev) {
+            if (isRTL) {
+                if(!isInLastPage) {
+
+                    vpOnboarderPager.setCurrentItem(vpOnboarderPager.getCurrentItem() - 1);
+                }//end if
+            } else {
+                if(!isInFirstPage) {
+                    vpOnboarderPager.setCurrentItem(vpOnboarderPager.getCurrentItem() - 1);
+                } //end if
+            }
+        } else if (i == R.id.ivNext) {
+            if (isRTL) {
+                if(!isInFirstPage) {
+
+                    vpOnboarderPager.setCurrentItem(vpOnboarderPager.getCurrentItem() + 1);
+                }//end if
+            } else {
+                if(!isInLastPage) {
+                    vpOnboarderPager.setCurrentItem(vpOnboarderPager.getCurrentItem() + 1);
+                } //end if
+            }
         }
     }
 
@@ -120,24 +166,51 @@ public void onPageSelected(int position) {
 
         int firstPagePosition = 0;
         int lastPagePosition = ahoyOnboarderAdapter.getCount() - 1;
-        circleIndicatorView.setCurrentPage(position);
+
+        //in case of RTL first is the last
+        if (isRTL) {
+            firstPagePosition = ahoyOnboarderAdapter.getCount() - 1;
+            lastPagePosition = 0;
+        } //end if
+
         circleIndicatorView.setCurrentPage(position);
 
         if (position == lastPagePosition) {
             fadeOut(circleIndicatorView);
             showFinish();
-            fadeOut(ivNext);
-            fadeIn(ivPrev);
+            if(isRTL) {
+                fadeOut(ivPrev);
+                fadeIn(ivNext);
+            } else {
+                fadeOut(ivNext);
+                fadeIn(ivPrev);
+            } //end if
         } else if (position == firstPagePosition) {
-            fadeOut(ivPrev);
-            fadeIn(ivNext);
+
+            if(isRTL) {
+
+                fadeOut(ivNext);
+                fadeIn(ivPrev);
+            } else {
+
+                fadeOut(ivPrev);
+                fadeIn(ivNext);
+            } //end if
             hideFinish();
             fadeIn(circleIndicatorView);
         } else {
             fadeIn(circleIndicatorView);
             hideFinish();
-            fadeIn(ivPrev);
-            fadeIn(ivNext);
+
+            if(isRTL) {
+
+                fadeIn(ivNext);
+                fadeIn(ivPrev);
+            } else {
+
+                fadeIn(ivPrev);
+                fadeIn(ivNext);
+            }
         }
 
         if (solidBackground && (pages.size() == colorList.size())) {
@@ -292,6 +365,13 @@ public void setActiveIndicatorColor(int color) {
         this.circleIndicatorView.setActiveIndicatorColor(color);
     }
 
+
+    public void setRTL(boolean value) {
+
+        this.isRTL = value;
+    }
+
+
     /**
      * <br/><br/>
      * <b>N.B. Builds before JELLY_BEAN will use the default style</b>
diff --git a/fancywalkthroughlib/src/main/java/com/shashank/sony/fancywalkthroughlib/FancyWalkthroughAdapter.java b/fancywalkthroughlib/src/main/java/com/shashank/sony/fancywalkthroughlib/FancyWalkthroughAdapter.java
index 86a5660..719169a 100644
--- a/fancywalkthroughlib/src/main/java/com/shashank/sony/fancywalkthroughlib/FancyWalkthroughAdapter.java
+++ b/fancywalkthroughlib/src/main/java/com/shashank/sony/fancywalkthroughlib/FancyWalkthroughAdapter.java
@@ -20,19 +20,19 @@ public class FancyWalkthroughAdapter extends FragmentStatePagerAdapter implement
     private List<FancyWalkthroughFragment> mFragments = new ArrayList<>();
     private float mBaseElevation;
     private Typeface typeface;
+    private boolean isRTL = false;
 
-    public FancyWalkthroughAdapter(List<FancyWalkthroughCard> pages, FragmentManager fm, float baseElevation, Typeface typeface) {
+    public FancyWalkthroughAdapter(List<FancyWalkthroughCard> pages, FragmentManager fm, float baseElevation, Typeface typeface, boolean isRTL) {
         super(fm);
         this.pages = pages;
         this.typeface = typeface;
         this.mBaseElevation = baseElevation;
-
+        this.isRTL = isRTL;
         for (int i = 0; i < pages.size(); i++) {
             addCardFragment(pages.get(i));
         }
 
         //setTypeface(typeface);
-
     }
 
     @Override
@@ -60,7 +60,7 @@ public CardView getCardViewAt(int position) {
     }
 
     public void addCardFragment(FancyWalkthroughCard page) {
-        mFragments.add(FancyWalkthroughFragment.newInstance(page));
+        mFragments.add(FancyWalkthroughFragment.newInstance(page, isRTL));
     }
 
     @Override
diff --git a/fancywalkthroughlib/src/main/java/com/shashank/sony/fancywalkthroughlib/FancyWalkthroughFragment.java b/fancywalkthroughlib/src/main/java/com/shashank/sony/fancywalkthroughlib/FancyWalkthroughFragment.java
index 074f613..96ac15d 100644
--- a/fancywalkthroughlib/src/main/java/com/shashank/sony/fancywalkthroughlib/FancyWalkthroughFragment.java
+++ b/fancywalkthroughlib/src/main/java/com/shashank/sony/fancywalkthroughlib/FancyWalkthroughFragment.java
@@ -6,6 +6,7 @@
 import android.os.Bundle;
 import android.support.annotation.ColorRes;
 import android.support.annotation.StringRes;
+import android.support.design.widget.FloatingActionButton;
 import android.support.v4.app.Fragment;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.CardView;
@@ -35,6 +36,7 @@ public class FancyWalkthroughFragment extends Fragment {
     private static final String FANCY_PAGE_MARGIN_RIGHT = "ahoy_page_margin_right";
     private static final String FANCY_PAGE_MARGIN_TOP = "ahoy_page_margin_top";
     private static final String FANCY_PAGE_MARGIN_BOTTOM = "ahoy_page_margin_bottom";
+    private static final String FANCY_PAGE_IS_RTL = "ahoy_page_is_rtl";
 
 
     private String title;
@@ -58,13 +60,14 @@ public class FancyWalkthroughFragment extends Fragment {
     private TextView tvOnboarderTitle;
     private TextView tvOnboarderDescription;
     private CardView cardView;
+    private FloatingActionButton fab;
     private int iconHeight, iconWidth;
     private int marginTop, marginBottom, marginLeft, marginRight;
 
     public FancyWalkthroughFragment() {
     }
 
-    public static FancyWalkthroughFragment newInstance(FancyWalkthroughCard card) {
+    public static FancyWalkthroughFragment newInstance(FancyWalkthroughCard card, boolean isRTL) {
         Bundle args = new Bundle();
         args.putString(FANCY_PAGE_TITLE, card.getTitle());
         args.putString(FANCY_PAGE_DESCRIPTION, card.getDescription());
@@ -82,6 +85,7 @@ public static FancyWalkthroughFragment newInstance(FancyWalkthroughCard card) {
         args.putInt(FANCY_PAGE_MARGIN_RIGHT, card.getMarginRight());
         args.putInt(FANCY_PAGE_MARGIN_TOP, card.getMarginTop());
         args.putInt(FANCY_PAGE_MARGIN_BOTTOM, card.getMarginBottom());
+        args.putBoolean(FANCY_PAGE_IS_RTL, isRTL);
 
         FancyWalkthroughFragment fragment = new FancyWalkthroughFragment();
         fragment.setArguments(args);
@@ -117,12 +121,16 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         marginRight = bundle.getInt(FANCY_PAGE_MARGIN_RIGHT, (int) dpToPixels(0, getActivity()));
 
         view = inflater.inflate(R.layout.fragment_ahoy, container, false);
-        ivOnboarderImage = (ImageView) view.findViewById(R.id.iv_image);
-        tvOnboarderTitle = (TextView) view.findViewById(R.id.tv_title);
-        tvOnboarderDescription = (TextView) view.findViewById(R.id.tv_description);
-        cardView = (CardView) view.findViewById(R.id.cv_cardview);
-        view1 = (View) view.findViewById(R.id.view1);
-
+        ivOnboarderImage = view.findViewById(R.id.iv_image);
+        tvOnboarderTitle = view.findViewById(R.id.tv_title);
+        tvOnboarderDescription = view.findViewById(R.id.tv_description);
+        cardView = view.findViewById(R.id.cv_cardview);
+        view1 = view.findViewById(R.id.view1);
+        fab = view.findViewById(R.id.fab);
+
+        if (bundle.getBoolean(FANCY_PAGE_IS_RTL, false)) {
+            fab.setRotation(180); //rotate the guide arrow
+        } //end if
 
         if (title != null) {
             tvOnboarderTitle.setText(title);
diff --git a/fancywalkthroughlib/src/main/res/layout/activity_ahoy.xml b/fancywalkthroughlib/src/main/res/layout/activity_ahoy.xml
index 7a07dc1..9f7d34d 100644
--- a/fancywalkthroughlib/src/main/res/layout/activity_ahoy.xml
+++ b/fancywalkthroughlib/src/main/res/layout/activity_ahoy.xml
@@ -22,8 +22,6 @@
         android:overScrollMode="never"
         android:paddingTop="20dp" />
 
-
-
     <FrameLayout
         android:id="@+id/buttons_layout"
         android:layout_width="match_parent"
diff --git a/fancywalkthroughlib/src/main/res/layout/fragment_ahoy.xml b/fancywalkthroughlib/src/main/res/layout/fragment_ahoy.xml
index dd32e61..66404dc 100644
--- a/fancywalkthroughlib/src/main/res/layout/fragment_ahoy.xml
+++ b/fancywalkthroughlib/src/main/res/layout/fragment_ahoy.xml
@@ -4,13 +4,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
+
     <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|center"
         android:layout_marginBottom="220dp"
-        android:src="@drawable/ic_arrow_forward_black_24dp"
-        />
+        android:src="@drawable/ic_arrow_forward_black_24dp" />
+
     <View
         android:id="@+id/view1"
         android:layout_width="match_parent"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0a5d98c..345570b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jan 12 22:01:08 IST 2018
+#Thu Apr 30 22:24:58 AST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip