Skip to content

Commit e71bb14

Browse files
JawnnypooJawnnypoo
committed
Update some things
1 parent 94d8db7 commit e71bb14

File tree

8 files changed

+126
-98
lines changed

8 files changed

+126
-98
lines changed

‎app/src/main/java/com/commit451/adapterlayout/sample/Cheese.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@
55
*/
66
public class Cheese {
77

8-
int mDrawable;
9-
String mName;
8+
int drawable;
9+
String name;
1010

1111
public Cheese(int drawable, String name) {
12-
mDrawable = drawable;
13-
mName = name;
12+
this.drawable = drawable;
13+
this.name = name;
1414
}
1515

1616
public int getDrawable() {
17-
return mDrawable;
17+
return drawable;
1818
}
1919

2020
public String getName() {
21-
return mName;
21+
return name;
2222
}
2323

2424
public void setName(String name) {
25-
mName = name;
25+
this.name = name;
2626
}
2727
}

‎app/src/main/java/com/commit451/adapterlayout/sample/CheeseAdapter.java‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,53 +14,54 @@
1414
*/
1515
public class CheeseAdapter extends RecyclerView.Adapter<CheeseViewHolder> {
1616

17-
private Listener mListener;
18-
private ArrayList<Cheese> mValues;
17+
private Listener listener;
18+
private ArrayList<Cheese> values;
1919

2020
public CheeseAdapter(Listener listener) {
21-
mListener = listener;
22-
mValues = new ArrayList<>();
21+
this.listener = listener;
22+
values = new ArrayList<>();
2323
}
2424

2525
public void setData(Collection<Cheese> cheeses) {
26-
mValues.addAll(cheeses);
26+
values.clear();
27+
values.addAll(cheeses);
2728
notifyDataSetChanged();
2829
}
2930

3031
public void add(Cheese cheese) {
31-
mValues.add(cheese);
32-
notifyItemInserted(mValues.size()-1);
32+
values.add(cheese);
33+
notifyItemInserted(values.size()-1);
3334
}
3435

3536
public void removeLast() {
36-
if (!mValues.isEmpty()) {
37-
int removeIndex = mValues.size() - 1;
38-
mValues.remove(removeIndex);
37+
if (!values.isEmpty()) {
38+
int removeIndex = values.size() - 1;
39+
values.remove(removeIndex);
3940
notifyItemRemoved(removeIndex);
4041
}
4142
}
4243

4344
public void changeMiddle() {
44-
if (!mValues.isEmpty()) {
45-
int index = mValues.size()/2;
46-
mValues.get(index).setName("Swiss");
45+
if (!values.isEmpty()) {
46+
int index = values.size()/2;
47+
values.get(index).setName("Swiss");
4748
notifyItemChanged(index);
4849
}
4950
}
5051

5152
public void changeAll() {
52-
if (!mValues.isEmpty()) {
53-
for (Cheese cheese : mValues) {
53+
if (!values.isEmpty()) {
54+
for (Cheese cheese : values) {
5455
cheese.setName("Swiss");
5556
}
56-
notifyItemRangeChanged(0, mValues.size());
57+
notifyItemRangeChanged(0, values.size());
5758
}
5859
}
5960

6061
public void clear() {
61-
if (!mValues.isEmpty()) {
62-
int size = mValues.size();
63-
mValues.clear();
62+
if (!values.isEmpty()) {
63+
int size = values.size();
64+
values.clear();
6465
notifyItemRangeRemoved(0, size);
6566
}
6667
}
@@ -74,7 +75,7 @@ public void onClick(View v) {
7475
//Takes the place of holder.getAdapterPosition()
7576
int position = AdapterLayout.getAdapterPosition(holder);
7677
Cheese cheese = getItemAt(position);
77-
mListener.onItemClicked(cheese);
78+
listener.onItemClicked(cheese);
7879
}
7980
});
8081
return holder;
@@ -88,11 +89,11 @@ public void onBindViewHolder(final CheeseViewHolder holder, int position) {
8889

8990
@Override
9091
public int getItemCount() {
91-
return mValues.size();
92+
return values.size();
9293
}
9394

9495
private Cheese getItemAt(int position) {
95-
return mValues.get(position);
96+
return values.get(position);
9697
}
9798

9899
public interface Listener {

‎app/src/main/java/com/commit451/adapterlayout/sample/Cheeses.java‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.commit451.adapterlayout.sample;
22

3+
import java.util.ArrayList;
4+
import java.util.List;
35
import java.util.Random;
46

57
/**
@@ -25,7 +27,7 @@ public static int getRandomCheeseDrawable() {
2527
}
2628
}
2729

28-
public static final String[] sCheeseStrings = {
30+
public static final String[] cheeseStrings = {
2931
"Abbaye de Belloc", "Abbaye du Mont des Cats", "Abertam", "Abondance", "Ackawi",
3032
"Acorn", "Adelost", "Affidelice au Chablis", "Afuega'l Pitu", "Airag", "Airedale",
3133
"Aisy Cendre", "Allgauer Emmentaler", "Alverca", "Ambert", "American Cheese",
@@ -159,11 +161,19 @@ public static int getRandomCheeseDrawable() {
159161
};
160162

161163
public static String getRandomCheeseName() {
162-
return sCheeseStrings[RANDOM.nextInt(sCheeseStrings.length-1)];
164+
return cheeseStrings[RANDOM.nextInt(cheeseStrings.length-1)];
163165
}
164166

165167
public static Cheese getRandomCheese() {
166168
return new Cheese(getRandomCheeseDrawable(), getRandomCheeseName());
167169
}
168170

171+
public static List<Cheese> getRandomCheeses(int count) {
172+
List<Cheese> cheeses = new ArrayList<>(count);
173+
for (int i=0; i<count; i++) {
174+
cheeses.add(getRandomCheese());
175+
}
176+
return cheeses;
177+
}
178+
169179
}

‎app/src/main/java/com/commit451/adapterlayout/sample/CustomAdapterLayoutActivity.java‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,50 +16,52 @@
1616

1717
public class CustomAdapterLayoutActivity extends AppCompatActivity {
1818

19-
@Bind(R.id.toolbar) Toolbar mToolbar;
19+
@Bind(R.id.toolbar)
20+
Toolbar toolbar;
2021
@Bind(R.id.adapter_layout)
21-
AdapterFlowLayout mAdapterLayout;
22-
CheeseAdapter mAdapter;
22+
AdapterFlowLayout adapterFlowLayout;
23+
24+
CheeseAdapter adapter;
25+
26+
private CheeseAdapter.Listener listener = new CheeseAdapter.Listener() {
27+
@Override
28+
public void onItemClicked(Cheese cheese) {
29+
Toast.makeText(CustomAdapterLayoutActivity.this, cheese.getName() + " clicked", Toast.LENGTH_SHORT)
30+
.show();
31+
}
32+
};
2333

2434
@OnClick(R.id.add_cheese)
2535
void onAddCheeseClicked() {
26-
mAdapter.add(Cheeses.getRandomCheese());
36+
adapter.add(Cheeses.getRandomCheese());
2737
}
2838

2939
@OnClick(R.id.remove_cheese)
3040
void onRemoveCheeseClicked() {
31-
mAdapter.removeLast();
41+
adapter.removeLast();
3242
}
3343

3444
@OnClick(R.id.new_adapter)
3545
void onNewAdapterClicked() {
36-
mAdapterLayout.setAdapter(null);
37-
mAdapter = new CheeseAdapter(mListener);
38-
mAdapterLayout.setAdapter(mAdapter);
46+
adapterFlowLayout.setAdapter(null);
47+
adapter = new CheeseAdapter(listener);
48+
adapterFlowLayout.setAdapter(adapter);
3949
}
4050

41-
private CheeseAdapter.Listener mListener = new CheeseAdapter.Listener() {
42-
@Override
43-
public void onItemClicked(Cheese cheese) {
44-
Toast.makeText(CustomAdapterLayoutActivity.this, cheese.getName() + " clicked", Toast.LENGTH_SHORT)
45-
.show();
46-
}
47-
};
48-
4951
@Override
5052
protected void onCreate(Bundle savedInstanceState) {
5153
super.onCreate(savedInstanceState);
5254
setContentView(R.layout.activity_custom_adapter_layout);
5355
ButterKnife.bind(this);
54-
mToolbar.setNavigationIcon(R.drawable.ic_arrow_back_24dp);
55-
mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
56+
toolbar.setNavigationIcon(R.drawable.ic_arrow_back_24dp);
57+
toolbar.setNavigationOnClickListener(new View.OnClickListener() {
5658
@Override
5759
public void onClick(View v) {
5860
onBackPressed();
5961
}
6062
});
61-
mAdapter = new CheeseAdapter(mListener);
62-
mAdapterLayout.setAdapter(mAdapter);
63+
adapter = new CheeseAdapter(listener);
64+
adapterFlowLayout.setAdapter(adapter);
6365
loadCheeses();
6466
}
6567

@@ -68,6 +70,6 @@ private void loadCheeses() {
6870
for (int i=0; i<5; i++) {
6971
cheeses.add(Cheeses.getRandomCheese());
7072
}
71-
mAdapter.setData(cheeses);
73+
adapter.setData(cheeses);
7274
}
7375
}

‎app/src/main/java/com/commit451/adapterlayout/sample/MainActivity.java‎

Lines changed: 36 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -20,63 +20,62 @@
2020
public class MainActivity extends AppCompatActivity {
2121

2222
@Bind(R.id.root)
23-
ViewGroup mRoot;
23+
ViewGroup root;
2424
@Bind(R.id.toolbar)
25-
Toolbar mToolbar;
25+
Toolbar toolbar;
2626
@Bind(R.id.adapter_layout)
27-
AdapterLinearLayout mAdapterLinearLayout;
28-
CheeseAdapter mAdapter;
27+
AdapterLinearLayout adapterLinearLayout;
2928
@Bind(R.id.animate_layout_changes)
30-
CheckBox mCheckboxAnimateLayoutChanges;
29+
CheckBox checkBoxAnimateLayoutChanges;
30+
31+
CheeseAdapter adapter;
32+
33+
private CheeseAdapter.Listener mListener = new CheeseAdapter.Listener() {
34+
@Override
35+
public void onItemClicked(Cheese cheese) {
36+
Snackbar.make(root, cheese.getName() + " clicked", Snackbar.LENGTH_SHORT)
37+
.show();
38+
}
39+
};
3140

3241
@OnClick(R.id.add_cheese)
3342
void onAddCheeseClicked() {
34-
mAdapter.add(Cheeses.getRandomCheese());
43+
adapter.add(Cheeses.getRandomCheese());
3544
}
3645

3746
@OnClick(R.id.remove_cheese)
3847
void onRemoveCheeseClicked() {
39-
mAdapter.removeLast();
48+
adapter.removeLast();
4049
}
4150

4251
@OnClick(R.id.change_middle)
4352
void onRemoveMiddleClicked() {
44-
mAdapter.changeMiddle();
53+
adapter.changeMiddle();
4554
}
4655

4756
@OnClick(R.id.clear_all)
4857
void onClearAll() {
49-
mAdapter.clear();
58+
adapter.clear();
5059
}
5160

5261
@OnClick(R.id.change_all)
5362
void onChangeAll() {
54-
mAdapter.changeAll();
63+
adapter.changeAll();
5564
}
5665

5766
@OnClick(R.id.new_adapter)
5867
void onNewAdapterClicked() {
59-
mAdapterLinearLayout.setAdapter(null);
60-
mAdapter = new CheeseAdapter(mListener);
61-
mAdapterLinearLayout.setAdapter(mAdapter);
68+
adapter.setData(Cheeses.getRandomCheeses(5));
6269
}
6370

64-
private CheeseAdapter.Listener mListener = new CheeseAdapter.Listener() {
65-
@Override
66-
public void onItemClicked(Cheese cheese) {
67-
Snackbar.make(mRoot, cheese.getName() + " clicked", Snackbar.LENGTH_SHORT)
68-
.show();
69-
}
70-
};
71-
7271
@Override
7372
protected void onCreate(Bundle savedInstanceState) {
7473
super.onCreate(savedInstanceState);
7574
setContentView(R.layout.activity_main);
7675
ButterKnife.bind(this);
77-
mToolbar.setTitle(R.string.app_name);
78-
mToolbar.inflateMenu(R.menu.main);
79-
mToolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() {
76+
toolbar.setTitle(R.string.app_name);
77+
toolbar.inflateMenu(R.menu.main);
78+
toolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() {
8079
@Override
8180
public boolean onMenuItemClick(MenuItem item) {
8281
switch (item.getItemId()) {
@@ -87,20 +86,27 @@ public boolean onMenuItemClick(MenuItem item) {
8786
return false;
8887
}
8988
});
90-
mAdapter = new CheeseAdapter(mListener);
91-
mAdapterLinearLayout.setAdapter(mAdapter);
89+
adapter = new CheeseAdapter(new CheeseAdapter.Listener() {
90+
@Override
91+
public void onItemClicked(Cheese cheese) {
9292

93-
mCheckboxAnimateLayoutChanges.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
93+
}
94+
});
95+
adapterLinearLayout.setAdapter(adapter);
96+
97+
checkBoxAnimateLayoutChanges.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
9498
@Override
9599
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
96100
if (isChecked) {
97101
LayoutTransition lt = new LayoutTransition();
98-
mAdapterLinearLayout.setLayoutTransition(lt);
102+
adapterLinearLayout.setLayoutTransition(lt);
99103
} else {
100-
mAdapterLinearLayout.setLayoutTransition(null);
104+
adapterLinearLayout.setLayoutTransition(null);
101105
}
102106
}
103107
});
104-
mCheckboxAnimateLayoutChanges.setChecked(true);
108+
checkBoxAnimateLayoutChanges.setChecked(true);
109+
110+
adapter.setData(Cheeses.getRandomCheeses(10));
105111
}
106112
}

0 commit comments

Comments
 (0)