Skip to content

Commit 8df52b8

Browse files
JawnnypooJawnnypoo
committed
Style updates
1 parent 1015739 commit 8df52b8

11 files changed

Lines changed: 58 additions & 65 deletions

File tree

‎adapterflowlayout/src/main/java/com/commit451/adapterflowlayout/AdapterFlowLayout.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44
import android.support.annotation.Nullable;
55
import android.support.v7.widget.RecyclerView;
66
import android.util.AttributeSet;
7-
import android.widget.Adapter;
87

98
import com.commit451.adapterlayout.AdapterLayoutDelegate;
109
import com.wefika.flowlayout.FlowLayout;
1110

1211
/**
13-
* {@link com.wefika.flowlayout.FlowLayout} with {@link Adapter} support.
12+
* {@link com.wefika.flowlayout.FlowLayout} with {@link android.support.v7.widget.RecyclerView.Adapter} support.
1413
*/
1514
public class AdapterFlowLayout extends FlowLayout {
1615

‎adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLayoutDelegate.java‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -155,31 +155,30 @@ private void recreateViews() {
155155
}
156156
int i;
157157
for (i = 0; i < mAdapter.getItemCount(); i++) {
158-
159-
int viewType = mAdapter.getItemViewType(i);
160-
//This means the view could already exist
161-
if (i < mViewGroup.getChildCount()) {
162-
View child = mViewGroup.getChildAt(i);
163-
Integer savedViewType = (Integer) child.getTag(R.id.adapter_layout_list_view_type);
164-
RecyclerView.ViewHolder savedViewHolder = (RecyclerView.ViewHolder) child.getTag(R.id.adapter_layout_list_holder);
165-
166-
if (savedViewType != null && savedViewType == viewType && savedViewHolder != null) {
167-
//perfect, it exists and is the right type, so just bind it
168-
mAdapter.onBindViewHolder(savedViewHolder, i);
158+
int viewType = mAdapter.getItemViewType(i);
159+
//This means the view could already exist
160+
if (i < mViewGroup.getChildCount()) {
161+
View child = mViewGroup.getChildAt(i);
162+
Integer savedViewType = (Integer) child.getTag(R.id.adapter_layout_list_view_type);
163+
RecyclerView.ViewHolder savedViewHolder = (RecyclerView.ViewHolder) child.getTag(R.id.adapter_layout_list_holder);
164+
165+
if (savedViewType != null && savedViewType == viewType && savedViewHolder != null) {
166+
//perfect, it exists and is the right type, so just bind it
167+
mAdapter.onBindViewHolder(savedViewHolder, i);
168+
} else {
169+
//it already existed, but something was wrong. So remove it and recreate it
170+
addViewAt(viewType, i);
171+
mViewGroup.removeView(child);
172+
}
169173
} else {
170-
//it already existed, but something was wrong. So remove it and recreate it
171-
addViewAt(viewType, i);
172-
mViewGroup.removeView(child);
174+
//Creating a brand new view
175+
addViewAt(viewType, i);
173176
}
174-
} else {
175-
//Creating a brand new view
176-
addViewAt(viewType, i);
177-
}
178177
}
179178

180179
//Outside the bounds of the dataset, so remove it
181180
if (i < mViewGroup.getChildCount()) {
182-
mViewGroup.removeViews(i, mViewGroup.getChildCount() - i);
181+
mViewGroup.removeViews(i, mViewGroup.getChildCount() - i);
183182
}
184183
}
185184
}

‎app/build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ dependencies {
2727
testCompile 'junit:junit:4.12'
2828
compile "com.android.support:appcompat-v7:$supportLibVersion"
2929
compile "com.android.support:design:$supportLibVersion"
30-
compile 'com.jakewharton:butterknife:7.0.1'
30+
compile 'com.jakewharton:butterknife:8.5.1'
31+
annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
3132
compile project(':adapterlayout')
3233
compile project(':adapterflowlayout')
3334
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</intent-filter>
1717
</activity>
1818

19-
<activity android:name=".CustomAdapterLayoutActivity"/>
19+
<activity android:name=".AdapterFlowLayoutActivity"/>
2020
</application>
2121

2222
</manifest>

app/src/main/java/com/commit451/adapterlayout/sample/CustomAdapterLayoutActivity.java renamed to app/src/main/java/com/commit451/adapterlayout/sample/AdapterFlowLayoutActivity.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@
1010

1111
import java.util.ArrayList;
1212

13-
import butterknife.Bind;
13+
import butterknife.BindView;
1414
import butterknife.ButterKnife;
1515
import butterknife.OnClick;
1616

17-
public class CustomAdapterLayoutActivity extends AppCompatActivity {
17+
public class AdapterFlowLayoutActivity extends AppCompatActivity {
1818

19-
@Bind(R.id.toolbar)
19+
@BindView(R.id.toolbar)
2020
Toolbar toolbar;
21-
@Bind(R.id.adapter_layout)
21+
@BindView(R.id.adapter_layout)
2222
AdapterFlowLayout adapterFlowLayout;
2323

2424
CheeseAdapter adapter;
2525

2626
private CheeseAdapter.Listener listener = new CheeseAdapter.Listener() {
2727
@Override
2828
public void onItemClicked(Cheese cheese) {
29-
Toast.makeText(CustomAdapterLayoutActivity.this, cheese.getName() + " clicked", Toast.LENGTH_SHORT)
29+
Toast.makeText(AdapterFlowLayoutActivity.this, cheese.name + " clicked", Toast.LENGTH_SHORT)
3030
.show();
3131
}
3232
};

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

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

8-
int drawable;
9-
String name;
8+
public int drawable;
9+
public String name;
1010

1111
public Cheese(int drawable, String name) {
1212
this.drawable = drawable;
1313
this.name = name;
1414
}
15-
16-
public int getDrawable() {
17-
return drawable;
18-
}
19-
20-
public String getName() {
21-
return name;
22-
}
23-
24-
public void setName(String name) {
25-
this.name = name;
26-
}
2715
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ public void removeLast() {
4444
public void changeMiddle() {
4545
if (!values.isEmpty()) {
4646
int index = values.size()/2;
47-
values.get(index).setName("Swiss");
47+
values.get(index).name = "Swiss";
4848
notifyItemChanged(index);
4949
}
5050
}
5151

5252
public void changeAll() {
5353
if (!values.isEmpty()) {
5454
for (Cheese cheese : values) {
55-
cheese.setName("Swiss");
55+
cheese.name = "Swiss";
5656
}
5757
notifyItemRangeChanged(0, values.size());
5858
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ public CheeseViewHolder(View view) {
2525
}
2626

2727
public void bind(Cheese cheese) {
28-
title.setText(cheese.getName());
28+
title.setText(cheese.name);
2929
}
3030
}

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,27 @@
1313

1414
import com.commit451.adapterlayout.AdapterLinearLayout;
1515

16-
import butterknife.Bind;
16+
import butterknife.BindView;
1717
import butterknife.ButterKnife;
1818
import butterknife.OnClick;
1919

2020
public class MainActivity extends AppCompatActivity {
2121

22-
@Bind(R.id.root)
22+
@BindView(R.id.root)
2323
ViewGroup root;
24-
@Bind(R.id.toolbar)
24+
@BindView(R.id.toolbar)
2525
Toolbar toolbar;
26-
@Bind(R.id.adapter_layout)
26+
@BindView(R.id.adapter_layout)
2727
AdapterLinearLayout adapterLinearLayout;
28-
@Bind(R.id.animate_layout_changes)
28+
@BindView(R.id.animate_layout_changes)
2929
CheckBox checkBoxAnimateLayoutChanges;
3030

3131
CheeseAdapter adapter;
3232

33-
private CheeseAdapter.Listener mListener = new CheeseAdapter.Listener() {
33+
private CheeseAdapter.Listener listener = new CheeseAdapter.Listener() {
3434
@Override
3535
public void onItemClicked(Cheese cheese) {
36-
Snackbar.make(root, cheese.getName() + " clicked", Snackbar.LENGTH_SHORT)
36+
Snackbar.make(root, cheese.name + " clicked", Snackbar.LENGTH_SHORT)
3737
.show();
3838
}
3939
};
@@ -63,9 +63,16 @@ void onChangeAll() {
6363
adapter.changeAll();
6464
}
6565

66+
@OnClick(R.id.set_to_5)
67+
void onSetTo5Clicked() {
68+
adapter.setData(Cheeses.getRandomCheeses(5));
69+
}
70+
6671
@OnClick(R.id.new_adapter)
6772
void onNewAdapterClicked() {
68-
adapter.setData(Cheeses.getRandomCheeses(5));
73+
adapterLinearLayout.setAdapter(null);
74+
adapter = new CheeseAdapter(listener);
75+
adapterLinearLayout.setAdapter(adapter);
6976
}
7077

7178
@Override
@@ -79,19 +86,14 @@ protected void onCreate(Bundle savedInstanceState) {
7986
@Override
8087
public boolean onMenuItemClick(MenuItem item) {
8188
switch (item.getItemId()) {
82-
case R.id.action_custom_adapter_layout:
83-
startActivity(new Intent(MainActivity.this, CustomAdapterLayoutActivity.class));
89+
case R.id.action_adapter_flow_layout:
90+
startActivity(new Intent(MainActivity.this, AdapterFlowLayoutActivity.class));
8491
return true;
8592
}
8693
return false;
8794
}
8895
});
89-
adapter = new CheeseAdapter(new CheeseAdapter.Listener() {
90-
@Override
91-
public void onItemClicked(Cheese cheese) {
92-
93-
}
94-
});
96+
adapter = new CheeseAdapter(listener);
9597
adapterLinearLayout.setAdapter(adapter);
9698

9799
checkBoxAnimateLayoutChanges.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@@ -106,7 +108,5 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
106108
}
107109
});
108110
checkBoxAnimateLayoutChanges.setChecked(true);
109-
110-
adapter.setData(Cheeses.getRandomCheeses(10));
111111
}
112112
}

‎app/src/main/res/layout/activity_main.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,12 @@
7676
android:layout_height="wrap_content"
7777
android:text="Change All" />
7878

79+
<Button
80+
android:id="@+id/set_to_5"
81+
android:layout_width="wrap_content"
82+
android:layout_height="wrap_content"
83+
android:text="Set to 5" />
84+
7985
<Button
8086
android:id="@+id/new_adapter"
8187
android:layout_width="wrap_content"

0 commit comments

Comments
 (0)