isoron
/
loop
mirror of https://github.com/iSoron/uhabits.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Show message when no habits are found

Browse Source
pull/30/head
Alinson S. Xavier 10 years ago
parent dd1322e759
commit 3d79f5d928
8 changed files with 97 additions and 56 deletions
Show Stats Download Patch File Download Diff File

29
app/app.iml
Unescape View File

@ -12,10 +12,12 @@
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" /> <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" /> <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" /> <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" /> <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" /> <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" /> <afterSyncTasks>
<task>generateDebugAndroidTestSources</task>
<task>generateDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" /> <option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" /> <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" /> <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@ -24,7 +26,7 @@
</configuration> </configuration>
</facet> </facet>
</component> </component>
<component name="NewModuleRootManager" inherit-compiler-output="false"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" /> <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" /> <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
<exclude-output /> <exclude-output />
@ -34,13 +36,13 @@
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@ -63,31 +65,28 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.0.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" /> <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" /> <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content> </content>
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" /> <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
<orderEntry type="library" exported="" name="ActiveAndroid" level="project" /> <orderEntry type="library" exported="" name="ActiveAndroid" level="project" />
<orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" /> <orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
</component> </component>
</module> </module>

20
app/src/main/java/org/isoron/uhabits/dialogs/ListHabitsFragment.java
Unescape View File

@ -95,6 +95,17 @@ public class ListHabitsFragment extends Fragment
listView.setOnTouchListener(controller); listView.setOnTouchListener(controller);
listView.setDragEnabled(true); listView.setDragEnabled(true);
if (Habit.getCount() == 0)
{
Log.d("x", "Removing listView");
Typeface fontawesome =
Typeface.createFromAsset(getActivity().getAssets(), "fontawesome-webfont.ttf");
((TextView) view.findViewById(R.id.tvStarEmpty)).setTypeface(fontawesome);
((ViewGroup) listView.getParent()).removeView(listView);
}
GregorianCalendar day = new GregorianCalendar(TimeZone.getTimeZone("GMT")); GregorianCalendar day = new GregorianCalendar(TimeZone.getTimeZone("GMT"));
day.setTimeInMillis(DateHelper.getStartOfDay(DateHelper.getLocalTime())); day.setTimeInMillis(DateHelper.getStartOfDay(DateHelper.getLocalTime()));
@ -245,9 +256,6 @@ public class ListHabitsFragment extends Fragment
class ListHabitsAdapter extends BaseAdapter class ListHabitsAdapter extends BaseAdapter
{ {
String habits[] = {"wake up early", "work out", "meditate", "take vitamins", "go to school",
"cook dinner & lunch"};
private Context context; private Context context;
private LayoutInflater inflater; private LayoutInflater inflater;
private Typeface fontawesome; private Typeface fontawesome;
@ -344,11 +352,13 @@ public class ListHabitsFragment extends Fragment
{ {
tvStar.setText(context.getString(R.string.fa_star_o)); tvStar.setText(context.getString(R.string.fa_star_o));
tvStar.setTextColor(inactiveColor); tvStar.setTextColor(inactiveColor);
} else if (score < Habit.FULL_STAR_CUTOFF) }
else if (score < Habit.FULL_STAR_CUTOFF)
{ {
tvStar.setText(context.getString(R.string.fa_star_half_o)); tvStar.setText(context.getString(R.string.fa_star_half_o));
tvStar.setTextColor(inactiveColor); tvStar.setTextColor(inactiveColor);
} else }
else
{ {
tvStar.setText(context.getString(R.string.fa_star)); tvStar.setText(context.getString(R.string.fa_star));
tvStar.setTextColor(activeColor); tvStar.setTextColor(activeColor);

21
app/src/main/res/layout/list_habits_fragment.xml
Unescape View File

@ -17,6 +17,27 @@
dslv:use_default_controller="true" dslv:use_default_controller="true"
/> />
<LinearLayout
android:id="@+id/tvEmpty"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tvStarEmpty"
style="@style/habitsListEmptyStyle"
android:text="@string/fa_star_half_o"
android:textSize="80sp"/>
<TextView
android:text="@string/no_habits_found"
style="@style/habitsListEmptyStyle"/>
</LinearLayout>
<LinearLayout style="@style/habitsListHeaderStyle"> <LinearLayout style="@style/habitsListHeaderStyle">
<TextView <TextView

54
app/src/main/res/values/attrs_dslv.xml
Unescape View File

@ -1,30 +1,30 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<declare-styleable name="DragSortListView"> <!--<declare-styleable name="DragSortListView">-->
<attr name="collapsed_height" format="dimension"/> <!--<attr name="collapsed_height" format="dimension"/>-->
<attr name="drag_scroll_start" format="float"/> <!--<attr name="drag_scroll_start" format="float"/>-->
<attr name="max_drag_scroll_speed" format="float"/> <!--<attr name="max_drag_scroll_speed" format="float"/>-->
<attr name="float_background_color" format="color"/> <!--<attr name="float_background_color" format="color"/>-->
<attr name="remove_mode"> <!--<attr name="remove_mode">-->
<enum name="clickRemove" value="0"/> <!--<enum name="clickRemove" value="0"/>-->
<enum name="flingRemove" value="1"/> <!--<enum name="flingRemove" value="1"/>-->
</attr> <!--</attr>-->
<attr name="track_drag_sort" format="boolean"/> <!--<attr name="track_drag_sort" format="boolean"/>-->
<attr name="float_alpha" format="float"/> <!--<attr name="float_alpha" format="float"/>-->
<attr name="slide_shuffle_speed" format="float"/> <!--<attr name="slide_shuffle_speed" format="float"/>-->
<attr name="remove_animation_duration" format="integer"/> <!--<attr name="remove_animation_duration" format="integer"/>-->
<attr name="drop_animation_duration" format="integer"/> <!--<attr name="drop_animation_duration" format="integer"/>-->
<attr name="drag_enabled" format="boolean"/> <!--<attr name="drag_enabled" format="boolean"/>-->
<attr name="sort_enabled" format="boolean"/> <!--<attr name="sort_enabled" format="boolean"/>-->
<attr name="remove_enabled" format="boolean"/> <!--<attr name="remove_enabled" format="boolean"/>-->
<attr name="drag_start_mode"> <!--<attr name="drag_start_mode">-->
<enum name="onDown" value="0"/> <!--<enum name="onDown" value="0"/>-->
<enum name="onMove" value="1"/> <!--<enum name="onMove" value="1"/>-->
<enum name="onLongPress" value="2"/> <!--<enum name="onLongPress" value="2"/>-->
</attr> <!--</attr>-->
<attr name="drag_handle_id" format="integer"/> <!--<attr name="drag_handle_id" format="integer"/>-->
<attr name="fling_handle_id" format="integer"/> <!--<attr name="fling_handle_id" format="integer"/>-->
<attr name="click_remove_id" format="integer"/> <!--<attr name="click_remove_id" format="integer"/>-->
<attr name="use_default_controller" format="boolean"/> <!--<attr name="use_default_controller" format="boolean"/>-->
</declare-styleable> <!--</declare-styleable>-->
</resources> </resources>

1
app/src/main/res/values/strings.xml
Unescape View File

@ -56,5 +56,6 @@
<string name="discard">Discard</string> <string name="discard">Discard</string>
<string name="save">Save</string> <string name="save">Save</string>
<string name="streaks">Streaks</string> <string name="streaks">Streaks</string>
<string name="no_habits_found">You have no active habits</string>
</resources> </resources>

10
app/src/main/res/values/styles_list_habits.xml
Unescape View File

@ -80,4 +80,14 @@
<item name="android:textSize">10sp</item> <item name="android:textSize">10sp</item>
<item name="android:textColor">#606060</item> <item name="android:textColor">#606060</item>
</style> </style>
<style name="habitsListEmptyStyle">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:gravity">center</item>
<item name="android:layout_marginTop">20dp</item>
<item name="android:textColor">#c0c0c0</item>
</style>
</resources> </resources>

2
build.gradle
Unescape View File

@ -4,7 +4,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:1.1.0' classpath 'com.android.tools.build:gradle:1.5.0'
} }
} }

14
uHabits.iml
Unescape View File

@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> <module external.linked.project.id="uHabits" external.linked.project.path="$USER_HOME$/.shared/workstations/Android/uHabits" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager"> <component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle"> <facet type="java-gradle" name="Java-Gradle">
<configuration> <configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" /> <option name="BUILD_FOLDER_PATH" value="$USER_HOME$/.shared/workstations/Android/uHabits/build" />
<option name="BUILDABLE" value="false" />
</configuration> </configuration>
</facet> </facet>
</component> </component>
<component name="NewModuleRootManager" inherit-compiler-output="true"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$USER_HOME$/.shared/workstations/Android/uHabits">
<excludeFolder url="file://$MODULE_DIR$/.gradle" /> <excludeFolder url="file://$USER_HOME$/.shared/workstations/Android/uHabits/.gradle" />
</content> </content>
<orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" /> <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
</component> </component>
</module> </module>

Write Preview
Loading…
Cancel
Save