Skip to content

Commit 5239b8e

Browse files
committed
see 06/14 log
1 parent efc1343 commit 5239b8e

File tree

4 files changed

+12
-14
lines changed

4 files changed

+12
-14
lines changed

app/src/main/java/com/blankj/androidutilcode/activity/SnackbarActivity.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void initView(Bundle savedInstanceState, View view) {
5151
findViewById(R.id.btn_show_success).setOnClickListener(this);
5252
findViewById(R.id.btn_show_warning).setOnClickListener(this);
5353
findViewById(R.id.btn_show_error).setOnClickListener(this);
54-
findViewById(R.id.btn_cancel_snackbar).setOnClickListener(this);
54+
findViewById(R.id.btn_dismiss_snackbar).setOnClickListener(this);
5555
}
5656

5757
@Override
@@ -138,7 +138,7 @@ public void onClick(View v) {
138138
.setDuration(SnackbarUtils.LENGTH_INDEFINITE)
139139
.show();
140140
ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
141-
SnackbarUtils.addView(R.layout.snackbar_custom, -1, params);
141+
SnackbarUtils.addView(R.layout.snackbar_custom, params);
142142
break;
143143

144144
case R.id.btn_add_view_with_action:
@@ -147,12 +147,12 @@ public void onClick(View v) {
147147
.setDuration(SnackbarUtils.LENGTH_INDEFINITE)
148148
.show();
149149
params = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
150-
SnackbarUtils.addView(R.layout.snackbar_custom, -1, params);
150+
SnackbarUtils.addView(R.layout.snackbar_custom, params);
151151
View snackbarView = SnackbarUtils.getView();
152152
if (snackbarView != null) {
153153
TextView tvSnackbarCustom = (TextView) snackbarView.findViewById(R.id.tv_snackbar_custom);
154154
tvSnackbarCustom.setText("点我可消失");
155-
tvSnackbarCustom.setOnClickListener(new View.OnClickListener() {
155+
snackbarView.setOnClickListener(new View.OnClickListener() {
156156
@Override
157157
public void onClick(View v) {
158158
SnackbarUtils.dismiss();
@@ -179,7 +179,7 @@ public void onClick(View v) {
179179
.showError();
180180
break;
181181

182-
case R.id.btn_cancel_snackbar:
182+
case R.id.btn_dismiss_snackbar:
183183
SnackbarUtils.dismiss();
184184
break;
185185
}

app/src/main/res/layout/activity_snackbar.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@
9090

9191

9292
<Button
93-
android:id="@+id/btn_cancel_snackbar"
93+
android:id="@+id/btn_dismiss_snackbar"
9494
style="@style/WideBtnStyle"
9595
android:layout_width="match_parent"
9696
android:layout_height="wrap_content"
97-
android:text="@string/snackbar_cancel"/>
97+
android:text="@string/snackbar_dismiss"/>
9898

9999
</LinearLayout>
100100
</ScrollView>

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
<string name="snackbar_show_success">Show Success</string>
127127
<string name="snackbar_show_warning">Show Warning</string>
128128
<string name="snackbar_show_error">Show Error</string>
129-
<string name="snackbar_cancel">Cancel Snackbar</string>
129+
<string name="snackbar_dismiss">Dismiss Snackbar</string>
130130
<string name="snackbar_short">Short Snackbar</string>
131131
<string name="snackbar_long">Long Snackbar</string>
132132
<string name="snackbar_indefinite">Indefinite Snackbar</string>

utilcode/src/main/java/com/blankj/utilcode/util/SnackbarUtils.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -256,15 +256,14 @@ public static View getView() {
256256
* <p>在{@link #show()}之后调用</p>
257257
*
258258
* @param layoutId 布局文件
259-
* @param index 位置(the position at which to add the child or -1 to add last)
260259
* @param params 布局参数
261260
*/
262-
public static void addView(@LayoutRes int layoutId, int index, ViewGroup.LayoutParams params) {
261+
public static void addView(@LayoutRes int layoutId, ViewGroup.LayoutParams params) {
263262
final View view = getView();
264263
if (view != null) {
265264
Snackbar.SnackbarLayout layout = (Snackbar.SnackbarLayout) view;
266265
View child = LayoutInflater.from(view.getContext()).inflate(layoutId, null);
267-
layout.addView(child, index, params);
266+
layout.addView(child, -1, params);
268267
}
269268
}
270269

@@ -273,14 +272,13 @@ public static void addView(@LayoutRes int layoutId, int index, ViewGroup.LayoutP
273272
* <p>在{@link #show()}之后调用</p>
274273
*
275274
* @param child 要添加的view
276-
* @param index 位置(the position at which to add the child or -1 to add last)
277275
* @param params 布局参数
278276
*/
279-
public static void addView(View child, int index, ViewGroup.LayoutParams params) {
277+
public static void addView(View child, ViewGroup.LayoutParams params) {
280278
final View view = getView();
281279
if (view != null) {
282280
Snackbar.SnackbarLayout layout = (Snackbar.SnackbarLayout) view;
283-
layout.addView(child, index, params);
281+
layout.addView(child, params);
284282
}
285283
}
286284
}

0 commit comments

Comments
 (0)