git push origin bug-fixesMerge branch 'free4murad-skip-tutorial-button' into bug-fixes

Author: opticod

source-code/app/src/main/java/org/buildmlearn/toolkit/activity/HomeActivity.java

@@ -4,8 +4,10 @@
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Handler;
+import android.preference.PreferenceManager;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
@@ -37,6 +39,10 @@ public class HomeActivity extends AppCompatActivity
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+        SharedPreferences.Editor editor = prefs.edit();
+        editor.putBoolean("SkipTutorial", true);
+        editor.apply();
 
         setContentView(R.layout.activity_home);
         setSupportActionBar((Toolbar) findViewById(R.id.toolbar));

source-code/app/src/main/java/org/buildmlearn/toolkit/adapter/TutorialAdapter.java

@@ -3,7 +3,9 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.graphics.Color;
+import android.preference.PreferenceManager;
 import android.support.annotation.ColorRes;
 import android.support.v4.view.PagerAdapter;
 import android.view.LayoutInflater;
@@ -53,6 +55,9 @@ private Tutorial getItem(int position) {
     @Override
     public Object instantiateItem(ViewGroup container, final int position) {
 
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mActivity);
+        boolean SkipTutorial = prefs.getBoolean("SkipTutorial",false);
+
         LayoutInflater inflater = (LayoutInflater) container.getContext()
                 .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 
@@ -74,6 +79,8 @@ public void onClick(View v) {
             });
         } else {
             convertView = inflater.inflate(R.layout.tutorial_layout, null);
+            View skip_button = convertView.findViewById(R.id.skip_button);
+            skip_button.setVisibility(View.GONE);
             ImageView deviceImage = (ImageView) convertView
                     .findViewById(R.id.device_image);
             TextView title = (TextView) convertView
@@ -88,6 +95,22 @@ public void onClick(View v) {
             deviceImage.setImageResource(tutorial.getImage());
             title.setText(tutorial.getTitle());
             description.setText(tutorial.getDescription());
+            if(!SkipTutorial) {
+                if ("Welcome to BuildmLearn Toolkit".equals(title.getText().toString())) {
+                    skip_button.setVisibility(View.VISIBLE);
+                    } else {
+                    skip_button.setVisibility(View.GONE);
+                }
+            }
+            convertView.findViewById(R.id.skip_button).setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (mStartActivity) {
+                        mActivity.startActivity(new Intent(mActivity, HomeActivity.class));
+                    }
+                    mActivity.finish();
+                }
+                });
         }
         container.addView(convertView, 0);
 

source-code/app/src/main/res/layout/tutorial_layout.xml

@@ -25,6 +25,15 @@
         android:contentDescription="@string/tutorial_image"
         android:scaleType="centerInside" />
 
+    <Button
+        android:text="Skip tutorial."
+        style="?android:attr/borderlessButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#29A6D4"
+        android:textAllCaps="false"
+        android:id="@+id/skip_button" />
+
     <org.buildmlearn.toolkit.views.TextViewPlus
         android:id="@+id/tutorial_desc"
         android:layout_width="match_parent"

source-code/app/src/main/res/layout/tutorial_layout_finish.xml

@@ -57,7 +57,7 @@
             android:paddingLeft="20dp"
             android:paddingRight="20dp"
             android:text="@string/screen_finish"
-            android:textAllCaps="true"
+            android:textAllCaps="false"
             android:textColor="@color/white_primary_text" />