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

Merge branch 'feature/dark-theme' into dev

Browse Source
This commit is contained in:
Alinson S. Xavier
2016-04-15 18:29:39 -04:00
parent f5f3ec9f88 90e513e778
commit b601a643dd
101 changed files with 1299 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
app/src/main/res/layout/about.xml
View File

@@ -21,14 +21,14 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@color/windowBackground"
android:background="?windowBackgroundColor"
android:fillViewport="true">
<LinearLayout
style="@style/cardsListStyle">
style="@style/CardList">
<LinearLayout
style="@style/cardStyle"
style="@style/Card"
android:gravity="center">
<ImageView
@@ -44,7 +44,7 @@
android:textStyle="bold"
android:textSize="16sp"
android:layout_margin="6dp"
android:textColor="@color/blue_700"
android:textColor="?aboutScreenColor"
android:text="@string/app_name"/>
<TextView
@@ -57,124 +57,124 @@
</LinearLayout>
<LinearLayout
style="@style/cardStyle"
style="@style/Card"
android:gravity="center">
<TextView
style="@style/cardHeaderStyle"
style="@style/CardHeader"
android:text="@string/links"
android:textColor="@color/blue_700"/>
android:textColor="?aboutScreenColor"/>
<TextView
android:id="@+id/tvRate"
style="@style/aboutClickableItemStyle"
style="@style/About.Item.Clickable"
android:text="@string/pref_rate_this_app"/>
<TextView
android:id="@+id/tvFeedback"
style="@style/aboutClickableItemStyle"
style="@style/About.Item.Clickable"
android:text="@string/pref_send_feedback"/>
<TextView
android:id="@+id/tvSource"
style="@style/aboutClickableItemStyle"
style="@style/About.Item.Clickable"
android:text="@string/pref_view_source_code"/>
</LinearLayout>
<LinearLayout
style="@style/cardStyle"
style="@style/Card"
android:gravity="center">
<TextView
style="@style/cardHeaderStyle"
style="@style/CardHeader"
android:text="@string/developers"
android:textColor="@color/blue_700"/>
android:textColor="?aboutScreenColor"/>
<TextView
style="@style/aboutItemStyle"
style="@style/About.Item"
android:text="Álinson Xavier"/>
</LinearLayout>
<LinearLayout
style="@style/cardStyle"
style="@style/Card"
android:gravity="center">
<TextView
style="@style/cardHeaderStyle"
style="@style/CardHeader"
android:text="@string/translators"
android:textColor="@color/blue_700"/>
android:textColor="?aboutScreenColor"/>
<TextView
style="@style/aboutItemStyle"
style="@style/About.Item"
android:text="Limin Lu (中文)"/>
<TextView
style="@style/aboutItemStyle"
style="@style/About.Item"
android:text="François Mahé (Français)"/>
<TextView
style="@style/aboutItemStyle"
style="@style/About.Item"
android:text="Naofumi F (日本語)"/>
<TextView
style="@style/aboutItemStyle"
style="@style/About.Item"
android:text="Matthias Meisser (Deutsch)"/>
<TextView
style="@style/aboutItemStyle"
style="@style/About.Item"
android:text="Al Alloush (العَرَبِية‎)"/>
<TextView
style="@style/aboutItemStyle"
style="@style/About.Item"
android:text="Thibaut Girka (Français)"/>
<TextView
style="@style/aboutItemStyle"
style="@style/About.Item"
android:text="Can Altas (Deutsch)"/>
<TextView
style="@style/aboutItemStyle"
style="@style/About.Item"
android:text="Marco Cavazza (Italiano)"/>
<TextView
style="@style/aboutItemStyle"
style="@style/About.Item"
android:text="Adam Jurkiewicz (Polski)"/>
<TextView
style="@style/aboutItemStyle"
style="@style/About.Item"
android:text="Dmitriy Bogdanov (Русский)"/>
<TextView
style="@style/aboutItemStyle"
style="@style/About.Item"
android:text="Dalecarlian (Svenska)"/>
<TextView
style="@style/aboutItemStyle"
style="@style/About.Item"
android:text="Robin (Svenska)"/>
<TextView
style="@style/aboutItemStyle"
style="@style/About.Item"
android:text="Josh (한국어 )"/>
<TextView
style="@style/aboutItemStyle"
style="@style/About.Item"
android:text="Ander Raso Vazquez (Español)"/>
<TextView
style="@style/aboutItemStyle"
style="@style/About.Item"
android:text="XuToTo (中文)"/>
<TextView
style="@style/aboutItemStyle"
style="@style/About.Item"
android:text="Tomáš Borovec (Čeština)"/>
<TextView
style="@style/aboutItemStyle"
style="@style/About.Item"
android:text="Mathis Chenuet (Français)"/>
<TextView
style="@style/aboutItemStyle"
style="@style/About.Item"
android:text="Álinson Xavier (Português)"/>
</LinearLayout>
</LinearLayout>

8
app/src/main/res/layout/edit_habit.xml
View File

@@ -45,7 +45,7 @@
android:id="@+id/buttonPickColor"
style="@style/dialogFormInputColor"
android:contentDescription="@string/color_picker_default_title"
android:src="@drawable/ic_action_color_light"/>
android:src="?dialogIconChangeColor"/>
</LinearLayout>
<EditText
@@ -63,7 +63,7 @@
<Spinner
android:id="@+id/sFrequency"
style="@style/dialogFormSpinner"
style="?dialogFormSpinnerTheme"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:entries="@array/frequencyQuickSelect"
@@ -111,7 +111,7 @@
<TextView
android:id="@+id/inputReminderTime"
style="@style/dialogFormSpinner"/>
style="?dialogFormSpinnerTheme"/>
</LinearLayout>
<LinearLayout
@@ -125,7 +125,7 @@
<TextView
android:id="@+id/inputReminderDays"
style="@style/dialogFormSpinner"/>
style="?dialogFormSpinnerTheme"/>
</LinearLayout>
</LinearLayout>

27
app/src/main/res/layout/list_habits_fragment.xml
View File

@@ -26,12 +26,17 @@
<com.mobeta.android.dslv.DragSortListView
android:id="@+id/listView"
style="@style/habitsListStyle"
dslv:drag_enabled="true"
dslv:drag_start_mode="onLongPress"
dslv:sort_enabled="true"
dslv:track_drag_sort="false"
/>
android:layout_width="match_parent"
android:background="?windowBackgroundColor"
android:paddingTop="@dimen/checkmarkHeight"
android:layout_height="match_parent"
android:divider="?windowBackgroundColor"
android:listSelector="@android:color/transparent"
android:dividerHeight="1dp"/>
<LinearLayout
android:id="@+id/llEmpty"
@@ -42,30 +47,32 @@
<TextView
android:id="@+id/tvStarEmpty"
style="@style/habitsListEmptyStyle"
style="@style/ListHabits.EmptyState"
android:text="@string/fa_star_half_o"
android:textSize="80sp"/>
<TextView
style="@style/habitsListEmptyStyle"
style="@style/ListHabits.EmptyState"
android:text="@string/no_habits_found"/>
</LinearLayout>
<LinearLayout style="@style/habitsListHeaderStyle">
<LinearLayout
android:id="@+id/header"
style="@style/ListHabits.Header">
<TextView
android:id="@+id/tvStarHeader"
style="@style/habitsListStarStyle"/>
style="@style/ListHabits.Star"/>
<TextView
android:id="@+id/tvNameHeader"
style="@style/habitsListNameStyle"
style="@style/ListHabits.Label"
android:text=""/>
<LinearLayout
android:id="@+id/llButtonsHeader"
style="@style/habitsListButtonsPanelStyle"/>
style="@style/ListHabits.CheckmarkPanel"/>
</LinearLayout>
<ProgressBar
@@ -73,7 +80,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="?android:attr/progressBarStyleHorizontal"
android:layout_marginTop="37dp"
android:layout_below="@id/header"
/>
<LinearLayout
@@ -85,7 +92,7 @@
android:orientation="vertical"
android:animateLayoutChanges="true"
android:visibility="invisible"
style="@style/cardStyle">
style="@style/Card">
<TextView
android:layout_width="wrap_content"

12
app/src/main/res/layout/list_habits_header_check.xml
View File

@@ -18,6 +18,14 @@
~ with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<Button xmlns:android="http://schemas.android.com/apk/res/android"
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/tvCheck"
style="@style/habitsListHeaderCheckStyle" />
style="@style/ListHabits.Checkmark"
android:layout_width="20dp"
android:layout_height="20dp"
android:background="@color/transparent"
android:textColor="?mediumContrastTextColor"
android:textAllCaps="true"
android:textStyle="bold"
android:textSize="10sp"/>

10
app/src/main/res/layout/list_habits_item.xml
View File

@@ -20,23 +20,23 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/llOuter"
style="@style/habitsListItemStyle">
style="@style/ListHabits.Item">
<LinearLayout
android:id="@+id/llInner"
style="@style/habitsListItemInnerPanelStyle">
style="@style/ListHabits.HabitCard">
<TextView
android:id="@+id/tvStar"
style="@style/habitsListStarStyle" />
style="@style/ListHabits.Star" />
<TextView
android:id="@+id/label"
style="@style/habitsListNameStyle" />
style="@style/ListHabits.Label" />
<LinearLayout
android:id="@+id/llButtons"
style="@style/habitsListButtonsPanelStyle" />
style="@style/ListHabits.CheckmarkPanel" />
</LinearLayout>
</LinearLayout>

2
app/src/main/res/layout/list_habits_item_check.xml
View File

@@ -20,4 +20,4 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/tvCheck"
style="@style/habitsListCheckStyle" />
style="@style/ListHabits.Checkmark" />

26
app/src/main/res/layout/show_habit.xml
View File

@@ -22,20 +22,20 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@color/windowBackground"
android:background="?windowBackgroundColor"
android:fillViewport="true">
<LinearLayout
style="@style/cardsListStyle"
style="@style/CardList"
tools:context="org.isoron.uhabits.ShowHabitActivity">
<LinearLayout
style="@style/cardStyle"
style="@style/Card"
android:gravity="start">
<TextView
android:id="@+id/tvOverview"
style="@style/cardHeaderStyle"
style="@style/CardHeader"
android:text="@string/overview"/>
<LinearLayout
@@ -47,7 +47,7 @@
<org.isoron.uhabits.views.RingView
android:id="@+id/scoreRing"
style="@style/smallDataViewStyle"
style="@style/SmallDataView"
android:layout_width="100dp"
app:label="@string/strength"
app:maxDiameter="80"
@@ -58,7 +58,7 @@
</LinearLayout>
<RelativeLayout
style="@style/cardStyle"
style="@style/Card"
android:gravity="center">
<Spinner
@@ -74,7 +74,7 @@
<TextView
android:id="@+id/tvStrength"
style="@style/cardHeaderStyle"
style="@style/CardHeader"
android:text="@string/habit_strength"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
@@ -89,14 +89,14 @@
</RelativeLayout>
<LinearLayout
style="@style/cardStyle"
style="@style/Card"
android:clipToPadding="false"
android:orientation="vertical"
android:paddingBottom="0dp">
<TextView
android:id="@+id/tvHistory"
style="@style/cardHeaderStyle"
style="@style/CardHeader"
android:text="@string/history"/>
<org.isoron.uhabits.views.HabitHistoryView
@@ -118,12 +118,12 @@
</LinearLayout>
<LinearLayout
style="@style/cardStyle"
style="@style/Card"
android:orientation="vertical">
<TextView
android:id="@+id/tvStreaks"
style="@style/cardHeaderStyle"
style="@style/CardHeader"
android:text="@string/best_streaks"/>
<org.isoron.uhabits.views.HabitStreakView
@@ -133,12 +133,12 @@
</LinearLayout>
<LinearLayout
style="@style/cardStyle"
style="@style/Card"
android:orientation="vertical">
<TextView
android:id="@+id/tvWeekdayFreq"
style="@style/cardHeaderStyle"
style="@style/CardHeader"
android:text="@string/frequency"/>
<org.isoron.uhabits.views.HabitFrequencyView