Commit Graph

951 Commits

Author SHA1 Message Date
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
f1b98c5362
修正 2024-07-02 16:48:22 +09:00
da0a65c8bd
修正 2024-07-02 16:47:38 +09:00
d62d98da2a
修正 2024-07-02 16:46:25 +09:00
3e2fe085a2
修正 2024-07-02 16:45:21 +09:00
7aa0157a53
修正 2024-07-02 16:45:03 +09:00
23111f9ba7
修正 2024-07-02 16:43:29 +09:00
a9a19e6985
修正 2024-07-02 16:42:55 +09:00
7dc8abe6e3
修正 2024-07-02 16:42:34 +09:00
48c4a0da01
修正 2024-07-02 16:42:10 +09:00
f779f6875e
修正 2024-07-02 16:40:30 +09:00
f17f8e0208
修正 2024-07-02 16:39:53 +09:00
0b90ae4bcb
修正 2024-07-02 16:39:13 +09:00
64cd7238a8
アノテーション修正 2024-07-02 16:38:57 +09:00
57b3c384d6
引数に空配列を渡していたので修正 2024-07-02 16:37:24 +09:00
bafe40e096
ChildLogger機能を削除, FactoryInjectionに切り替え 2024-07-02 16:35:58 +09:00
01b0697f55 子供のチェックボックス左寄せしたよん 2024-07-02 16:32:09 +09:00
b3d95b9ba3 Merge pull request 'improve/improveJul2' (#116) from improve/improveJul2 into main
Reviewed-on: #116
2024-07-02 06:31:18 +00:00
756b678f61
未使用削除 2024-07-02 15:27:26 +09:00
6bcb2aec3d
final化 2024-07-02 15:27:16 +09:00
f386a99857
final化 2024-07-02 15:26:58 +09:00
5674c7ac46
final化 2024-07-02 15:26:23 +09:00
0a595f5a81
リファクタリング 2024-07-02 15:17:31 +09:00
a4d08f7595
消し忘れコメントを削除 2024-07-02 15:15:08 +09:00
5e89d51f90
比較して正しいコールバックを呼ぶように 2024-07-02 15:14:40 +09:00
558ebd439c Merge pull request '子供のチェックボックス左寄せしたよん' (#115) from feature/add_task_menu into main
Reviewed-on: #115
2024-07-02 05:27:14 +00: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
37a9f60197 Merge pull request 'ぐるぐるさせました' (#111) from parent_swipe into main
Reviewed-on: #111
2024-07-02 05:23:42 +00: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
3f548617a0
fix duplicate 2024-07-02 14:15:00 +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
39f12f77fc Merge pull request 'workaround' (#114) from hotfix/hotfix1 into main
Reviewed-on: #114
2024-07-02 05:02:59 +00:00
e1f6d4d361 親の名前出したよ 2024-07-02 14:02:05 +09:00
a28ec3b065
workaround 2024-07-02 13:58:28 +09:00
318397e1d3 Merge pull request 'JavaDoc追加' (#112) from improve/fixJavaDoc into main
Reviewed-on: #112
2024-07-01 03:25:30 +00:00
a2a2b75a60
消し忘れ 2024-07-01 12:24:48 +09:00
885059a1e4
消し忘れ 2024-07-01 12:24:42 +09:00
f105b853ed
JavaDoc 2024-07-01 12:24:27 +09:00
1e7fc1ab87
JavaDoc 2024-07-01 12:23:48 +09:00