isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-10 02:58:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Refactor ListHabitsFragment layouts and styles

Browse Source
This commit is contained in:
Alinson S. Xavier
2016-04-08 15:50:51 -04:00
parent 6f11596bb7
commit ac885e1503
13 changed files with 131 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/res/values/dimens.xml
View File

@@ -19,13 +19,15 @@
<resources>
<dimen name="baseSize">20dp</dimen>
<dimen name="check_square_size">42dp</dimen>
<dimen name="checkmarkWidth">42dp</dimen>
<dimen name="checkmarkHeight">48dp</dimen>
<dimen name="history_editor_max_height">450dp</dimen>
<dimen name="history_editor_padding">8dp</dimen>
<dimen name="history_max_font_size">@dimen/regularTextSize</dimen>
<dimen name="regularTextSize">16sp</dimen>
<dimen name="smallTextSize">14sp</dimen>
<dimen name="tinyTextSize">10sp</dimen>
<dimen name="tinyTextSize">12sp</dimen>
<dimen name="habitNameWidth">160dp</dimen>
<string-array name="snooze_interval_names">
<item>@string/interval_15_minutes</item>

22
app/src/main/res/values/styles.xml
View File

@@ -38,14 +38,14 @@
<style name="day_of_week_label_condensed"/>
<style name="cardsListStyle">
<style name="CardList">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:background">@color/windowBackground</item>
<item name="android:orientation">vertical</item>
</style>
<style name="cardBasicStyle">
<style name="CardCommon">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:orientation">vertical</item>
@@ -56,33 +56,35 @@
<item name="android:layout_marginBottom">3dp</item>
<item name="android:layout_marginLeft">3dp</item>
<item name="android:layout_marginRight">3dp</item>
<item name="android:background">@color/white</item>
</style>
<style name="cardStyle" parent="cardBasicStyle">
<item name="android:background">@drawable/card_background</item>
<style name="Card" parent="CardCommon">
<item name="android:layout_marginBottom">1dp</item>
</style>
<style name="cardHeaderStyle">
<style name="CardHeader">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginBottom">12dp</item>
<item name="android:textSize">@dimen/regularTextSize</item>
</style>
<style name="cardRowStyle">
<style name="CardRow">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginBottom">4dp</item>
<item name="android:layout_marginTop">4dp</item>
</style>
<style name="cardLabelStyle">
<style name="CardLabel">
<item name="android:layout_width">120dp</item>
<item name="android:layout_height">wrap_content</item>
</style>
<style name="aboutItemStyle">
<style name="About" />
<style name="About.Item">
<item name="android:textSize">16sp</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
@@ -90,12 +92,12 @@
<item name="android:paddingBottom">6dp</item>
</style>
<style name="aboutClickableItemStyle" parent="aboutItemStyle">
<style name="About.Item.Clickable">
<item name="android:paddingBottom">12dp</item>
<item name="android:paddingTop">12dp</item>
</style>
<style name="smallDataViewStyle">
<style name="SmallDataView">
<item name="android:layout_width">100dp</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginLeft">8dp</item>

61
app/src/main/res/values/styles_list_habits.xml
View File

@@ -20,88 +20,65 @@
<resources>
<style name="habitsListStyle">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
<item name="android:divider">@color/windowBackground</item>
<item name="android:dividerHeight">1dp</item>
<item name="android:paddingTop">42dp</item>
<item name="android:background">@color/windowBackground</item>
<style name="ListHabits">
<item name="android:background">@color/transparent</item>
</style>
<style name="habitsListHeaderBasicStyle">
<style name="ListHabits.Header">
<item name="android:background">@drawable/habits_list_header_background</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_alignParentTop">true</item>
<item name="android:paddingRight">4dp</item>
</style>
<style name="habitsListHeaderStyle" parent="habitsListHeaderBasicStyle">
<item name="android:background">@drawable/habits_list_header_background</item>
</style>
<style name="habitsListStarStyle">
<style name="ListHabits.Star">
<item name="android:paddingTop">2dp</item>
<item name="android:layout_width">30dp</item>
<item name="android:layout_height">match_parent</item>
<item name="android:layout_marginTop">0dp</item>
<item name="android:gravity">center</item>
<item name="android:paddingTop">1dp</item>
<item name="android:textSize">16sp</item>
</style>
<style name="habitsListNameStyle">
<style name="ListHabits.Label">
<item name="android:layout_width">0dp</item>
<item name="android:layout_weight">1</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:gravity">center_vertical</item>
<item name="android:paddingBottom">6dp</item>
<item name="android:paddingLeft">0dp</item>
<item name="android:paddingRight">6dp</item>
<item name="android:paddingTop">10dp</item>
</style>
<style name="habitsListButtonsPanelStyle">
<style name="ListHabits.CheckmarkPanel">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">42dp</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:gravity">center</item>
<item name="android:orientation">horizontal</item>
</style>
<style name="habitsListItemStyle">
<style name="ListHabits.Item">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:background">@color/windowBackground</item>
<item name="android:background">@color/transparent</item>
<item name="android:clipToPadding">false</item>
<item name="android:orientation">horizontal</item>
</style>
<style name="habitsListItemInnerPanelStyle" parent="cardStyle">
<style name="ListHabits.HabitCard" parent="Card">
<item name="android:orientation">horizontal</item>
<item name="android:padding">3dp</item>
<item name="android:padding">0dp</item>
<item name="android:gravity">center_vertical</item>
</style>
<style name="habitsListCheckBasicStyle">
<style name="ListHabits.CheckmarkCommon">
<item name="android:focusable">false</item>
<item name="android:minHeight">@dimen/check_square_size</item>
<item name="android:minWidth">@dimen/check_square_size</item>
<item name="android:minHeight">@dimen/checkmarkHeight</item>
<item name="android:width">@dimen/checkmarkWidth</item>
<item name="android:gravity">center</item>
</style>
<style name="habitsListCheckStyle" parent="habitsListCheckBasicStyle">
</style>
<style name="habitsListHeaderCheckStyle" parent="habitsListCheckStyle">
<item name="android:layout_width">42dp</item>
<item name="android:layout_height">match_parent</item>
<item name="android:background">@color/transparent</item>
<item name="android:focusable">false</item>
<item name="android:textSize">10sp</item>
<item name="android:textColor">#606060</item>
<style name="ListHabits.Checkmark" parent="ListHabits.CheckmarkCommon">
</style>
<style name="habitsListEmptyStyle">
<style name="ListHabits.EmptyState">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:gravity">center</item>