Skip to content

Commit a583781

Browse files
committed
indcator design changed
1 parent 5036345 commit a583781

11 files changed

Lines changed: 40 additions & 28 deletions

File tree

app/src/main/java/com/hololo/tutorial/sample/MainActivity.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.hololo.tutorial.sample;
22

33
import android.graphics.Color;
4-
import android.support.v7.app.AppCompatActivity;
54
import android.os.Bundle;
65

76
import com.hololo.tutorial.library.Step;
@@ -13,7 +12,7 @@ public class MainActivity extends TutorialActivity {
1312
protected void onCreate(Bundle savedInstanceState) {
1413
super.onCreate(savedInstanceState);
1514

16-
addFragment(new Step.Builder().setTitle("Otomatik Veri").setContent("GM Müzik Çalar şarkıcı/albüm resimlerini, tarzlarını otomatik olarak bulur ve gösterir*. \n\n\n(*)Bu özelliğin doğru çalışabilmesi için şarkı bilgilerinin düzgün olması gereklidir").setBackgroundColor(Color.parseColor("#FF0957")).setDrawable(R.drawable.ss_1).setSummary("Devam ederek nasıl yapacağınızı öğrenin").build());
15+
addFragment(new Step.Builder().setTitle("Otomatik Veri").setContent("GM Müzik Çalar şarkıcı/albüm resimlerini, tarzlarını otomatik olarak bulur ve gösterir.* \n\n(*) Bu özelliğin doğru çalışabilmesi için şarkı bilgilerinin düzgün olması gereklidir").setBackgroundColor(Color.parseColor("#FF0957")).setDrawable(R.drawable.ss_1).setSummary("Devam ederek nasıl yapacağınızı öğrenin").build());
1716

1817
addFragment(new Step.Builder().setTitle("Şarkıyı Seç").setContent("Şarkılarınızın listelendiği ana sekmeye geçin her şarkının yanındaki (⋮) dokunun ve açılan menüden Veri Düzenle'yi seçin").setBackgroundColor(Color.parseColor("#00D4BA")).setDrawable(R.drawable.ss_2).setSummary("Devam ederek nasıl güncelleyeceğinizi öğrenin").build());
1918

app/src/main/res/drawable/ss_1.png

-60.7 KB
Loading

app/src/main/res/drawable/ss_2.png

-46.2 KB
Loading

app/src/main/res/drawable/ss_3.png

-40.8 KB
Loading

app/src/main/res/drawable/ss_4.png

-178 KB
Loading

library/src/main/java/com/hololo/tutorial/library/TutorialActivity.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
package com.hololo.tutorial.library;
22

3-
import android.annotation.TargetApi;
43
import android.os.Build;
54
import android.os.Bundle;
6-
import android.os.PersistableBundle;
75
import android.support.annotation.Nullable;
86
import android.support.annotation.RequiresApi;
9-
import android.support.annotation.StringDef;
10-
import android.support.v4.app.Fragment;
117
import android.support.v4.view.ViewPager;
128
import android.support.v7.app.AppCompatActivity;
139
import android.view.View;
@@ -87,6 +83,7 @@ private void changeStatusBarColor(int backgroundColor) {
8783
}
8884

8985
private void controlPosition(int position) {
86+
notifyIndicator();
9087
if (position == steps.size() - 1) {
9188
next.setText(finishText);
9289
prev.setText(backText);
@@ -135,7 +132,12 @@ public void notifyIndicator() {
135132

136133
for (int i = 0; i < steps.size(); i++) {
137134
ImageView imageView = new ImageView(this);
138-
imageView.setImageResource(R.drawable.ic_brightness_1_black_24dp);
135+
imageView.setPadding(8, 8, 8, 8);
136+
int drawable = R.drawable.circle_black;
137+
if (i == currentItem)
138+
drawable = R.drawable.circle_white;
139+
140+
imageView.setImageResource(drawable);
139141

140142
final int finalI = i;
141143
imageView.setOnClickListener(new View.OnClickListener() {
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:shape="oval">
4+
<size
5+
android:width="12dp"
6+
android:height="12dp" />
7+
8+
<solid android:color="#80000000" />
9+
10+
</shape>
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:shape="oval">
4+
<size
5+
android:width="12dp"
6+
android:height="12dp" />
7+
8+
<solid android:color="#FFF" />
9+
10+
</shape>

library/src/main/res/drawable/ic_brightness_1_black_24dp.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.

library/src/main/res/layout/activity_tutorial.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:id="@+id/containerLayout"
34
android:layout_width="match_parent"
45
android:layout_height="match_parent"
5-
android:id="@+id/containerLayout"
6-
android:fitsSystemWindows="true"
76
android:background="#FFF"
87
android:clipToPadding="false"
8+
android:fitsSystemWindows="true"
99
android:orientation="vertical">
1010

1111
<android.support.v4.view.ViewPager
@@ -14,19 +14,19 @@
1414
android:layout_height="match_parent" />
1515

1616

17-
<!-- <View
18-
android:layout_width="match_parent"
19-
android:layout_height="24dp"
20-
android:background="#20000000" />-->
17+
<!-- <View
18+
android:layout_width="match_parent"
19+
android:layout_height="24dp"
20+
android:background="#20000000" />-->
2121

2222
<RelativeLayout
2323
android:id="@+id/buttonContainer"
2424
android:layout_width="match_parent"
25-
android:layout_height="80dp"
25+
android:layout_height="60dp"
2626
android:layout_gravity="bottom"
2727
android:background="@android:color/white"
2828
android:clipToPadding="false"
29-
android:elevation="16dp">
29+
android:elevation="24dp">
3030

3131
<Button
3232
android:id="@+id/prev"

0 commit comments

Comments
 (0)