Add quick selection for commonly used habit frequencies

Closes #25
This commit is contained in:
2016-03-19 09:46:42 -04:00
parent d39e1978a2
commit c3ff1fbe03
11 changed files with 255 additions and 66 deletions

View File

@@ -19,6 +19,8 @@
<color name="primary">#37474f</color>
<color name="primary_darker">#263238</color>
<color name="windowBackground">#e6e6e6</color>
<color name="dialogTextColor">@color/grey_800</color>
<color name="dialogFadedTextColor">@color/grey_600</color>
<color name="white">#ffffff</color>
@@ -312,14 +314,14 @@
<!--<color name="orange_A400">#FF9100</color>-->
<!--<color name="orange_A700">#FF6D00</color>-->
<!--<color name="grey_50">#FAFAFA</color>-->
<color name="grey_50">#FAFAFA</color>
<color name="grey_100">#F5F5F5</color>
<!--<color name="grey_200">#EEEEEE</color>-->
<!--<color name="grey_300">#E0E0E0</color>-->
<color name="grey_200">#EEEEEE</color>
<color name="grey_300">#E0E0E0</color>
<color name="grey_400">#BDBDBD</color>
<color name="grey_500">#9E9E9E</color>
<!--<color name="grey_600">#757575</color>-->
<!--<color name="grey_700">#616161</color>-->
<!--<color name="grey_800">#424242</color>-->
<!--<color name="grey_900">#212121</color>-->
<color name="grey_600">#757575</color>
<color name="grey_700">#616161</color>
<color name="grey_800">#424242</color>
<color name="grey_900">#212121</color>
</resources>

View File

@@ -42,5 +42,13 @@
<item>480</item>
</string-array>
<string-array name="frequencyQuickSelect" translatable="false">
<item>@string/every_day</item>
<item>@string/every_week</item>
<item>@string/two_times_per_week</item>
<item>@string/five_times_per_week</item>
<item>@string/custom_frequency</item>
</string-array>
<string name="snooze_interval_default" translatable="false">15</string>
</resources>

View File

@@ -131,4 +131,10 @@
<string name="last_x_months">Last %d months</string>
<string name="last_x_years">Last %d years</string>
<string name="all_time">All time</string>
<string name="every_day">Every day</string>
<string name="every_week">Every week</string>
<string name="two_times_per_week">2 times per week</string>
<string name="five_times_per_week">2 times per week</string>
<string name="custom_frequency">Custom …</string>
</resources>

View File

@@ -19,7 +19,10 @@
<resources>
<style name="AppBaseTheme" parent="android:Theme.Holo.Light" />
<style name="AppBaseTheme" parent="android:Theme.Holo.Light">
<item name="android:spinnerItemStyle">@style/dialogFormText</item>
<item name="android:spinnerDropDownItemStyle">@style/dialogFormSpinnerDropDown</item>
</style>
<style name="time_label">
<item name="android:textSize">@dimen/time_label_size</item>
@@ -33,7 +36,7 @@
<item name="android:textStyle">bold</item>
</style>
<style name="day_of_week_label_condensed" />
<style name="day_of_week_label_condensed"/>
<style name="cardsListStyle">
<item name="android:layout_width">match_parent</item>

View File

@@ -20,7 +20,7 @@
<resources>
<style name="dialogFormInputMultiline">
<style name="dialogFormInputMultiline" parent="dialogFormInput">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:ems">10</item>
@@ -34,7 +34,7 @@
<item name="android:background">?android:attr/selectableItemBackground</item>
</style>
<style name="dialogFormInputSmallNumber">
<style name="dialogFormInputSmallNumber" parent="dialogFormInput">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:ems">2</item>
@@ -43,40 +43,57 @@
<item name="android:maxLength">2</item>
</style>
<style name="dialogFormInput">
<style name="dialogFormText">
<item name="android:textSize">16sp</item>
<item name="android:textColor">@color/dialogTextColor</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
</style>
<style name="dialogFormSpinnerDropDown" parent="dialogFormText">
<item name="android:padding">12dp</item>
<item name="android:textColor">@color/dialogTextColor</item>
</style>
<style name="dialogFormInput" parent="dialogFormText">
<item name="android:layout_width">0dp</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_weight">10</item>
<item name="android:ems">10</item>
<item name="android:inputType">textCapSentences</item>
</style>
<style name="dialogFormLabel">
<style name="dialogFormLabel" parent="dialogFormText">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:width">80dp</item>
<item name="android:gravity">right</item>
<item name="android:paddingRight">9dp</item>
<item name="android:width">100dp</item>
<item name="android:gravity">left</item>
<item name="android:paddingLeft">6dp</item>
<item name="android:textColor">@color/dialogFadedTextColor</item>
</style>
<style name="dialogFormTimePicker" parent="android:Widget.DeviceDefault.Light.Spinner">
<item name="android:layout_width">wrap_content</item>
<style name="dialogFormSpinner" parent="android:Widget.DeviceDefault.Light.Spinner">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:paddingLeft">12dp</item>
<item name="android:textSize">16sp</item>
<item name="android:minWidth">400dp</item>
<item name="android:textColor">@color/dialogTextColor</item>
</style>
<style name="dialogFormRow">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginTop">8dp</item>
<item name="android:layout_marginTop">12dp</item>
<item name="android:orientation">horizontal</item>
<item name="android:minWidth">300dp</item>
<item name="android:gravity">start|center_vertical</item>
</style>
<style name="dialogForm">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
<item name="android:orientation">vertical</item>
<item name="android:paddingBottom">8dp</item>
</style>
<style name="dialogFormPanel">