Fix habit linking and add diary and writing icons

This commit is contained in:
waozi committed 2026-10-26 23:43:53 -03:00
1 parent 55571c9031
commit e263d1144e
29 files changed
+225 -61

No files matched your search

+7
View File
@@ -1,5 +1,12 @@
# Changelog
## [2.1.51] - 2026-10-27
- Open Link to reliably while choosing a new habit's icon.
- Choose diary, notebook, pen, pencil, writing, notes, keyboard and idea icons for habits and rewards.
- Link habits to Diary entries and add a linked habit after a practice's first session.
- Get a short count-in before each workout exercise.
## [2.1.50] - 2026-10-26
- Habits award coins when you record a recent day before you created the habit.
+4
View File
@@ -1,5 +1,9 @@
# Changelog
## [1.3.15] - 2026-10-26
- Maintenance release for Inner Breeze 2.1.51.
## [1.3.14] - 2026-10-26
- Maintenance release for Inner Breeze 2.1.50.
+7
View File
@@ -1,5 +1,12 @@
# Changelog
## [1.3.6] - 2026-10-27
- Open Link to reliably with the expanded icon picker.
- Choose eight more diary and writing symbols for habits and rewards.
- Link habits to Diary entries.
- Requires Breeze 2.1.51 or later.
## [1.3.4] - 2026-10-26
- Maintenance release for Inner Breeze 2.1.50.
+13 -11
View File
@@ -84,6 +84,8 @@ EDIT_CONTENT_MAX_WIDTH :: 440
EDIT_QUESTION_PADDING :: 12
EDIT_QUESTION_GAP :: 10
EDIT_GOAL_OPTIONS :: 6
// Icon choices must not share IDs with the tracking controls at 7600–7800.
EDIT_ICON_BUTTON_BASE :: 90000
// A span goal's typed lengths follow the questions' goal fields.
EDIT_SPAN_FIELD_CODE :: HABIT_QUESTION_MAX * 2
@@ -454,7 +456,7 @@ MonthDayButtons :: (x: s32, y: s32, width: s32) -> s32 {
.label = Locale("habit_month_last_day"), .selected = last,
.tone = cast(ButtonTone)(ifx last then ButtonToneAccent else ButtonToneNeutral),
.emphasis = cast(ButtonEmphasis)(ifx last then ButtonEmphasisFilled
else ButtonEmphasisSoft)}) != 0 {
else ButtonEmphasisSoft)}) != 0 {
if !last || edit.month_days != 0 {
edit.last_day = !last
}
@@ -723,7 +725,7 @@ Colors :: (x: s32, y: s32, width: s32) {
edit.color.b == swatch.b
if Button(edit.session, ButtonProps.{.id = 7530 + index,
.bounds = Bounds(x + (index % columns) * Scale(48) + Scale(4),
y + (index / columns) * Scale(44) + Scale(2), Scale(40), Scale(40)),
y + (index / columns) * Scale(44) + Scale(2), Scale(40), Scale(40)),
.label = ifx more then "..." else "", .circle = true, .selected = chosen,
.swatch = !more, .swatch_color = swatch,
.tone = cast(ButtonTone)ButtonToneNeutral,
@@ -771,7 +773,7 @@ Icons :: (x: s32, y: s32, width: s32) {
chosen = HABIT_ICON_LETTER
}
selected := edit.icon == chosen
button := ButtonProps.{.id = 7560 + icon, .bounds = GridBounds(x, y - Scale(2), width, slot),
button := ButtonProps.{.id = EDIT_ICON_BUTTON_BASE + icon, .bounds = GridBounds(x, y - Scale(2), width, slot),
.circle = true, .selected = selected,
.tone = cast(ButtonTone)(ifx selected then ButtonToneAccent else ButtonToneNeutral),
.emphasis = cast(ButtonEmphasis)(ifx selected then ButtonEmphasisFilled
@@ -920,10 +922,10 @@ Difficulty :: (x: s32, y: s32, width: s32) {
hint_y := y + Scale(80)
coin := Scale(18)
unused SvgIcon(edit.session, SvgIconProps.{.bounds = Bounds(x, hint_y + (Scale(22) - coin) / 2,
coin, coin),
coin, coin),
.shape = CoinIcon.Shape, .color = Color.{.r = 226, .g = 168, .b = 48, .a = 255}})
Text(edit.session, TextProps.{.bounds = Bounds(x + coin + Scale(8), hint_y,
width - coin - Scale(8), Scale(30)),
width - coin - Scale(8), Scale(30)),
.text = ifx edit.custom_coins then Locale("habit_coins_signed_hint")
else DifficultyEarns(edit.difficulty),
.font = edit.small_font, .class_name = edit.muted_class,
@@ -1265,7 +1267,7 @@ SpanLength :: (bound: s32, label: string, x: s32, y: s32, width: s32) -> s32 {
}
parts[part] = HabitTimeTypedNumber(typed)
Text(edit.session, TextProps.{.bounds = Bounds(field_x + part_width, y + Scale(4),
unit_width, Scale(44)),
unit_width, Scale(44)),
.text = Locale(units[part]), .align = cast(TextAlign)TextAlignCenter,
.vertical_align = cast(TextAlign)TextAlignCenter})
field_x += part_width + unit_width
@@ -1459,13 +1461,13 @@ Questions :: (x: s32, y: s32, width: s32) {
EnsureVisible(text_bounds)
}
if Step(7740 + index, "-", Bounds(inner_x + inner_width - remove_width, y, remove_width,
Scale(44)), false) {
Scale(44)), false) {
Ask(HABITS_EDIT_REMOVE_QUESTION, index)
}
RowLabel(Locale("habit_answer_as"), inner_x, y + Scale(48), inner_width - type_width - Scale(8))
chosen := Dropdown(edit.session, DropdownProps.{.id = 7750 + index,
.bounds = Bounds(inner_x + inner_width - type_width, y + Scale(52), type_width,
Scale(44)),
Scale(44)),
.selected_index = question.answer_type - 1}, types[:])
if chosen.changed {
// Another answer type starts with its own goal.
@@ -1647,7 +1649,7 @@ Form :: () {
.text = titles[section], .font = edit.font, .wrap = cast(TextWrap)TextWrapNone,
.semantic_kind = cast(SemanticKind)SemanticHeading, .heading_level = 2})
Fieldset(edit.session, FieldsetProps.{.bounds = Bounds(x, y + Scale(30), width,
body_height + Scale(24))})
body_height + Scale(24))})
body_x := x + Scale(12)
body_y := y + Scale(42)
if section == 0 {
@@ -1663,12 +1665,12 @@ Form :: () {
}
// The footer keeps Save and Delete apart from the scrolling form.
unused Box(edit.session, BoxProps.{.bounds = Bounds(0, edit.view_height - footer,
edit.view_width, footer),
edit.view_width, footer),
.fill = edit.canvas_color})
rule := edit.text_color
rule.a = cast(u8)(255.0 * 0.12)
unused Box(edit.session, BoxProps.{.bounds = Bounds(0, edit.view_height - footer,
edit.view_width, Scale(1)),
edit.view_width, Scale(1)),
.fill = rule})
if edit.name_error != 0 {
Label(Locale(ifx edit.name_error == 1 then "habit_name_required" else "habit_name_duplicate"),
+4
View File
@@ -1,5 +1,9 @@
# Changelog
## [2.1.51] - 2026-10-26
- Bring Lumi 1.5.18, Habits 1.3.6, Practices 1.6.0, Lists 1.1.19, Diary 1.3.15 and Leaderboard 1.0.20 for Inner Breeze 2.1.51.
## [2.1.50] - 2026-10-26
- Bring Lumi 1.5.17, Habits 1.3.4, Practices 1.5.4, Lists 1.1.18, Diary 1.3.14 and Leaderboard 1.0.19 for Inner Breeze 2.1.50.
+4
View File
@@ -1,5 +1,9 @@
# Changelog
## [1.0.20] - 2026-10-26
- Maintenance release for Inner Breeze 2.1.51.
## [1.0.19] - 2026-10-26
- Maintenance release for Inner Breeze 2.1.50.
+4
View File
@@ -1,5 +1,9 @@
# Changelog
## [1.1.19] - 2026-10-26
- Maintenance release for Inner Breeze 2.1.51.
## [1.1.18] - 2026-10-26
- Maintenance release for Inner Breeze 2.1.50.
+4
View File
@@ -1,5 +1,9 @@
# Changelog
## [1.5.18] - 2026-10-26
- Maintenance release for Inner Breeze 2.1.51.
## [1.5.17] - 2026-10-26
- Maintenance release for Inner Breeze 2.1.50.
+5
View File
@@ -1,5 +1,10 @@
# Changelog
## [1.6.0] - 2026-10-27
- Offer a linked habit after the first saved session of a practice.
- Give each workout exercise a short count-in.
## [1.5.4] - 2026-10-26
- Maintenance release for Inner Breeze 2.1.50.
+24 -24
View File
@@ -1,66 +1,66 @@
{
"host_api": 37,
"host_api": 38,
"oldest_host_api": 12,
"package_format": "zx",
"module_api": 2,
"apps": {
"inbe": {
"id": "inbe",
"version": "2.1.50",
"sequence": 47,
"version": "2.1.51",
"sequence": 48,
"bundled": true,
"host_api": 37,
"release": "2.1.50"
"host_api": 38,
"release": "2.1.51"
},
"habits": {
"id": "inbe.habits",
"version": "1.3.4",
"sequence": 28,
"version": "1.3.6",
"sequence": 29,
"bundled": true,
"host_api": 30,
"host_api": 38,
"oldest_host_api": 30,
"release": "2.1.50"
"release": "2.1.51"
},
"practices": {
"id": "inbe.practices",
"version": "1.5.4",
"sequence": 28,
"version": "1.6.0",
"sequence": 29,
"bundled": true,
"host_api": 37,
"oldest_host_api": 31,
"release": "2.1.50"
"release": "2.1.51"
},
"lists": {
"id": "inbe.lists",
"version": "1.1.18",
"sequence": 26,
"version": "1.1.19",
"sequence": 27,
"bundled": true,
"host_api": 27,
"release": "2.1.50"
"release": "2.1.51"
},
"diary": {
"id": "inbe.diary",
"version": "1.3.14",
"sequence": 31,
"version": "1.3.15",
"sequence": 32,
"bundled": true,
"host_api": 21,
"release": "2.1.50"
"release": "2.1.51"
},
"lumi": {
"id": "inbe.lumi",
"version": "1.5.17",
"sequence": 35,
"version": "1.5.18",
"sequence": 36,
"bundled": true,
"host_api": 20,
"release": "2.1.50"
"release": "2.1.51"
},
"leaderboard": {
"id": "inbe.leaderboard",
"version": "1.0.19",
"sequence": 20,
"version": "1.0.20",
"sequence": 21,
"bundled": true,
"host_api": 25,
"release": "2.1.50"
"release": "2.1.51"
}
},
"node_apps": {
+3 -1
View File
@@ -79,7 +79,9 @@ allows; Done, Skip, Delete and Cancel go through the host's entry rules.
The editor reads the habit being edited (`ReadHabitsEditHost`), each of its
questions and each practice or app it may link, keeps what is typed and gives the
draft back; the host validates and saves it with the same habit rules as
before. A link is one bit of the habit's `sync_activity`
before. The eight writing icons added in host interface 38 keep stable numbers
77–84; Habits packages offering these choices require that host so the editor
preserves them when saving. A link is one bit of the habit's `sync_activity`
(`src/habits/habit_links.zi`): a practice checks the day of a saved session,
and Diary checks a day with a real entry (`DiaryStoreSave` reports it, and
linking a habit brings its earlier entry days along). Another app links by
+2 -2
View File
@@ -67,8 +67,8 @@ android {
minSdk 21
targetSdk 36
testInstrumentationRunner "android.test.InstrumentationTestRunner"
versionCode 187
versionName "2.1.50"
versionCode 188
versionName "2.1.51"
manifestPlaceholders = [
inbeAppLabel: "Inner Breeze",
inbeUsesCleartextTraffic: "false"
@@ -0,0 +1,4 @@
- Open Link to reliably while choosing a new habit's icon.
- Choose diary, notebook, pen, pencil, writing, notes, keyboard and idea icons for habits and rewards.
- Link habits to Diary entries and add a linked habit after a practice's first session.
- Get a short count-in before each workout exercise.
+1 -1
View File
@@ -1,5 +1,5 @@
Package: inbe.waozi
Version: 2.1.50
Version: 2.1.51
Architecture: arm64
Maintainer: Waozi <[email protected]>
Click-Version: 0.4
+1 -1
View File
@@ -28,7 +28,7 @@
<binary>inbe</binary>
</provides>
<releases>
<release version="2.1.50" date="2026-10-26"/>
<release version="2.1.51" date="2026-10-27"/>
</releases>
<content_rating type="oars-1.1"/>
</component>
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "inbe",
"title": "Inner Breeze",
"version": "2.1.50",
"version": "2.1.51",
"architecture": "arm64",
"framework": "ubuntu-sdk-20.04",
"description": "Syncable breathing, meditation, and habit practice app.",
+1 -1
View File
@@ -2,7 +2,7 @@
"manifest_version": 3,
"name": "Inner Breeze",
"short_name": "Inbe",
"version": "2.1.50",
"version": "2.1.51",
"description": "Breathing, meditation, habit tracking, and encrypted sync.",
"permissions": [
"contextMenus"
+1 -1
View File
@@ -22,7 +22,7 @@
<binary>inbe</binary>
</provides>
<releases>
<release version="2.1.50" date="2026-10-26"/>
<release version="2.1.51" date="2026-10-27"/>
</releases>
<content_rating type="oars-1.1"/>
</component>
+1 -1
View File
@@ -22,7 +22,7 @@
<binary>inbe</binary>
</provides>
<releases>
<release version="2.1.50" date="2026-10-26"/>
<release version="2.1.51" date="2026-10-27"/>
</releases>
<content_rating type="oars-1.1"/>
</component>
+1 -1
View File
@@ -6,7 +6,7 @@ description: |
meditation, and habit tracking with visual and audio cues, meditation
timers, habit counters, session history, and optional sync.
version: '2.1.50'
version: '2.1.51'
license: BSD-3-Clause
base: core22
confinement: strict
+1 -1
View File
@@ -1,5 +1,5 @@
// Generated from apps/versions.json. This host runs packages built for host
// interfaces from the oldest to the current one; module interfaces must match.
PackageHostAPI :: 37
PackageHostAPI :: 38
PackageHostAPIOldest :: 12
PackageModuleAPI :: 2
+2 -2
View File
@@ -3,7 +3,7 @@ PackageBundledVersion :: (index: s32) -> string {
if index < 0 || index >= 7 {
return ""
}
versions: [7]string = .["2.1.50", "1.1.18", "1.3.4", "1.5.4", "1.3.14", "1.5.17", "1.0.19"]
versions: [7]string = .["2.1.51", "1.1.19", "1.3.6", "1.6.0", "1.3.15", "1.5.18", "1.0.20"]
return versions[index]
}
@@ -11,7 +11,7 @@ PackageBundledSequence :: (index: s32) -> s32 {
if index < 0 || index >= 7 {
return 0
}
sequences: [7]s32 = .[47, 26, 28, 28, 31, 35, 20]
sequences: [7]s32 = .[48, 27, 29, 29, 32, 36, 21]
return sequences[index]
}
+2 -2
View File
@@ -3,7 +3,7 @@
#define APP_VERSION_MAJOR 2
#define APP_VERSION_MINOR 1
#define APP_VERSION_PATCH 50
#define APP_VERSION_STRING "2.1.50"
#define APP_VERSION_PATCH 51
#define APP_VERSION_STRING "2.1.51"
#endif
+2 -2
View File
@@ -1,5 +1,5 @@
// Generated by update_version.sh from CHANGELOG.md. Do not edit by hand.
VersionMajor :: 2
VersionMinor :: 1
VersionPatch :: 50
VersionString :: "2.1.50"
VersionPatch :: 51
VersionString :: "2.1.51"
+65 -1
View File
@@ -3,7 +3,7 @@
// kryonlabs/mingcute's generated shapes. Habits and rewards save an icon's
// number, so an icon keeps its number and new icons go at the end.
HABIT_ICON_COUNT :: 76
HABIT_ICON_COUNT :: 84
// A habit that shows the first letter of its name, chosen in its editor or
// because no icon fits it; 0 means no icon has been chosen yet.
HABIT_ICON_LETTER :: -1
@@ -15,6 +15,14 @@ HABIT_ICON_YIN_YANG :: 37
// The symbol a new reward in the habit shop shows.
HABIT_ICON_GIFT :: 38
HABIT_ICON_SODA :: 76
HABIT_ICON_DIARY :: 77
HABIT_ICON_NOTEBOOK :: 78
HABIT_ICON_PEN :: 79
HABIT_ICON_PENCIL :: 80
HABIT_ICON_WRITING :: 81
HABIT_ICON_NOTES :: 82
HABIT_ICON_KEYBOARD :: 83
HABIT_ICON_IDEA :: 84
HABIT_ICON_ICE_CREAM :: 57
// The symbol the default Exercise habit shows.
HABIT_ICON_RUN :: 10
@@ -328,6 +336,38 @@ HabitIconShape :: (icon: s32) -> string {
if icon == HABIT_ICON_SODA {
return "S2rr:M8 5H16L18 8V20H6V8L8 5ZM8 3H16M6 9H18M6 17H18M10 12H14"
}
if icon == HABIT_ICON_DIARY {
// MingCute regular diary (Apache-2.0).
return "F:M4 5C3.44772 5 3 5.44772 3 6C3 6.55228 3.44772 7 4 7V6V5ZM4 9C3.44772 9 3 9.44772 3 10C3 10.5523 3.44772 11 4 11V10V9ZM4 13C3.44772 13 3 13.4477 3 14C3 14.5523 3.44772 15 4 15V14V13ZM4 17C3.44772 17 3 17.4477 3 18C3 18.5523 3.44772 19 4 19V18V17ZM6 3V4H18V3V2H6V3ZM19 4H18V20H19H20V4H19ZM18 21V20H6V21V22H18V21ZM5 20H6V4H5H4V20H5ZM4 6V7H5V6V5H4V6ZM4 10V11H5V10V9H4V10ZM4 14V15H5V14V13H4V14ZM4 18V19H5V18V17H4V18ZM8.5 7V8H15.5V7V6H8.5V7ZM16 7.5H15V9.5H16H17V7.5H16ZM15.5 10V9H8.5V10V11H15.5V10ZM8 9.5H9V7.5H8H7V9.5H8ZM8.5 10V9C8.77614 9 9 9.22386 9 9.5H8H7C7 10.3284 7.67157 11 8.5 11V10ZM16 9.5H15C15 9.22386 15.2239 9 15.5 9V10V11C16.3284 11 17 10.3284 17 9.5H16ZM6 21V20H6H5H4C4 21.1046 4.89543 22 6 22V21ZM18 3V4V4H19H20C20 2.89543 19.1046 2 18 2V3ZM8.5 7V6C7.67157 6 7 6.67157 7 7.5H8H9C9 7.77614 8.77614 8 8.5 8V7ZM15.5 7V8C15.2239 8 15 7.77614 15 7.5H16H17C17 6.67157 16.3284 6 15.5 6V7ZM19 20H18V20V21V22C19.1046 22 20 21.1046 20 20H19ZM6 3V2C4.89543 2 4 2.89543 4 4H5H6V4V3Z"
}
if icon == HABIT_ICON_NOTEBOOK {
// MingCute regular notebook (Apache-2.0).
return "S2rm:M9 20.8799V3M6 21H17C18.1046 21 19 20.1046 19 19V5C19 3.89543 18.1046 3 17 3H6C5.44772 3 5 3.44772 5 4V20C5 20.5523 5.44772 21 6 21Z"
}
if icon == HABIT_ICON_PEN {
// MingCute regular pen (Apache-2.0).
return "F:M3.92896 20.0712L2.96546 19.8035C2.86893 20.1509 2.96689 20.5234 3.22185 20.7783C3.47681 21.0333 3.84928 21.1312 4.19668 21.0347L3.92896 20.0712ZM10.2929 18.657L10.4132 19.6497V19.6497L10.2929 18.657ZM5.34317 13.7073L6.3359 13.8276V13.8276L5.34317 13.7073ZM19.4856 8.75736C19.8761 9.14789 20.5092 9.14789 20.8998 8.75736C21.2903 8.36684 21.2903 7.73368 20.8998 7.34315L20.1927 8.05026L19.4856 8.75736ZM16.6571 3.10051C16.2666 2.70999 15.6334 2.70999 15.2429 3.10051C14.8524 3.49103 14.8524 4.1242 15.2429 4.51472L15.95 3.80762L16.6571 3.10051ZM6.59652 7.8319L6.22513 6.90342L6.59652 7.8319ZM13.5876 5.68823L14.2947 4.98113L13.5876 5.68823ZM18.5333 11.4911L19.4618 11.8625L18.5333 11.4911ZM18.3119 10.4126L19.019 9.70546L18.3119 10.4126ZM16.1683 17.4037L15.2398 17.0323L16.1683 17.4037ZM15.3665 18.024L15.2407 17.0319L15.3665 18.024ZM16.1683 17.4037L17.0967 17.775L19.4618 11.8625L18.5333 11.4911L17.6048 11.1197L15.2398 17.0323L16.1683 17.4037ZM18.3119 10.4126L19.019 9.70546L14.2947 4.98113L13.5876 5.68823L12.8805 6.39534L17.6048 11.1197L18.3119 10.4126ZM12.5091 5.46686L12.1377 4.53839L6.22513 6.90342L6.59652 7.8319L6.96791 8.76038L12.8805 6.39534L12.5091 5.46686ZM3.92896 20.0712C4.19668 21.0347 4.19666 21.0347 4.19665 21.0347C4.19667 21.0347 4.19668 21.0347 4.19672 21.0347C4.19679 21.0347 4.19693 21.0346 4.19713 21.0346C4.19752 21.0345 4.19817 21.0343 4.19905 21.034C4.20083 21.0336 4.20358 21.0328 4.20729 21.0318C4.2147 21.0297 4.22593 21.0266 4.24079 21.0225C4.27051 21.0144 4.31476 21.0022 4.3721 20.9866C4.48678 20.9555 4.65371 20.9104 4.86131 20.8555C5.27676 20.7455 5.85386 20.5961 6.5003 20.4384C7.80789 20.1192 9.34774 19.7789 10.4132 19.6497L10.2929 18.657L10.1726 17.6643C8.97751 17.8091 7.33538 18.1759 6.02614 18.4954C5.36415 18.6569 4.77413 18.8097 4.34955 18.9221C4.13714 18.9783 3.96583 19.0245 3.84728 19.0567C3.788 19.0728 3.74188 19.0855 3.71039 19.0941C3.69465 19.0985 3.68256 19.1018 3.6743 19.1041C3.67018 19.1052 3.66701 19.1061 3.66482 19.1067C3.66373 19.107 3.66288 19.1073 3.66228 19.1074C3.66198 19.1075 3.66174 19.1076 3.66157 19.1076C3.66148 19.1076 3.6614 19.1077 3.66135 19.1077C3.66128 19.1077 3.66123 19.1077 3.92896 20.0712ZM10.2929 18.657L10.4132 19.6497C12.0572 19.4505 14.4119 19.153 15.4923 19.016L15.3665 18.024L15.2407 17.0319C14.16 17.169 11.8104 17.4657 10.1726 17.6643L10.2929 18.657ZM5.97618 8.63367L4.98413 8.50788C4.84713 9.58825 4.5497 11.943 4.35043 13.5869L5.34317 13.7073L6.3359 13.8276C6.53442 12.1898 6.8312 9.84018 6.96824 8.75947L5.97618 8.63367ZM5.34317 13.7073L4.35043 13.5869C4.22128 14.6524 3.88092 16.1923 3.56182 17.4999C3.40406 18.1463 3.25465 18.7234 3.14469 19.1389C3.08973 19.3465 3.04471 19.5134 3.01353 19.6281C2.99794 19.6854 2.98581 19.7297 2.97763 19.7594C2.97355 19.7742 2.97045 19.7855 2.9684 19.7929C2.96737 19.7966 2.96661 19.7993 2.96612 19.8011C2.96587 19.802 2.96569 19.8026 2.96558 19.803C2.96553 19.8032 2.96549 19.8034 2.96547 19.8035C2.96546 19.8035 2.96546 19.8035 2.96545 19.8035C2.96545 19.8035 2.96546 19.8035 3.92896 20.0712C4.89245 20.3389 4.89247 20.3389 4.89248 20.3388C4.8925 20.3388 4.89252 20.3387 4.89254 20.3386C4.89259 20.3384 4.89266 20.3382 4.89274 20.3379C4.89291 20.3373 4.89314 20.3364 4.89345 20.3353C4.89405 20.3332 4.89493 20.33 4.89607 20.3259C4.89835 20.3176 4.90169 20.3055 4.90602 20.2898C4.91468 20.2583 4.92732 20.2122 4.94344 20.1529C4.97568 20.0343 5.02188 19.863 5.0781 19.6506C5.19049 19.226 5.34325 18.636 5.5048 17.974C5.8243 16.6648 6.19104 15.0227 6.3359 13.8276L5.34317 13.7073ZM4.63627 19.364L5.34337 20.0711L11 14.4145L10.2929 13.7074L9.58583 13.0003L3.92917 18.6569L4.63627 19.364ZM10.2929 12.2932L11 13.0003H11L11.7071 12.2932L12.4143 11.5861C11.6332 10.805 10.3669 10.805 9.58583 11.5861L10.2929 12.2932ZM11.7071 12.2932L11 13.0003V13.0003L11.7071 13.7074L12.4143 14.4145C13.1953 13.6335 13.1953 12.3671 12.4143 11.5861L11.7071 12.2932ZM11.7071 13.7074L11 13.0003H11L10.2929 13.7074L9.58583 14.4145C10.3669 15.1956 11.6332 15.1956 12.4143 14.4145L11.7071 13.7074ZM10.2929 13.7074L11 13.0003V13.0003L10.2929 12.2932L9.58583 11.5861C8.80478 12.3671 8.80478 13.6335 9.58583 14.4145L10.2929 13.7074ZM20.1927 8.05026L20.8998 7.34315L16.6571 3.10051L15.95 3.80762L15.2429 4.51472L19.4856 8.75736L20.1927 8.05026ZM6.59652 7.8319L6.22513 6.90342C5.55123 7.17298 5.07559 7.78655 4.98413 8.50788L5.97618 8.63367L6.96824 8.75947L6.96791 8.76038L6.59652 7.8319ZM13.5876 5.68823L14.2947 4.98113C13.729 4.4154 12.8806 4.24125 12.1377 4.53839L12.5091 5.46686L12.8805 6.39534V6.39534L13.5876 5.68823ZM18.5333 11.4911L19.4618 11.8625C19.7589 11.1196 19.5848 10.2712 19.019 9.70546L18.3119 10.4126L17.6048 11.1197V11.1197L18.5333 11.4911ZM16.1683 17.4037L15.2398 17.0323L15.2407 17.0319L15.3665 18.024L15.4923 19.016C16.2136 18.9246 16.8272 18.4489 17.0967 17.775L16.1683 17.4037Z"
}
if icon == HABIT_ICON_PENCIL {
// MingCute regular pencil (Apache-2.0).
return "S2br:M18.8639 8.67128L15.3284 5.13574M8.96448 18.5711L20.2782 7.25736C21.0592 6.47632 21.0592 5.20999 20.2782 4.42894L19.5711 3.72183C18.79 2.94078 17.5237 2.94078 16.7427 3.72183L5.42895 15.0355L4.36829 19.6317L8.96448 18.5711Z"
}
if icon == HABIT_ICON_WRITING {
// MingCute regular edit_2 (Apache-2.0).
return "S2rr:M12.17 6.17029L4.28923 14.0511C4.10169 14.2386 3.99634 14.493 3.99634 14.7582V20.0008H9.23898C9.50419 20.0008 9.75855 19.8955 9.94608 19.7079L17.8269 11.8271M12.17 6.17029L14.6029 3.73738C14.9935 3.34686 15.6266 3.34686 16.0172 3.73738L20.2598 7.98002C20.6503 8.37055 20.6503 9.00371 20.2598 9.39423L17.8269 11.8271M12.17 6.17029L17.8269 11.8271"
}
if icon == HABIT_ICON_NOTES {
// MingCute regular document_2 (Apache-2.0).
return "S2rr:M13 3V8.5C13 8.77614 13.2239 9 13.5 9H19M9 16H15M9 12H10M13.5858 3H6C5.44772 3 5 3.44772 5 4V20C5 20.5523 5.44772 21 6 21H18C18.5523 21 19 20.5523 19 20V8.41421C19 8.149 18.8946 7.89464 18.7071 7.70711L14.2929 3.29289C14.1054 3.10536 13.851 3 13.5858 3Z"
}
if icon == HABIT_ICON_KEYBOARD {
// MingCute regular keyboard (Apache-2.0).
return "S2rr:M7 9H8M11.5 9H12.5M16 9H17M7 12H8M11.5 12H12.5M16 12H17M7 15H17M4 19H20C20.5523 19 21 18.5523 21 18V6C21 5.44772 20.5523 5 20 5H4C3.44772 5 3 5.44772 3 6V18C3 18.5523 3.44772 19 4 19Z"
}
if icon == HABIT_ICON_IDEA {
// MingCute regular bulb (Apache-2.0).
return "S2rr:M11 21H13M13 7L11 9L13 11L11 13M5 9.93333C5 13.9192 8.04728 16.3307 8.82237 16.8796C8.9382 16.9616 9.04072 17.0611 9.11945 17.1792L10 18.5H14L14.8806 17.1792C14.9593 17.0611 15.0618 16.9616 15.1776 16.8796C15.9527 16.3307 19 13.9192 19 9.93333C19 6.10416 15.866 3 12 3C8.13401 3 5 6.10416 5 9.93333Z"
}
return ""
}
@@ -562,6 +602,30 @@ HabitIconName :: (icon: s32) -> string {
if icon == HABIT_ICON_SODA {
return "soda"
}
if icon == HABIT_ICON_DIARY {
return "diary"
}
if icon == HABIT_ICON_NOTEBOOK {
return "notebook"
}
if icon == HABIT_ICON_PEN {
return "pen"
}
if icon == HABIT_ICON_PENCIL {
return "pencil"
}
if icon == HABIT_ICON_WRITING {
return "edit_2"
}
if icon == HABIT_ICON_NOTES {
return "document_2"
}
if icon == HABIT_ICON_KEYBOARD {
return "keyboard"
}
if icon == HABIT_ICON_IDEA {
return "bulb"
}
return ""
}
+10
View File
@@ -201,6 +201,16 @@ def exercise(phone, driver):
driver.press(key=cover[0]["key"])
driver.wait(label="Download", role="button")
download(driver)
# New Apfelwurm versions first show the title screen; older versions
# enter the movement chooser directly. Follow either real first start.
deadline = time.monotonic() + 120
while not driver.find(label="How do you want to move?", role="text", visible=True):
if driver.find(label="Play", role="button", visible=True):
driver.press(label="Play", role="button")
break
if time.monotonic() >= deadline:
raise AssertionError("Apfelwurm did not reach its title or movement chooser: " + driver.text())
driver.wait_idle(frames=3)
driver.wait(label="How do you want to move?", role="text", timeout=120)
driver.press(label="Swipe", role="button")
driver.wait(label="Pause", role="button", timeout=60)
+20 -4
View File
@@ -172,6 +172,14 @@ for width in (411, 1100):
with scene("habits_overview", width) as (driver, database):
driver.press(label="+ New Habit", role="button")
driver.wait(label="Create habit", role="button")
# Expanding the icon grid must not steal the Link to button's input.
driver.press(key=7559)
reveal(driver, width, contains="Link", role="button")
driver.press(contains="Link", role="button")
driver.wait(key=9120)
driver.press(label="Diary", role="checkbox")
driver.press(label="Done", role="button")
driver.wait_gone(key=9120)
# Change tracking before entering a name, through the ordinary New
# Habit action rather than a scene that opens the editor directly.
for difficulty in ("Easy", "Medium", "Hard", "Very hard"):
@@ -203,9 +211,17 @@ for width in (411, 1100):
reveal(driver, width, key=7710)
driver.press(key=7710)
wait_selected(driver, False, key=7710)
reveal(driver, width, key=7562)
driver.press(key=7562)
wait_selected(driver, True, key=7562)
reveal(driver, width, key=90002)
driver.press(key=90002)
wait_selected(driver, True, key=90002)
# New writing symbols are selectable even at the end of the grid.
for icon in range(77, 85):
reveal(driver, width, key=90000 + icon)
driver.press(key=90000 + icon)
wait_selected(driver, True, key=90000 + icon)
reveal(driver, width, key=90077)
driver.press(key=90077)
wait_selected(driver, True, key=90077)
reveal(driver, width, key=7531)
driver.press(key=7531)
wait_selected(driver, True, key=7531)
@@ -241,7 +257,7 @@ for width in (411, 1100):
expect(sql(database, "SELECT description||':'||icon||':'||weekdays||':'||"
"(sync_activity!=0)||':'||json_extract(questions,'$[0].text') FROM habits "
"WHERE name='" + name + "' AND deleted_at=0"),
"Set every option before creating:2:126:1:How did it go?",
"Set every option before creating:77:126:1:How did it go?",
"new habit keeps details, schedule, practices and questions")
print("PASS new-habit details, schedule, difficulty, coins, counter, span, "
f"practices and questions at {width}px")
+27
View File
@@ -1157,6 +1157,32 @@ test_habit_wallet :: () {
storage_close()
}
// Saved icon numbers remain stable as the writing choices grow.
test_habit_writing_icons :: () {
root := make_root("habit-writing-icons")
check_true("writing database opens", storage_init(root) != 0)
habits_a = Habits.{}
check_true("new writing habit", habits_add_custom(*habits_a, "Write", Blue(),
HABIT_SYNC_NONE, 0) >= 0)
names: [8]string = .["diary", "notebook", "pen", "pencil", "edit_2", "document_2", "keyboard", "bulb"]
for index: cast(s32)0..7 {
icon := 77 + index
check_true("writing symbol has its stable name and drawing",
HabitIconName(icon) == names[index] && HabitIconNumber(names[index]) == icon &&
HabitIconShape(icon).count > 0)
habits_a.items[0].icon = icon
habits_save(*habits_a)
habits_free(*habits_a)
habits_a = Habits.{}
check_true("reload writing habit", storage_habits_load(cast(*void)*habits_a) != 0)
check_int("writing symbol survives reload", habits_a.items[0].icon, icon)
}
check_true("existing symbols keep their numbers", HabitIconNumber("book") == 25 &&
HabitIconNumber("quill_pen") == 26 && HabitIconNumber("soda") == 76)
habits_free(*habits_a)
storage_close()
}
#program_export
Check :: () -> s32 {
guard := support_begin("/tmp/inbe-storage-habits-zi-test/")
@@ -1183,6 +1209,7 @@ Check :: () -> s32 {
test_stale_copy_keeps_synced_values()
test_habit_wallet()
test_habit_backdated_coins()
test_habit_writing_icons()
test_new_habit_recent_coins()
test_habit_shop_order_and_borrow_sync()
test_zero_target_and_custom_coins()
+4 -4
View File
@@ -6,8 +6,8 @@ IDI_APP_ICON ICON "inbe.ico"
IDI_NOTIFICATION_ICON ICON "inbe.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,1,50,0
PRODUCTVERSION 2,1,50,0
FILEVERSION 2,1,51,0
PRODUCTVERSION 2,1,51,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -24,11 +24,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "waozi"
VALUE "FileDescription", "Inner Breeze"
VALUE "FileVersion", "2.1.50"
VALUE "FileVersion", "2.1.51"
VALUE "InternalName", "breeze"
VALUE "OriginalFilename", "breeze-windows-x86_64.exe"
VALUE "ProductName", "Inner Breeze"
VALUE "ProductVersion", "2.1.50"
VALUE "ProductVersion", "2.1.51"
END
END
BLOCK "VarFileInfo"