Skip to content

Commit f96a6a5

Browse files
author
smhdk
committed
-Bug fixed
1 parent 8cffe54 commit f96a6a5

3 files changed

Lines changed: 47 additions & 9 deletions

File tree

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

Lines changed: 44 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.Manifest;
44
import android.graphics.Color;
55
import android.os.Bundle;
6+
import android.support.annotation.Nullable;
67
import android.view.View;
78
import android.widget.Toast;
89

@@ -19,11 +20,45 @@ public class MainActivity extends TutorialActivity {
1920
protected void onCreate(Bundle savedInstanceState) {
2021
super.onCreate(savedInstanceState);
2122

22-
addFragment(new PermissionStep.Builder().setPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}).setTitle(getString(R.string.permission_title)).setContent(getString(R.string.permission_detail)).setBackgroundColor(Color.parseColor("#FF0957")).setDrawable(R.drawable.ss_1).setSummary(getString(R.string.continue_and_learn)).build());
23-
addFragment(new Step.Builder().setTitle(getString(R.string.automatic_data)).setContent(getString(R.string.gm_finds_photos)).setBackgroundColor(Color.parseColor("#FF0957")).setDrawable(R.drawable.ss_1).setSummary(getString(R.string.continue_and_learn)).build());
24-
addFragment(new Step.Builder().setTitle(getString(R.string.choose_the_song)).setContent(getString(R.string.swap_to_the_tab)).setBackgroundColor(Color.parseColor("#00D4BA")).setDrawable(R.drawable.ss_2).setSummary(getString(R.string.continue_and_update)).build());
25-
addFragment(new Step.Builder().setTitle(getString(R.string.edit_data)).setContent(getString(R.string.update_easily)).setBackgroundColor(Color.parseColor("#1098FE")).setDrawable(R.drawable.ss_3).setSummary(getString(R.string.continue_and_result)).build());
26-
addFragment(new Step.Builder().setTitle(getString(R.string.result_awesome)).setContent(getString(R.string.after_updating)).setBackgroundColor(Color.parseColor("#CA70F3")).setDrawable(R.drawable.ss_4).setSummary(getString(R.string.thank_you)).build());
23+
addFragment(new PermissionStep.Builder()
24+
.setPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE})
25+
.setTitle(getString(R.string.permission_title)).setContent(getString(R.string.permission_detail))
26+
.setBackgroundColor(Color.parseColor("#FF0957"))
27+
.setDrawable(R.drawable.ss_1)
28+
.setSummary(getString(R.string.continue_and_learn))
29+
.build());
30+
31+
addFragment(new Step.Builder()
32+
.setTitle(getString(R.string.automatic_data))
33+
.setContent(getString(R.string.gm_finds_photos))
34+
.setBackgroundColor(Color.parseColor("#FF0957"))
35+
.setDrawable(R.drawable.ss_1)
36+
.setSummary(getString(R.string.continue_and_learn))
37+
.build());
38+
39+
addFragment(new Step.Builder()
40+
.setTitle(getString(R.string.choose_the_song))
41+
.setContent(getString(R.string.swap_to_the_tab))
42+
.setBackgroundColor(Color.parseColor("#00D4BA"))
43+
.setDrawable(R.drawable.ss_2)
44+
.setSummary(getString(R.string.continue_and_update))
45+
.build());
46+
47+
addFragment(new Step.Builder()
48+
.setTitle(getString(R.string.edit_data))
49+
.setContent(getString(R.string.update_easily))
50+
.setBackgroundColor(Color.parseColor("#1098FE"))
51+
.setDrawable(R.drawable.ss_3)
52+
.setSummary(getString(R.string.continue_and_result))
53+
.build());
54+
55+
addFragment(new Step.Builder()
56+
.setTitle(getString(R.string.result_awesome))
57+
.setContent(getString(R.string.after_updating))
58+
.setBackgroundColor(Color.parseColor("#CA70F3"))
59+
.setDrawable(R.drawable.ss_4)
60+
.setSummary(getString(R.string.thank_you))
61+
.build());
2762

2863
}
2964

@@ -39,12 +74,14 @@ public void cancelTutorial() {
3974

4075
@Override
4176
public void currentFragmentPosition(int position) {
42-
Toast.makeText(this,"Position : " + position,Toast.LENGTH_SHORT).show();
77+
Toast.makeText(this, "Position : " + position, Toast.LENGTH_SHORT).show();
4378
}
4479

4580
@Override
46-
public void currentFragmentView(View view, String tag) {
81+
public void currentFragmentView(@Nullable View view, @Nullable String tag) {
4782
currentFragmentView = view;
4883
currentFragmentTag = tag;
4984
}
85+
86+
5087
}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package com.hololo.tutorial.library;
22

3+
import android.support.annotation.Nullable;
34
import android.view.View;
45

56
public interface CurrentFragmentListener {
67
void currentFragmentPosition(int position);
78

8-
void currentFragmentView(View view, String position);
9+
void currentFragmentView(@Nullable View view, @Nullable String tag);
910
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.util.ArrayList;
2323
import java.util.List;
2424

25-
public abstract class TutorialActivity extends AppCompatActivity implements View.OnClickListener,CurrentFragmentListener {
25+
public abstract class TutorialActivity extends AppCompatActivity implements View.OnClickListener, CurrentFragmentListener {
2626

2727
private List<Step> steps;
2828
private StepPagerAdapter adapter;

0 commit comments

Comments
 (0)