Skip to content

Feature: numeric habits #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Markel15 merged 9 commits into from
Mar 31, 2026
Merged

Feature: numeric habits #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
749a164
feat: new logo
Markel15 Mar 27, 2026
3a16dfe
feat!: numeric habits are here (v0.5)
Markel15 Mar 29, 2026
64b16b8
feat: improved button distribution
Markel15 Mar 29, 2026
e65ccf1
fix: now you can't edit the habit type while editing a habit
Markel15 Mar 29, 2026
f469a99
feat: the step and goal must be null (optional) or bigger than 0
Markel15 Mar 29, 2026
04ffcf7
feat: scaling improvements
Markel15 Mar 29, 2026
18f4d17
feat!: numeric habit details
Markel15 Mar 31, 2026
9f69c28
feat: Unit tests for the habit detail view model
Markel15 Mar 31, 2026
fd88e73
feat: Add spacing in the details screen bottom & update screenshots
Markel15 Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<br>
<img src="screenshots/habits_prev.png" width="31%" />
<img src="screenshots/habits_details.png" width="31%" />
<img src="screenshots/habits_numeric_details.png" width="31%" />
</div>

## Features
Expand Down
35 changes: 16 additions & 19 deletions app/src/main/res/drawable/new_ic_launcher_foreground.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,33 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
android:viewportWidth="193"
android:viewportHeight="183">

<group
android:pivotX="54"
android:pivotY="54"
android:scaleX="0.8"
android:scaleY="0.8"
android:translateX="1"
android:translateY="2">
android:pivotX="96.5"
android:pivotY="91.5"
android:scaleX="0.5"
android:scaleY="0.5"
android:translateX="0"
android:translateY="0">

<group
android:translateX="19"
android:translateY="25">
android:translateY="183"
android:scaleX="0.1"
android:scaleY="-0.1">

<path
android:fillColor="#66DBB2"
android:pathData="M5,50 h60 c2.76,0 5,-2.24 5,-5 s-2.24,-5 -5,-5 H5 c-2.76,0 -5,2.24 -5,5 S2.24,50 5,50z" />

<path
android:fillColor="#66DBB2"
android:pathData="M5,32 h60 c2.76,0 5,-2.24 5,-5 s-2.24,-5 -5,-5 H5 c-2.76,0 -5,2.24 -5,5 S2.24,32 5,32z" />
android:fillColor="#006941"
android:pathData="M1795 1690 c-4 -6 -29 -22 -56 -35 -43 -22 -666 -272 -924 -372 -114 -44 -130 -54 -157 -106 -34 -65 -31 -157 6 -224 16 -29 33 -53 37 -53 25 0 899 356 934 380 52 35 99 93 124 152 15 32 61 234 61 264 0 8 -19 4 -25 -6z"/>

<path
android:fillColor="#66DBB2"
android:pathData="M35,14 h30 c2.76,0 5,-2.24 5,-5 s-2.24,-5 -5,-5 H35 c-2.76,0 -5,2.24 -5,5 S32.24,14 35,14z" />
android:fillColor="#006941"
android:pathData="M520 1163 c-72 -35 -164 -127 -196 -197 -47 -102 -49 -211 -6 -294 9 -18 118 -159 242 -312 l225 -279 238 0 c130 -1 237 1 237 4 0 3 -107 136 -238 297 -465 573 -436 534 -452 619 -10 52 -3 124 15 172 9 23 0 21 -65 -10z"/>

<path
android:fillColor="#006941"
android:pathData="M4.6,18.2 c-1.2,1.2 -1.2,3.1 0,4.2 l10.6,10.6 c1.2,1.2 3.1,1.2 4.2,0 L43.5,8.9 c1.2,-1.2 1.2,-3.1 0,-4.2 l-2.1,-2.1 c-1.2,-1.2 -3.1,-1.2 -4.2,0 L17.3,22.5 l-6.4,-6.4 c-1.2,-1.2 -3.1,-1.2 -4.2,0 L4.6,18.2z" />
android:pathData="M1696 1132 c-14 -23 -122 -70 -492 -217 -203 -80 -373 -150 -377 -154 -9 -9 191 -263 202 -257 3 2 105 43 226 90 121 48 243 102 270 121 96 66 135 135 165 294 20 109 22 149 6 123z"/>
</group>
</group>
</vector>
12 changes: 9 additions & 3 deletions core/data/schemas/com.markel.flowstate.core.data.local.FlowStateDatabase/12.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"formatVersion": 1,
"database": {
"version": 12,
"identityHash": "fb1f36e550964df0368643522d60c7af",
"identityHash": "dbe9a1eab0fae99af22e4dbea646b45f",
"entities": [
{
"tableName": "tasks",
Expand Down Expand Up @@ -315,7 +315,7 @@
},
{
"tableName": "habits",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `iconName` TEXT NOT NULL, `colorArgb` INTEGER NOT NULL, `frequency` TEXT NOT NULL, `createdAt` INTEGER NOT NULL, `habitType` TEXT NOT NULL, `unit` TEXT, `targetValue` REAL, `position` INTEGER NOT NULL)",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `iconName` TEXT NOT NULL, `colorArgb` INTEGER NOT NULL, `frequency` TEXT NOT NULL, `createdAt` INTEGER NOT NULL, `habitType` TEXT NOT NULL, `unit` TEXT, `targetValue` REAL, `step` REAL NOT NULL, `position` INTEGER NOT NULL)",
"fields": [
{
"fieldPath": "id",
Expand Down Expand Up @@ -369,6 +369,12 @@
"columnName": "targetValue",
"affinity": "REAL"
},
{
"fieldPath": "step",
"columnName": "step",
"affinity": "REAL",
"notNull": true
},
{
"fieldPath": "position",
"columnName": "position",
Expand Down Expand Up @@ -500,7 +506,7 @@
],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'fb1f36e550964df0368643522d60c7af')"
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'dbe9a1eab0fae99af22e4dbea646b45f')"
]
}
}
Loading
Loading