Skip to content

Commit dfe5f9f

Browse files
committed
UI 微调。
1 parent ce441b1 commit dfe5f9f

4 files changed

Lines changed: 23 additions & 3 deletions

File tree

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "top.wefor.randompicker"
99
minSdkVersion 9
1010
targetSdkVersion 24
11-
versionCode 1
12-
versionName "1.0"
11+
versionCode 2
12+
versionName "1.1"
1313
}
1414
buildTypes {
1515
release {

app/src/main/java/top/wefor/randompicker/MainActivity.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
package top.wefor.randompicker;
22

33
import android.os.Bundle;
4+
import android.support.design.widget.Snackbar;
45
import android.support.v7.app.AlertDialog;
56
import android.support.v7.app.AppCompatActivity;
67
import android.view.Menu;
78
import android.view.MenuItem;
89
import android.view.View;
10+
import android.widget.CheckBox;
11+
import android.widget.CompoundButton;
912

1013
import java.util.ArrayList;
1114

@@ -65,6 +68,22 @@ public void onClick(View view) {
6568
}
6669
});
6770

71+
CheckBox checkBox = (CheckBox) findViewById(R.id.cutMode_checkBox);
72+
checkBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
73+
@Override
74+
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
75+
Snackbar snackbar = Snackbar.make(buttonView, (isChecked ? "Enter in" : "Exit from") + " Cut mode", 2_000);
76+
View view = snackbar.getView();
77+
view.setBackgroundResource(R.color.colorPrimary);
78+
snackbar.show();
79+
80+
if (isChecked)
81+
mRandomPicker.enterCutMode();
82+
else
83+
mRandomPicker.exitCutMode();
84+
}
85+
});
86+
6887
}
6988

7089
@Override

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
>
2424

2525
<android.support.v7.widget.AppCompatCheckBox
26+
android:id="@+id/cutMode_checkBox"
2627
android:layout_gravity="center"
2728
android:checked="false"
2829
android:button="@drawable/selector_cut_checkbox"

lib/src/main/java/top/wefor/randompicker/RandomPicker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ private int randomPick() {
130130
allWeight += mCurrentWeightList.get(i);
131131
}
132132

133-
if (allWeight < 0) {
133+
if (allWeight <= 0) {
134134
//TODO avoid this situation.
135135
allWeight = Integer.MAX_VALUE;
136136
//Log.e(TAG, "...");

0 commit comments

Comments
 (0)