Skip to content

Commit 930dabb

Browse files
committedDec 13, 2016
Tutorial Dependency and other unused dependency removed
1 parent 9a714e8 commit 930dabb

File tree

9 files changed

+70
-18
lines changed

9 files changed

+70
-18
lines changed
 

‎source-code/app/build.gradle

+3-7
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ android {
5151
}
5252

5353
dependencies {
54-
compile fileTree(include: ['*.jar'], dir: 'libs')
5554
compile 'com.android.support:appcompat-v7:23.4.0'
5655
compile 'com.android.support:cardview-v7:23.4.0'
5756
compile 'com.android.support:recyclerview-v7:23.4.0'
@@ -60,18 +59,15 @@ dependencies {
6059
compile('com.crashlytics.sdk.android:crashlytics:2.3.1@aar') {
6160
transitive = true;
6261
}
63-
compile files('libs/core-1.51.0.0.jar')
64-
compile files('libs/prov-1.51.0.0.jar')
65-
compile files('libs/zipio-lib-1.8.jar')
62+
6663
compile files('libs/zipsigner-lib-1.17.jar')
6764
compile files('libs/zipsigner-lib-optional-1.16.jar')
68-
compile files('libs/pkix-1.51.0.0.jar')
6965
compile files('libs/kellinwood-logging-android-1.4.jar')
7066
compile files('libs/kellinwood-logging-lib-1.1.jar')
7167
compile files('libs/kellinwood-logging-log4j-1.0.jar')
7268
compile files('libs/axml.jar')
73-
compile 'com.viewpagerindicator:library:2.4.1@aar'
74-
compile 'com.nineoldandroids:library:2.4.0'
69+
70+
7571
compile 'com.squareup.picasso:picasso:2.5.2'
7672
compile 'org.jsoup:jsoup:1.9.1'
7773
androidTestCompile 'com.android.support:support-annotations:23.4.0'
-2.24 MB
Binary file not shown.
-679 KB
Binary file not shown.
-1.12 MB
Binary file not shown.
-20.7 KB
Binary file not shown.

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

+56-5
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,26 @@
33
import android.os.Bundle;
44
import android.support.v4.view.ViewPager;
55
import android.support.v7.app.AppCompatActivity;
6+
import android.text.Html;
7+
import android.util.TypedValue;
8+
9+
import android.widget.LinearLayout;
10+
import android.widget.TextView;
611

7-
import com.viewpagerindicator.CirclePageIndicator;
812

913
import org.buildmlearn.toolkit.R;
1014
import org.buildmlearn.toolkit.adapter.TutorialAdapter;
1115
import org.buildmlearn.toolkit.constant.Constants;
16+
import org.buildmlearn.toolkit.model.Tutorial;
1217

1318
/**
1419
* @brief Shows the tutorial related to BuildmLearn toolkit usage.
1520
*/
1621
public class TutorialActivity extends AppCompatActivity {
1722

23+
24+
private LinearLayout indicatingDotsContainer;
25+
1826
/**
1927
* {@inheritDoc}
2028
*/
@@ -27,14 +35,57 @@ protected void onCreate(Bundle savedInstanceState) {
2735

2836
ViewPager mPager = (ViewPager) findViewById(R.id.pager);
2937
// mPager.setAdapter(mAdapter);
38+
indicatingDotsContainer = (LinearLayout) findViewById(R.id.layoutDots);
39+
addBottomDots(0); //adds indicating dots to given slide i.e current slide
3040

3141
assert mPager != null;
3242
mPager.setAdapter(mAdapter);
43+
mPager.addOnPageChangeListener(viewPagerPageChangeListener);
44+
}
3345

46+
private void addBottomDots(int current_slide) {
47+
TextView[] dots = new TextView[Tutorial.values().length];
48+
int dot_colorActive = getResources().getColor(R.color.selected_dot);
3449

35-
CirclePageIndicator mIndicator = (CirclePageIndicator) findViewById(R.id.indicator);
36-
assert mIndicator != null;
37-
mIndicator.setViewPager(mPager);
50+
indicatingDotsContainer.removeAllViews();
51+
52+
//number of dots added to container equals number of slides
53+
for (int i = 0; i < dots.length; i++) {
54+
dots[i] = new TextView(this);
55+
dots[i].setText(Html.fromHtml("&#9675;"));
56+
dots[i].setTextSize(TypedValue.COMPLEX_UNIT_SP,15);
57+
indicatingDotsContainer.addView(dots[i]);
58+
}
59+
60+
//dot corresponding to current slide is given active color i.e white color
61+
if (dots.length > 0) {
62+
dots[current_slide].setTextColor(dot_colorActive);
63+
dots[current_slide].setText(Html.fromHtml("&#8226;"));
64+
dots[current_slide].setTextSize(TypedValue.COMPLEX_UNIT_SP,32);
65+
}
3866
}
3967

40-
}
68+
ViewPager.OnPageChangeListener viewPagerPageChangeListener = new ViewPager.OnPageChangeListener() {
69+
70+
71+
@Override
72+
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
73+
//do nothing
74+
75+
}
76+
77+
//invoked when slide is changed
78+
@Override
79+
public void onPageSelected(int position) {
80+
addBottomDots(position);
81+
}
82+
83+
@Override
84+
public void onPageScrollStateChanged(int state) {
85+
86+
//do nothing
87+
}
88+
89+
90+
};
91+
}

‎source-code/app/src/main/res/layout/activity_tutorial.xml

+8-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,15 @@
88
android:layout_width="match_parent"
99
android:layout_height="match_parent" />
1010

11-
<com.viewpagerindicator.CirclePageIndicator
12-
android:id="@+id/indicator"
11+
12+
<LinearLayout
13+
android:id="@+id/layoutDots"
1314
android:layout_width="fill_parent"
1415
android:layout_height="wrap_content"
16+
android:gravity="center"
17+
android:orientation="horizontal"
18+
android:layout_alignParentLeft="true"
19+
android:layout_alignParentStart="true"
1520
android:layout_alignParentBottom="true"
16-
android:padding="10dip" />
21+
></LinearLayout>
1722
</RelativeLayout>

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
android:padding="16dp"
1515
android:text="@string/screen_1_title"
1616
android:textSize="@dimen/headline" />
17-
18-
17+
1918
<ImageView
2019
android:id="@+id/device_image"
2120
android:layout_width="wrap_content"
@@ -26,7 +25,7 @@
2625
android:scaleType="centerInside" />
2726

2827
<Button
29-
android:text="Skip tutorial."
28+
android:text="Skip Tutorial"
3029
style="?android:attr/borderlessButtonStyle"
3130
android:layout_width="match_parent"
3231
android:layout_height="wrap_content"

‎source-code/app/src/main/res/values/colors.xml

+1
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,6 @@
5555
<color name="colorPrimary_spell">#26C6DA</color>
5656
<color name="colorPrimaryDark_spell">#00BCD4</color>
5757
<color name="colorAccent_spell">#3F99A9</color>
58+
<color name="selected_dot">#FFFFFF</color>
5859

5960
</resources>

0 commit comments

Comments
 (0)