git push origin bug-fixesMerge branch 'codingblazer-TutorialDependencyRemoval' into bug-fixes

Author: opticod

source-code/app/build.gradle

@@ -51,7 +51,6 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.android.support:appcompat-v7:23.4.0'
     compile 'com.android.support:cardview-v7:23.4.0'
     compile 'com.android.support:recyclerview-v7:23.4.0'
@@ -60,18 +59,15 @@ dependencies {
     compile('com.crashlytics.sdk.android:crashlytics:2.3.1@aar') {
         transitive = true;
     }
-    compile files('libs/core-1.51.0.0.jar')
-    compile files('libs/prov-1.51.0.0.jar')
-    compile files('libs/zipio-lib-1.8.jar')
+
     compile files('libs/zipsigner-lib-1.17.jar')
     compile files('libs/zipsigner-lib-optional-1.16.jar')
-    compile files('libs/pkix-1.51.0.0.jar')
     compile files('libs/kellinwood-logging-android-1.4.jar')
     compile files('libs/kellinwood-logging-lib-1.1.jar')
     compile files('libs/kellinwood-logging-log4j-1.0.jar')
     compile files('libs/axml.jar')
-    compile 'com.viewpagerindicator:library:2.4.1@aar'
-    compile 'com.nineoldandroids:library:2.4.0'
+
+
     compile 'com.squareup.picasso:picasso:2.5.2'
     compile 'org.jsoup:jsoup:1.9.1'
     androidTestCompile 'com.android.support:support-annotations:23.4.0'

source-code/app/libs/core-1.51.0.0.jar

@@ -3,18 +3,26 @@
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.AppCompatActivity;
+import android.text.Html;
+import android.util.TypedValue;
+
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
-import com.viewpagerindicator.CirclePageIndicator;
 
 import org.buildmlearn.toolkit.R;
 import org.buildmlearn.toolkit.adapter.TutorialAdapter;
 import org.buildmlearn.toolkit.constant.Constants;
+import org.buildmlearn.toolkit.model.Tutorial;
 
 /**
  * @brief Shows the tutorial related to BuildmLearn toolkit usage.
  */
 public class TutorialActivity extends AppCompatActivity {
 
+
+    private LinearLayout indicatingDotsContainer;
+
     /**
      * {@inheritDoc}
      */
@@ -27,14 +35,57 @@ protected void onCreate(Bundle savedInstanceState) {
 
         ViewPager mPager = (ViewPager) findViewById(R.id.pager);
         //  mPager.setAdapter(mAdapter);
+        indicatingDotsContainer = (LinearLayout) findViewById(R.id.layoutDots);
+        addBottomDots(0); //adds indicating dots to given slide i.e current slide
 
         assert mPager != null;
         mPager.setAdapter(mAdapter);
+        mPager.addOnPageChangeListener(viewPagerPageChangeListener);
+    }
 
+    private void addBottomDots(int current_slide) {
+        TextView[] dots = new TextView[Tutorial.values().length];
+        int dot_colorActive = getResources().getColor(R.color.selected_dot);
 
-        CirclePageIndicator mIndicator = (CirclePageIndicator) findViewById(R.id.indicator);
-        assert mIndicator != null;
-        mIndicator.setViewPager(mPager);
+        indicatingDotsContainer.removeAllViews();
+
+        //number of dots added to container equals number of slides
+        for (int i = 0; i < dots.length; i++) {
+            dots[i] = new TextView(this);
+            dots[i].setText(Html.fromHtml("&#9675;"));
+            dots[i].setTextSize(TypedValue.COMPLEX_UNIT_SP,15);
+            indicatingDotsContainer.addView(dots[i]);
+        }
+
+        //dot corresponding to current slide is given active color i.e white color
+        if (dots.length > 0) {
+            dots[current_slide].setTextColor(dot_colorActive);
+            dots[current_slide].setText(Html.fromHtml("&#8226;"));
+            dots[current_slide].setTextSize(TypedValue.COMPLEX_UNIT_SP,32);
+        }
     }
 
-}
+    ViewPager.OnPageChangeListener viewPagerPageChangeListener = new ViewPager.OnPageChangeListener() {
+
+
+        @Override
+        public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+            //do nothing
+
+        }
+
+        //invoked when slide is changed
+        @Override
+        public void onPageSelected(int position) {
+            addBottomDots(position);
+        }
+
+        @Override
+        public void onPageScrollStateChanged(int state) {
+
+            //do nothing
+        }
+
+
+    };
+}

source-code/app/libs/pkix-1.51.0.0.jar

@@ -231,7 +231,7 @@ public void onClick(View v) {
 
                 for(int i=0;i<options.size();i++){
                     for(int j=0;j<i;j++){
-                        if(options.get(i).getText().toString().trim().equalsIgnoreCase(options.get(j).getText().toString().trim())){
+                        if (!options.get(i).getText().toString().trim().isEmpty() && options.get(i).getText().toString().trim().equalsIgnoreCase(options.get(j).getText().toString().trim())) {
                             Toast.makeText(activity.getApplication(), activity.getString(R.string.same_options), Toast.LENGTH_SHORT).show();
                             isValidated=false;
                         }

source-code/app/libs/prov-1.51.0.0.jar

@@ -164,7 +164,7 @@ public void onClick(View v) {
 
                 for(int i=0;i<options.size();i++){
                     for(int j=0;j<i;j++){
-                        if(options.get(i).getText().toString().trim().equalsIgnoreCase(options.get(j).getText().toString().trim())){
+                        if (!options.get(i).getText().toString().trim().isEmpty() && options.get(i).getText().toString().trim().equalsIgnoreCase(options.get(j).getText().toString().trim())) {
                             Toast.makeText(activity.getApplication(), activity.getString(R.string.same_options), Toast.LENGTH_SHORT).show();
                             isValidated=false;
                         }

source-code/app/libs/zipio-lib-1.8.jar

@@ -1,10 +1,8 @@
 package org.buildmlearn.toolkit.utilities;
 
 import android.content.Context;
-
 import android.content.res.AssetManager;
 
-
 import org.w3c.dom.Document;
 
 import java.io.BufferedInputStream;
@@ -68,7 +66,9 @@ public static void unZip(InputStream zipInputStream, String destinationFolder) {
                 f.mkdirs();
             }
 
-            try (ZipInputStream zin = new ZipInputStream(new BufferedInputStream(zipInputStream, BUFFER_SIZE))) {
+            ZipInputStream zin = null;
+            try {
+                zin = new ZipInputStream(new BufferedInputStream(zipInputStream, BUFFER_SIZE));
                 ZipEntry ze;
                 while ((ze = zin.getNextEntry()) != null) {
                     String path = destinationFolder + ze.getName();
@@ -99,6 +99,10 @@ public static void unZip(InputStream zipInputStream, String destinationFolder) {
                         }
                     }
                 }
+            } finally {
+                if (zin != null) {
+                    zin.close();
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -8,10 +8,15 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <com.viewpagerindicator.CirclePageIndicator
-        android:id="@+id/indicator"
+
+    <LinearLayout
+        android:id="@+id/layoutDots"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_alignParentBottom="true"
-        android:padding="10dip" />
+        ></LinearLayout>
 </RelativeLayout>

source-code/app/src/main/java/org/buildmlearn/toolkit/templates/ComprehensionTemplate.java

@@ -14,8 +14,7 @@
         android:padding="16dp"
         android:text="@string/screen_1_title"
         android:textSize="@dimen/headline" />
-
-
+    
     <ImageView
         android:id="@+id/device_image"
         android:layout_width="wrap_content"
@@ -26,7 +25,7 @@
         android:scaleType="centerInside" />
 
     <Button
-        android:text="Skip tutorial."
+        android:text="Skip Tutorial"
         style="?android:attr/borderlessButtonStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

source-code/app/src/main/java/org/buildmlearn/toolkit/templates/QuizTemplate.java

@@ -52,5 +52,6 @@
     <color name="colorPrimary_spell">#26C6DA</color>
     <color name="colorPrimaryDark_spell">#00BCD4</color>
     <color name="colorAccent_spell">#3F99A9</color>
+    <color name="selected_dot">#FFFFFF</color>
 
 </resources>