diff --git a/source-code/app/build.gradle b/source-code/app/build.gradle index 93c39610..17e98cce 100644 --- a/source-code/app/build.gradle +++ b/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' diff --git a/source-code/app/libs/core-1.51.0.0.jar b/source-code/app/libs/core-1.51.0.0.jar deleted file mode 100644 index 60b24ddd..00000000 Binary files a/source-code/app/libs/core-1.51.0.0.jar and /dev/null differ diff --git a/source-code/app/libs/pkix-1.51.0.0.jar b/source-code/app/libs/pkix-1.51.0.0.jar deleted file mode 100644 index d6f40dc8..00000000 Binary files a/source-code/app/libs/pkix-1.51.0.0.jar and /dev/null differ diff --git a/source-code/app/libs/prov-1.51.0.0.jar b/source-code/app/libs/prov-1.51.0.0.jar deleted file mode 100644 index d5d78991..00000000 Binary files a/source-code/app/libs/prov-1.51.0.0.jar and /dev/null differ diff --git a/source-code/app/libs/zipio-lib-1.8.jar b/source-code/app/libs/zipio-lib-1.8.jar deleted file mode 100644 index afe7cc14..00000000 Binary files a/source-code/app/libs/zipio-lib-1.8.jar and /dev/null differ diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/TutorialActivity.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/TutorialActivity.java index a11fe203..c3393514 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/TutorialActivity.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/TutorialActivity.java @@ -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("○")); + 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("•")); + 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 + } + + + }; +} \ No newline at end of file diff --git a/source-code/app/src/main/res/layout/activity_tutorial.xml b/source-code/app/src/main/res/layout/activity_tutorial.xml index 41234f4b..27eef14d 100644 --- a/source-code/app/src/main/res/layout/activity_tutorial.xml +++ b/source-code/app/src/main/res/layout/activity_tutorial.xml @@ -8,10 +8,15 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - + > \ No newline at end of file diff --git a/source-code/app/src/main/res/layout/tutorial_layout.xml b/source-code/app/src/main/res/layout/tutorial_layout.xml index 182c8d9e..f8be17ae 100644 --- a/source-code/app/src/main/res/layout/tutorial_layout.xml +++ b/source-code/app/src/main/res/layout/tutorial_layout.xml @@ -14,8 +14,7 @@ android:padding="16dp" android:text="@string/screen_1_title" android:textSize="@dimen/headline" /> - - +