diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 39a4a706a..c2bdf6a03 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -20,17 +20,21 @@ android:value="uhabits.db" /> + android:value="5" /> + android:label="@string/app_name" + android:launchMode="singleInstance"> + + + diff --git a/art/ic_launcher.svg b/art/ic_launcher.svg index 4e6cce6a1..d4d0e2b63 100644 --- a/art/ic_launcher.svg +++ b/art/ic_launcher.svg @@ -14,7 +14,7 @@ height="458" id="svg2" version="1.1" - inkscape:version="0.48.4 r9939" + inkscape:version="0.91 r13725" sodipodi:docname="ic_launcher.svg" inkscape:export-filename="/home/isoron/Android/uHabits/art/ic_launcher.png" inkscape:export-xdpi="300.06549" @@ -88,8 +88,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="158.05316" - inkscape:cy="229.21828" + inkscape:cx="326.25652" + inkscape:cy="220.41399" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -112,7 +112,7 @@ image/svg+xml - + @@ -121,16 +121,16 @@ inkscape:groupmode="layer" id="layer1" transform="translate(-143.04724,-297.18109)"> - + sodipodi:cx="311" /> + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + aaahjoaaa + diff --git a/assets/migrations/5.sql b/assets/migrations/5.sql new file mode 100644 index 000000000..bde8462b1 --- /dev/null +++ b/assets/migrations/5.sql @@ -0,0 +1,2 @@ +alter table habits add column reminder_hour integer; +alter table habits add column reminder_min integer; \ No newline at end of file diff --git a/res/color/date_picker_selector.xml b/res/color/date_picker_selector.xml new file mode 100644 index 000000000..63e1e17d8 --- /dev/null +++ b/res/color/date_picker_selector.xml @@ -0,0 +1,23 @@ + + + + + + + + + \ No newline at end of file diff --git a/res/color/date_picker_year_selector.xml b/res/color/date_picker_year_selector.xml new file mode 100644 index 000000000..f5cf776fb --- /dev/null +++ b/res/color/date_picker_year_selector.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/res/drawable-hdpi/ic_action_check.png b/res/drawable-hdpi/ic_action_check.png new file mode 100644 index 000000000..329ea2fc3 Binary files /dev/null and b/res/drawable-hdpi/ic_action_check.png differ diff --git a/res/drawable-hdpi/ic_action_dismiss.png b/res/drawable-hdpi/ic_action_dismiss.png new file mode 100644 index 000000000..ea21b1bf2 Binary files /dev/null and b/res/drawable-hdpi/ic_action_dismiss.png differ diff --git a/res/drawable-hdpi/ic_notification.png b/res/drawable-hdpi/ic_notification.png new file mode 100644 index 000000000..7732cf993 Binary files /dev/null and b/res/drawable-hdpi/ic_notification.png differ diff --git a/res/drawable-mdpi/ic_action_check.png b/res/drawable-mdpi/ic_action_check.png new file mode 100644 index 000000000..700d076ed Binary files /dev/null and b/res/drawable-mdpi/ic_action_check.png differ diff --git a/res/drawable-mdpi/ic_action_dismiss.png b/res/drawable-mdpi/ic_action_dismiss.png new file mode 100644 index 000000000..cfb167994 Binary files /dev/null and b/res/drawable-mdpi/ic_action_dismiss.png differ diff --git a/res/drawable-mdpi/ic_notification.png b/res/drawable-mdpi/ic_notification.png new file mode 100644 index 000000000..062788bd1 Binary files /dev/null and b/res/drawable-mdpi/ic_notification.png differ diff --git a/res/drawable-xhdpi/ic_action_check.png b/res/drawable-xhdpi/ic_action_check.png new file mode 100644 index 000000000..cf32c2a53 Binary files /dev/null and b/res/drawable-xhdpi/ic_action_check.png differ diff --git a/res/drawable-xhdpi/ic_action_dismiss.png b/res/drawable-xhdpi/ic_action_dismiss.png new file mode 100644 index 000000000..0aaf7e2df Binary files /dev/null and b/res/drawable-xhdpi/ic_action_dismiss.png differ diff --git a/res/drawable-xhdpi/ic_notification.png b/res/drawable-xhdpi/ic_notification.png new file mode 100644 index 000000000..99411ad4e Binary files /dev/null and b/res/drawable-xhdpi/ic_notification.png differ diff --git a/res/drawable-xxhdpi/ic_action_check.png b/res/drawable-xxhdpi/ic_action_check.png new file mode 100644 index 000000000..99266ebb9 Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_check.png differ diff --git a/res/drawable-xxhdpi/ic_action_dismiss.png b/res/drawable-xxhdpi/ic_action_dismiss.png new file mode 100644 index 000000000..61817c96b Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_dismiss.png differ diff --git a/res/drawable-xxhdpi/ic_notification.png b/res/drawable-xxhdpi/ic_notification.png new file mode 100644 index 000000000..5ec39593a Binary files /dev/null and b/res/drawable-xxhdpi/ic_notification.png differ diff --git a/res/drawable/done_background_color.xml b/res/drawable/done_background_color.xml new file mode 100644 index 000000000..19a386134 --- /dev/null +++ b/res/drawable/done_background_color.xml @@ -0,0 +1,25 @@ + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/done_background_color_dark.xml b/res/drawable/done_background_color_dark.xml new file mode 100644 index 000000000..1665eee3f --- /dev/null +++ b/res/drawable/done_background_color_dark.xml @@ -0,0 +1,25 @@ + + + + + + + + + \ No newline at end of file diff --git a/res/layout/date_picker_dialog.xml b/res/layout/date_picker_dialog.xml new file mode 100644 index 000000000..3361cb349 --- /dev/null +++ b/res/layout/date_picker_dialog.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/date_picker_done_button.xml b/res/layout/date_picker_done_button.xml new file mode 100644 index 000000000..3794a08ce --- /dev/null +++ b/res/layout/date_picker_done_button.xml @@ -0,0 +1,43 @@ + + + + +