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

Merge branch 'feature/kotlin' into dev

Browse Source
This commit is contained in:
Alinson S. Xavier
2017-07-21 18:12:45 -04:00
parent 2db4c06fe8
commit 180c18f6bf
147 changed files with 3835 additions and 5594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
uhabits-android/src/main/res/drawable/toolbar_shadow.xml → uhabits-android/src/main/res/drawable/shadow.xml
View File

96
uhabits-android/src/main/res/layout/list_habits.xml
View File

@@ -1,96 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
~
~ This file is part of Loop Habit Tracker.
~
~ Loop Habit Tracker is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by the
~ Free Software Foundation, either version 3 of the License, or (at your
~ option) any later version.
~
~ Loop Habit Tracker is distributed in the hope that it will be useful, but
~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along
~ with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?windowBackgroundColor">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
app:popupTheme="?toolbarPopupTheme"
android:layout_alignParentTop="true"/>
<org.isoron.uhabits.activities.habits.list.views.HeaderView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/toolbar"
android:id="@+id/header"
style="@style/ListHabits.Header"/>
<org.isoron.uhabits.activities.habits.list.views.HabitCardListView
android:id="@+id/listView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?windowBackgroundColor"
android:divider="?windowBackgroundColor"
android:dividerHeight="1dp"
android:listSelector="@android:color/transparent"
android:layout_below="@id/header"/>
<LinearLayout
android:id="@+id/llEmpty"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone">
<TextView
android:id="@+id/tvStarEmpty"
style="@style/ListHabits.EmptyState"
android:text="@string/fa_star_half_o"
android:textSize="80sp"/>
<TextView
style="@style/ListHabits.EmptyState"
android:text="@string/no_habits_found"/>
</LinearLayout>
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/header"
android:layout_marginTop="@dimen/progressbarOffset"
android:visibility="gone"
/>
<org.isoron.uhabits.activities.habits.list.views.HintView
android:id="@+id/hintView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"/>
<View
android:id="@+id/toolbarShadow"
android:layout_below="@id/toolbar"
style="@style/ToolbarShadow"/>
<View
android:id="@+id/headerShadow"
android:layout_below="@id/header"
style="@style/ToolbarShadow"/>
</RelativeLayout>

67
uhabits-android/src/main/res/layout/list_habits_button_preview.xml
View File

@@ -1,67 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
~
~ This file is part of Loop Habit Tracker.
~
~ Loop Habit Tracker is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by the
~ Free Software Foundation, either version 3 of the License, or (at your
~ option) any later version.
~
~ Loop Habit Tracker is distributed in the hope that it will be useful, but
~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along
~ with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://isoron.org/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?windowBackgroundColor">
<org.isoron.uhabits.activities.habits.list.views.CheckmarkButtonView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:color="0"
app:value="2"/>
<org.isoron.uhabits.activities.habits.list.views.CheckmarkButtonView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:color="0"
app:value="0"/>
<org.isoron.uhabits.activities.habits.list.views.CheckmarkButtonView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:color="0"
app:value="1"/>
<org.isoron.uhabits.activities.habits.list.views.NumberButtonView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:threshold="10"
app:color="1"
app:value="5"/>
<org.isoron.uhabits.activities.habits.list.views.NumberButtonView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:threshold="10"
app:color="1"
app:value="50"/>
<org.isoron.uhabits.activities.habits.list.views.NumberButtonView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:threshold="10"
app:color="1"
app:value="25304"/>
</LinearLayout>

107
uhabits-android/src/main/res/layout/list_habits_panel_preview.xml
View File

@@ -1,107 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
~
~ This file is part of Loop Habit Tracker.
~
~ Loop Habit Tracker is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by the
~ Free Software Foundation, either version 3 of the License, or (at your
~ option) any later version.
~
~ Loop Habit Tracker is distributed in the hope that it will be useful, but
~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along
~ with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://isoron.org/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?windowBackgroundColor"
android:orientation="vertical">
<org.isoron.uhabits.activities.habits.list.views.NumberPanelView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:button_count="8"
app:color="1"
app:threshold="10000"
app:unit="steps"
/>
<org.isoron.uhabits.activities.habits.list.views.NumberPanelView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:button_count="8"
app:color="2"
app:threshold="2000"
app:unit="cals"
/>
<org.isoron.uhabits.activities.habits.list.views.CheckmarkPanelView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:button_count="8"
app:color="2"
/>
<org.isoron.uhabits.activities.habits.list.views.CheckmarkPanelView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:button_count="8"
app:color="2"
/>
<org.isoron.uhabits.activities.habits.list.views.NumberPanelView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:button_count="8"
app:color="6"
app:threshold="2"
app:unit="min"
/>
<org.isoron.uhabits.activities.habits.list.views.CheckmarkPanelView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:button_count="8"
app:color="6"
/>
<org.isoron.uhabits.activities.habits.list.views.CheckmarkPanelView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:button_count="8"
app:color="4"
/>
<org.isoron.uhabits.activities.habits.list.views.NumberPanelView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:button_count="8"
app:color="10"
app:threshold="750"
app:unit="words"
/>
<org.isoron.uhabits.activities.habits.list.views.CheckmarkPanelView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:button_count="8"
app:color="10"
/>
<org.isoron.uhabits.activities.habits.list.views.NumberPanelView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:button_count="8"
app:color="8"
app:threshold="75"
app:unit="pages"
/>
</LinearLayout>

123
uhabits-android/src/main/res/layout/list_habits_preview.xml
View File

@@ -1,123 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
~
~ This file is part of Loop Habit Tracker.
~
~ Loop Habit Tracker is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by the
~ Free Software Foundation, either version 3 of the License, or (at your
~ option) any later version.
~
~ Loop Habit Tracker is distributed in the hope that it will be useful, but
~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along
~ with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?windowBackgroundColor">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
app:popupTheme="?toolbarPopupTheme"
android:layout_alignParentTop="true"/>
<org.isoron.uhabits.activities.habits.list.views.HeaderView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/toolbar"
android:id="@+id/header"
style="@style/ListHabits.Header"/>
<LinearLayout
android:id="@+id/listView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?windowBackgroundColor"
android:divider="?windowBackgroundColor"
android:dividerHeight="1dp"
android:listSelector="@android:color/transparent"
android:layout_below="@id/header"
android:orientation="vertical">
<org.isoron.uhabits.activities.habits.list.views.HabitCardView
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<org.isoron.uhabits.activities.habits.list.views.HabitCardView
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<org.isoron.uhabits.activities.habits.list.views.HabitCardView
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<org.isoron.uhabits.activities.habits.list.views.HabitCardView
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<org.isoron.uhabits.activities.habits.list.views.HabitCardView
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<!--<org.isoron.uhabits.ui.habits.list.views.HabitCardView-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content" />-->
<!--<org.isoron.uhabits.ui.habits.list.views.HabitCardView-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content" />-->
</LinearLayout>
<LinearLayout
android:id="@+id/llEmpty"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone">
<TextView
android:id="@+id/tvStarEmpty"
style="@style/ListHabits.EmptyState"
android:text="@string/fa_star_half_o"
android:textSize="80sp"/>
<TextView
style="@style/ListHabits.EmptyState"
android:text="@string/no_habits_found"/>
</LinearLayout>
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/header"
android:layout_marginTop="@dimen/progressbarOffset"
android:visibility="gone"
/>
<org.isoron.uhabits.activities.habits.list.views.HintView
android:id="@+id/hintView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"/>
<View
android:id="@+id/toolbarShadow"
android:layout_below="@id/toolbar"
style="@style/ToolbarShadow"/>
</RelativeLayout>

28
uhabits-android/src/main/res/layout/toolbar.xml Normal file
View File

@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
~
~ This file is part of Loop Habit Tracker.
~
~ Loop Habit Tracker is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by the
~ Free Software Foundation, either version 3 of the License, or (at your
~ option) any later version.
~
~ Loop Habit Tracker is distributed in the hope that it will be useful, but
~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along
~ with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="?actionBarSize"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="?toolbarPopupTheme"/>

2
uhabits-android/src/main/res/values/styles.xml
View File

@@ -237,7 +237,7 @@
<style name="ToolbarShadow">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">2dp</item>
<item name="android:background">@drawable/toolbar_shadow</item>
<item name="android:background">@drawable/shadow</item>
<item name="android:alpha">0.2</item>
</style>