nixo
/
GadgetBridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove the checkboxes in the alarms cardview and simplify layout of details activity 

- rename the layout file of the alarm item to better organize the files
- add a color selector for the item view, this replicates the old behavior of using the color to highlight enabled days
- remove the nested linearlayouts in the alarm details activity layout and use CheckedTextView instead
This commit is contained in:
Daniele Gobbetti 2017-04-09 16:01:48 +02:00
parent 1a88858c6f
commit fe626eb11e
5 changed files with 145 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java
View File

@ -21,8 +21,7 @@ import android.os.Bundle;
import android.text.format.DateFormat; import android.text.format.DateFormat;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.CheckBox; import android.widget.CheckedTextView;
import android.widget.TextView;
import android.widget.TimePicker; import android.widget.TimePicker;
import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.GBApplication;
@ -36,16 +35,15 @@ public class AlarmDetails extends GBActivity {
private GBAlarm alarm; private GBAlarm alarm;
private TimePicker timePicker; private TimePicker timePicker;
private CheckBox cbSmartWakeup; private CheckedTextView cbSmartWakeup;
private CheckBox cbMonday; private CheckedTextView cbMonday;
private CheckBox cbTuesday; private CheckedTextView cbTuesday;
private CheckBox cbWednesday; private CheckedTextView cbWednesday;
private CheckBox cbThursday; private CheckedTextView cbThursday;
private CheckBox cbFriday; private CheckedTextView cbFriday;
private CheckBox cbSaturday; private CheckedTextView cbSaturday;
private CheckBox cbSunday; private CheckedTextView cbSunday;
private GBDevice device; private GBDevice device;
private TextView smartAlarmLabel;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -56,15 +54,56 @@ public class AlarmDetails extends GBActivity {
device = getIntent().getParcelableExtra(GBDevice.EXTRA_DEVICE); device = getIntent().getParcelableExtra(GBDevice.EXTRA_DEVICE);
timePicker = (TimePicker) findViewById(R.id.alarm_time_picker); timePicker = (TimePicker) findViewById(R.id.alarm_time_picker);
smartAlarmLabel = (TextView) findViewById(R.id.alarm_label_smart_wakeup); cbSmartWakeup = (CheckedTextView) findViewById(R.id.alarm_cb_smart_wakeup);
cbSmartWakeup = (CheckBox) findViewById(R.id.alarm_cb_smart_wakeup); cbMonday = (CheckedTextView) findViewById(R.id.alarm_cb_monday);
cbMonday = (CheckBox) findViewById(R.id.alarm_cb_mon); cbTuesday = (CheckedTextView) findViewById(R.id.alarm_cb_tuesday);
cbTuesday = (CheckBox) findViewById(R.id.alarm_cb_tue); cbWednesday = (CheckedTextView) findViewById(R.id.alarm_cb_wednesday);
cbWednesday = (CheckBox) findViewById(R.id.alarm_cb_wed); cbThursday = (CheckedTextView) findViewById(R.id.alarm_cb_thursday);
cbThursday = (CheckBox) findViewById(R.id.alarm_cb_thu); cbFriday = (CheckedTextView) findViewById(R.id.alarm_cb_friday);
cbFriday = (CheckBox) findViewById(R.id.alarm_cb_fri); cbSaturday = (CheckedTextView) findViewById(R.id.alarm_cb_saturday);
cbSaturday = (CheckBox) findViewById(R.id.alarm_cb_sat); cbSunday = (CheckedTextView) findViewById(R.id.alarm_cb_sunday);
cbSunday = (CheckBox) findViewById(R.id.alarm_cb_sun);
cbSmartWakeup.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
((CheckedTextView) v).toggle();
}
});
cbMonday.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
((CheckedTextView) v).toggle();
}
});
cbTuesday.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
((CheckedTextView) v).toggle();
}
});
cbWednesday.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
((CheckedTextView) v).toggle();
}
});
cbThursday.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
((CheckedTextView) v).toggle();
}
});
cbFriday.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
((CheckedTextView) v).toggle();
}
});
cbSaturday.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
((CheckedTextView) v).toggle();
}
});
cbSunday.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
((CheckedTextView) v).toggle();
}
});
timePicker.setIs24HourView(DateFormat.is24HourFormat(GBApplication.getContext())); timePicker.setIs24HourView(DateFormat.is24HourFormat(GBApplication.getContext()));
timePicker.setCurrentHour(alarm.getHour()); timePicker.setCurrentHour(alarm.getHour());
@ -73,7 +112,6 @@ public class AlarmDetails extends GBActivity {
cbSmartWakeup.setChecked(alarm.isSmartWakeup()); cbSmartWakeup.setChecked(alarm.isSmartWakeup());
int smartAlarmVisibility = supportsSmartWakeup() ? View.VISIBLE : View.GONE; int smartAlarmVisibility = supportsSmartWakeup() ? View.VISIBLE : View.GONE;
cbSmartWakeup.setVisibility(smartAlarmVisibility); cbSmartWakeup.setVisibility(smartAlarmVisibility);
smartAlarmLabel.setVisibility(smartAlarmVisibility);
cbMonday.setChecked(alarm.getRepetition(GBAlarm.ALARM_MON)); cbMonday.setChecked(alarm.getRepetition(GBAlarm.ALARM_MON));
cbTuesday.setChecked(alarm.getRepetition(GBAlarm.ALARM_TUE)); cbTuesday.setChecked(alarm.getRepetition(GBAlarm.ALARM_TUE));

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java
View File

@ -93,7 +93,7 @@ public class GBAlarmListAdapter extends RecyclerView.Adapter<GBAlarmListAdapter.
@Override @Override
public GBAlarmListAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { public GBAlarmListAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.alarm_item, parent, false); View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_alarm, parent, false);
ViewHolder vh = new ViewHolder(view); ViewHolder vh = new ViewHolder(view);
return vh; return vh;
} }

5
app/src/main/res/color/alarm_dow.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorAccent" android:state_checked="true" />
<item android:color="?attr/textColorPrimary" />
</selector>

236
app/src/main/res/layout/activity_alarm_details.xml
View File

@ -9,32 +9,21 @@
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
tools:context="nodomain.freeyourgadget.gadgetbridge.activities.AlarmDetails"> tools:context="nodomain.freeyourgadget.gadgetbridge.activities.AlarmDetails">
<android.support.v7.widget.AppCompatCheckedTextView
<LinearLayout android:id="@+id/alarm_cb_smart_wakeup"
android:layout_width="fill_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="10dp" android:layout_marginStart="4dp"
android:orientation="horizontal"> android:drawableStart="?android:attr/listChoiceIndicatorMultiple"
android:gravity="center"
<CheckBox android:text="@string/alarm_smart_wakeup"
android:id="@+id/alarm_cb_smart_wakeup" android:textAppearance="?android:attr/textAppearanceSmall" />
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/alarm_label_smart_wakeup"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:labelFor="@id/alarm_cb_smart_wakeup"
android:text="@string/alarm_smart_wakeup" />
</LinearLayout>
<TimePicker <TimePicker
android:id="@+id/alarm_time_picker" android:id="@+id/alarm_time_picker"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp" />
android:timePickerMode="clock" />
<LinearLayout <LinearLayout
android:id="@+id/dowSelector" android:id="@+id/dowSelector"
@ -43,174 +32,83 @@
android:baselineAligned="false" android:baselineAligned="false"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <android.support.v7.widget.AppCompatCheckedTextView
android:id="@+id/alarm_cb_monday"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:orientation="vertical"> android:layout_marginStart="4dp"
<CheckBox
android:id="@+id/alarm_cb_mon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal|bottom" />
<TextView
android:id="@+id/alarm_label_cb_mon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal|top"
android:labelFor="@id/alarm_cb_mon"
android:text="@string/alarm_mon_short" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:drawableTop="?android:attr/listChoiceIndicatorMultiple"
android:gravity="center"
android:text="@string/alarm_mon_short"
android:textAppearance="?android:attr/textAppearanceSmall" />
<CheckBox <android.support.v7.widget.AppCompatCheckedTextView
android:id="@+id/alarm_cb_tue" android:id="@+id/alarm_cb_tuesday"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal|bottom" />
<TextView
android:id="@+id/alarm_label_cb_tue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal|top"
android:labelFor="@id/alarm_cb_tue"
android:text="@string/alarm_tue_short" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:drawableTop="?android:attr/listChoiceIndicatorMultiple"
android:gravity="center"
android:text="@string/alarm_tue_short"
android:textAppearance="?android:attr/textAppearanceSmall" />
<CheckBox <android.support.v7.widget.AppCompatCheckedTextView
android:id="@+id/alarm_cb_wed" android:id="@+id/alarm_cb_wednesday"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal|bottom" />
<TextView
android:id="@+id/alarm_label_cb_wed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal|top"
android:labelFor="@id/alarm_cb_wed"
android:text="@string/alarm_wed_short" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:drawableTop="?android:attr/listChoiceIndicatorMultiple"
android:gravity="center"
android:text="@string/alarm_wed_short"
android:textAppearance="?android:attr/textAppearanceSmall" />
<CheckBox <android.support.v7.widget.AppCompatCheckedTextView
android:id="@+id/alarm_cb_thu" android:id="@+id/alarm_cb_thursday"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal|bottom" />
<TextView
android:id="@+id/alarm_label_cb_thu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal|top"
android:labelFor="@id/alarm_cb_thu"
android:text="@string/alarm_thu_short" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:drawableTop="?android:attr/listChoiceIndicatorMultiple"
android:gravity="center"
android:text="@string/alarm_thu_short"
android:textAppearance="?android:attr/textAppearanceSmall" />
<CheckBox <android.support.v7.widget.AppCompatCheckedTextView
android:id="@+id/alarm_cb_fri" android:id="@+id/alarm_cb_friday"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal|bottom" />
<TextView
android:id="@+id/alarm_label_cb_fri"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal|top"
android:labelFor="@id/alarm_cb_fri"
android:text="@string/alarm_fri_short" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:drawableTop="?android:attr/listChoiceIndicatorMultiple"
android:gravity="center"
android:text="@string/alarm_fri_short"
android:textAppearance="?android:attr/textAppearanceSmall" />
<CheckBox <android.support.v7.widget.AppCompatCheckedTextView
android:id="@+id/alarm_cb_sat" android:id="@+id/alarm_cb_saturday"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal|bottom" />
<TextView
android:id="@+id/alarm_label_cb_sat"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal|top"
android:labelFor="@id/alarm_cb_sat"
android:text="@string/alarm_sat_short" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:drawableTop="?android:attr/listChoiceIndicatorMultiple"
android:gravity="center"
<CheckBox android:text="@string/alarm_sat_short"
android:id="@+id/alarm_cb_sun" android:textAppearance="?android:attr/textAppearanceSmall" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" />
<TextView
android:id="@+id/alarm_label_cb_sun"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal|top"
android:labelFor="@id/alarm_cb_sun"
android:text="@string/alarm_sun_short" />
</LinearLayout>
<android.support.v7.widget.AppCompatCheckedTextView
android:id="@+id/alarm_cb_sunday"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_weight="1"
android:drawableTop="?android:attr/listChoiceIndicatorMultiple"
android:gravity="center"
android:text="@string/alarm_sun_short"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

29
app/src/main/res/layout/alarm_item.xml → app/src/main/res/layout/item_alarm.xml
View File

@ -25,7 +25,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_margin="8dp" android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginEnd="0dp"
android:text="00:00" android:text="00:00"
android:textAppearance="?android:attr/textAppearanceLarge" /> android:textAppearance="?android:attr/textAppearanceLarge" />
@ -43,7 +46,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentTop="true" /> android:layout_alignParentTop="true"
android:layout_margin="8dp" />
<LinearLayout <LinearLayout
android:id="@+id/dowSelector" android:id="@+id/dowSelector"
@ -59,8 +63,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_weight="1" android:layout_weight="1"
android:checked="false" android:textColor="@color/alarm_dow"
android:drawableTop="?android:attr/listChoiceIndicatorMultiple"
android:gravity="center" android:gravity="center"
android:text="@string/alarm_mon_short" android:text="@string/alarm_mon_short"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
@ -71,8 +74,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_weight="1" android:layout_weight="1"
android:checked="false" android:textColor="@color/alarm_dow"
android:drawableTop="?android:attr/listChoiceIndicatorMultiple"
android:gravity="center" android:gravity="center"
android:text="@string/alarm_tue_short" android:text="@string/alarm_tue_short"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
@ -83,8 +85,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_weight="1" android:layout_weight="1"
android:checked="false" android:textColor="@color/alarm_dow"
android:drawableTop="?android:attr/listChoiceIndicatorMultiple"
android:gravity="center" android:gravity="center"
android:text="@string/alarm_wed_short" android:text="@string/alarm_wed_short"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
@ -95,8 +96,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_weight="1" android:layout_weight="1"
android:checked="false" android:textColor="@color/alarm_dow"
android:drawableTop="?android:attr/listChoiceIndicatorMultiple"
android:gravity="center" android:gravity="center"
android:text="@string/alarm_thu_short" android:text="@string/alarm_thu_short"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
@ -107,8 +107,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_weight="1" android:layout_weight="1"
android:checked="false" android:textColor="@color/alarm_dow"
android:drawableTop="?android:attr/listChoiceIndicatorMultiple"
android:gravity="center" android:gravity="center"
android:text="@string/alarm_fri_short" android:text="@string/alarm_fri_short"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
@ -119,8 +118,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_weight="1" android:layout_weight="1"
android:checked="false" android:textColor="@color/alarm_dow"
android:drawableTop="?android:attr/listChoiceIndicatorMultiple"
android:gravity="center" android:gravity="center"
android:text="@string/alarm_sat_short" android:text="@string/alarm_sat_short"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
@ -131,8 +129,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_weight="1" android:layout_weight="1"
android:checked="false" android:textColor="@color/alarm_dow"
android:drawableTop="?android:attr/listChoiceIndicatorMultiple"
android:gravity="center" android:gravity="center"
android:text="@string/alarm_sun_short" android:text="@string/alarm_sun_short"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />