|
|
606aa12960
|
トグルするように
|
2024-07-05 10:46:15 +09:00 |
|
|
|
e661285428
|
WIP
|
2024-07-05 10:44:44 +09:00 |
|
|
|
2d1db02cb0
|
デバッグ用ボタン追加
|
2024-07-05 10:42:22 +09:00 |
|
|
|
0474b4455b
|
設定のLoginDialogやりました
|
2024-07-03 16:16:16 +09:00 |
|
|
|
b7607a8a5c
|
改行整理
|
2024-07-02 23:16:19 +09:00 |
|
|
|
30f187a424
|
requireContextに変更
|
2024-07-02 23:16:04 +09:00 |
|
|
|
5f7d578535
|
名前をわかりやすく
|
2024-07-02 23:15:42 +09:00 |
|
|
|
9c441056d3
|
コメント追加, 並べ替え
|
2024-07-02 23:14:40 +09:00 |
|
|
|
a51301ca6c
|
typo修正
|
2024-07-02 23:13:04 +09:00 |
|
|
|
b86176216a
|
JavaDoc追加
|
2024-07-02 23:12:34 +09:00 |
|
|
|
fdc0da9c43
|
try-catchを共通化
|
2024-07-02 23:09:10 +09:00 |
|
|
|
049db1d590
|
インデント修正
|
2024-07-02 23:04:02 +09:00 |
|
|
|
990f45d821
|
呼び出し忘れ修正
|
2024-07-02 22:59:08 +09:00 |
|
|
|
e78708c6f6
|
RecyclerView初期化処理修正
|
2024-07-02 22:58:40 +09:00 |
|
|
|
ff0621c524
|
Logger修正追従
|
2024-07-02 22:57:02 +09:00 |
|
|
|
9afca9091f
|
コールバック生成
|
2024-07-02 22:55:50 +09:00 |
|
|
|
865caede14
|
手動マージ
|
2024-07-02 22:55:34 +09:00 |
|
|
|
bfd3f5396e
|
Merge branch 'main' into feature/updateupdate
# Conflicts:
# feature/parent/src/main/java/one/nem/kidshift/feature/parent/ParentMainFragment.java
# feature/setting/src/main/java/one/nem/kidshift/feature/setting/SettingMainFragment.java
|
2024-07-02 22:50:40 +09:00 |
|
|
|
0f9cff0883
|
workaround, 空コールバック追加
|
2024-07-02 22:13:38 +09:00 |
|
|
|
80e19745ba
|
workaround, 空コールバック追加
|
2024-07-02 22:13:21 +09:00 |
|
|
|
42382a5458
|
workaround, 空コールバック追加
|
2024-07-02 22:12:54 +09:00 |
|
|
|
02bb966b03
|
子供のチェックボックス左寄せしたよん
|
2024-07-02 16:56:47 +09:00 |
|
|
|
e56d45f68e
|
修正
|
2024-07-02 16:53:08 +09:00 |
|
|
|
4274847e45
|
修正
|
2024-07-02 16:52:30 +09:00 |
|
|
|
aeddd8b411
|
修正
|
2024-07-02 16:51:48 +09:00 |
|
|
|
e20a92785f
|
修正
|
2024-07-02 16:51:01 +09:00 |
|
|
|
23111f9ba7
|
修正
|
2024-07-02 16:43:29 +09:00 |
|
|
|
01b0697f55
|
子供のチェックボックス左寄せしたよん
|
2024-07-02 16:32:09 +09:00 |
|
|
|
e72d10f71a
|
Merge branch 'main' into feature/add_task_menu
|
2024-07-02 05:27:10 +00:00 |
|
|
|
d27479d28a
|
Merge remote-tracking branch 'origin/feature/add_task_menu' into feature/add_task_menu
|
2024-07-02 14:24:55 +09:00 |
|
|
|
215d354530
|
子供のチェックボックス左寄せしたよん
|
2024-07-02 14:24:34 +09:00 |
|
|
|
fc33c8d217
|
add require params
|
2024-07-02 14:22:57 +09:00 |
|
|
|
3a45dcd859
|
重複した処理を削除
|
2024-07-02 14:19:29 +09:00 |
|
|
|
3ccac23294
|
空行
|
2024-07-02 14:17:47 +09:00 |
|
|
|
8ef35dfb41
|
コールバック生成, workaround
|
2024-07-02 14:17:02 +09:00 |
|
|
|
0194c0fb70
|
fix
|
2024-07-02 14:15:30 +09:00 |
|
|
|
db83de7a37
|
Merge branch 'main' into parent_swipe
# Conflicts:
# feature/parent/src/main/java/one/nem/kidshift/feature/parent/ParentMainFragment.java
# feature/parent/src/main/res/layout/fragment_parent_main.xml
# feature/setting/src/main/java/one/nem/kidshift/feature/setting/SettingMainFragment.java
# gradle/libs.versions.toml
|
2024-07-02 14:13:44 +09:00 |
|
|
|
5ebb269135
|
Merge pull request '親の名前出したよ' (#113) from feature/add_task_menu into main
Reviewed-on: #113
|
2024-07-02 05:05:10 +00:00 |
|
|
|
d5ce31a58e
|
Merge remote-tracking branch 'origin/feature/add_task_menu' into feature/add_task_menu
# Conflicts:
# feature/setting/src/main/java/one/nem/kidshift/feature/setting/SettingMainFragment.java
|
2024-07-02 14:04:40 +09:00 |
|
|
|
e1f6d4d361
|
親の名前出したよ
|
2024-07-02 14:02:05 +09:00 |
|
|
|
a28ec3b065
|
workaround
|
2024-07-02 13:58:28 +09:00 |
|
|
|
db72976607
|
Merge pull request 'feature/login_code_dialog' (#110) from feature/login_code_dialog into main
Reviewed-on: #110
|
2024-07-01 02:55:54 +00:00 |
|
|
|
120200e8e5
|
Merge pull request 'improve/refactorJul1' (#109) from improve/refactorJul1 into main
Reviewed-on: #109
|
2024-07-01 02:55:27 +00:00 |
|
|
|
3e06c26ce8
|
workaround
|
2024-07-01 11:54:30 +09:00 |
|
|
|
3db5914f95
|
プロパティ名修正
|
2024-07-01 11:54:19 +09:00 |
|
|
|
008a437d19
|
重複削除
|
2024-07-01 11:54:08 +09:00 |
|
|
|
7b445fd007
|
プロパティ名修正
|
2024-07-01 11:53:51 +09:00 |
|
|
|
666c4b0657
|
Merge branch 'main' into feature/settingmainfragment
# Conflicts:
# feature/setting/src/main/java/one/nem/kidshift/feature/setting/SettingMainFragment.java
|
2024-07-01 11:53:27 +09:00 |
|
|
|
c1b1cdcd1c
|
Merge pull request 'feature/parent_login' (#107) from feature/parent_login into main
Reviewed-on: #107
|
2024-07-01 02:49:29 +00:00 |
|
|
|
51da4bce63
|
workaround
|
2024-07-01 11:48:09 +09:00 |
|
