Skip to content

Commit 534a1b0

Browse files
committed
Update demo application
1 parent ba1f987 commit 534a1b0

24 files changed

+137
-6
lines changed

app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@ dependencies {
2525
compile project(':library')
2626
compile 'com.android.support:appcompat-v7:23.0.0'
2727
compile 'com.github.yukuku:ambilwarna:2.0'
28+
compile 'com.android.support:support-v4:23.0.0'
2829
}

app/src/main/java/pl/sigmapoint/StartFragment.java renamed to app/src/main/java/pl/sigmapoint/CreateFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
/**
2323
* A simple {@link Fragment} subclass.
2424
*/
25-
public class StartFragment extends Fragment implements View.OnClickListener {
25+
public class CreateFragment extends Fragment implements View.OnClickListener {
2626

2727
private final int BG_NORMAL = 0;
2828
private final int BG_PRESSED = 1;
@@ -51,7 +51,7 @@ public class StartFragment extends Fragment implements View.OnClickListener {
5151

5252
private CustomButton generatedCB;
5353

54-
public StartFragment() {
54+
public CreateFragment() {
5555
// Required empty public constructor
5656
}
5757

app/src/main/java/pl/sigmapoint/MainActivity.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
1313
protected void onCreate(Bundle savedInstanceState) {
1414
super.onCreate(savedInstanceState);
1515
setContentView(R.layout.activity_main);
16-
getSupportFragmentManager().beginTransaction().add(R.id.main_container, new StartFragment()).commit();
16+
getSupportFragmentManager().beginTransaction().add(R.id.main_container, new MainFragment()).commit();
1717
}
1818

1919
@Override
@@ -27,4 +27,8 @@ public void onBackPressed() {
2727
public void startGenerated() {
2828
getSupportFragmentManager().beginTransaction().replace(R.id.main_container, new GeneratedFragment()).addToBackStack(GeneratedFragment.class.getSimpleName()).commit();
2929
}
30+
31+
public void startCreate() {
32+
getSupportFragmentManager().beginTransaction().replace(R.id.main_container, new CreateFragment()).addToBackStack(CreateFragment.class.getSimpleName()).commit();
33+
}
3034
}
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package pl.sigmapoint;
2+
3+
4+
import android.os.Bundle;
5+
import android.support.v4.app.Fragment;
6+
import android.view.LayoutInflater;
7+
import android.view.View;
8+
import android.view.ViewGroup;
9+
10+
/**
11+
* A simple {@link Fragment} subclass.
12+
*/
13+
public class MainFragment extends Fragment {
14+
15+
16+
public MainFragment() {
17+
// Required empty public constructor
18+
}
19+
20+
21+
@Override
22+
public View onCreateView(LayoutInflater inflater, ViewGroup container,
23+
Bundle savedInstanceState) {
24+
// Inflate the layout for this fragment
25+
View view = inflater.inflate(R.layout.fragment_main, container, false);
26+
view.findViewById(R.id.own).setOnClickListener(new View.OnClickListener() {
27+
@Override
28+
public void onClick(View v) {
29+
if (getActivity() instanceof MainActivity)
30+
((MainActivity) getActivity()).startCreate();
31+
}
32+
});
33+
return view;
34+
}
35+
36+
37+
}
759 Bytes
Loading
1.4 KB
Loading
3.3 KB
Loading
325 Bytes
Loading
385 Bytes
Loading
936 Bytes
Loading

0 commit comments

Comments
 (0)