hollorol/Clockplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed minute tuner positions in grid, renamed NumberGrid to NumbersGridView

Browse Source
This commit is contained in:
Phillip Hsu 2016-07-23 01:43:11 -07:00
parent 63cffaf0a2
commit 454851e2bf
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/philliphsu/clock2/editalarm/NumberGrid.java → app/src/main/java/com/philliphsu/clock2/editalarm/NumbersGridView.java
View File

@ -13,7 +13,7 @@ import com.philliphsu.clock2.R;
* Created by Phillip Hsu on 7/21/2016.
*/
@Deprecated
public class NumberGrid extends GridLayout {
public class NumbersGridView extends GridLayout {
private static final String TAG = "NumberGrid";
private static final int COLUMNS = 3;
@ -32,12 +32,12 @@ public class NumberGrid extends GridLayout {
void onNumberSelected(int number);
}
public NumberGrid(Context context, AttributeSet attrs) {
public NumbersGridView(Context context, AttributeSet attrs) {
super(context, attrs);
init();
}
public NumberGrid(Context context) {
public NumbersGridView(Context context) {
super(context);
init();
}
@ -111,7 +111,7 @@ public class NumberGrid extends GridLayout {
@Override
public void onClick(View v) {
setNumbers(new int[] {0,5,10,15,20,25,30,35,40,45,50,55}, true);
inflate(getContext(), R.layout.content_number_grid_minute_tuners, NumberGrid.this);
inflate(getContext(), R.layout.content_number_grid_minute_tuners, NumbersGridView.this);
}
});
i++;

6
app/src/main/res/layout/content_number_grid_minute_tuners.xml
View File

@ -7,11 +7,13 @@
android:layout_height="wrap_content"
style="@style/GridLayoutNumpadElement"
android:src="@drawable/ic_minus_circle_24dp"
app:layout_gravity="center"/>
app:layout_gravity="center"
app:layout_column="1"/>
<ImageButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/GridLayoutNumpadElement"
android:src="@drawable/ic_add_circle_24dp"
app:layout_gravity="center"/>
app:layout_gravity="center"
app:layout_column="2"/>
</merge>