Commit Graph

1027 Commits

Author SHA1 Message Date
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
b15cb685f0 Merge pull request '親の名前出したよ' (#108) from feature/settingmainfragment into main
Reviewed-on: #108
2024-07-01 02:55:13 +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
44c11c4f4f Merge pull request 'feature/showtotalreword' (#106) from feature/showtotalreword into main
Reviewed-on: #106
2024-07-01 02:48:26 +00:00
51da4bce63
workaround 2024-07-01 11:48:09 +09:00
504a43d153
Merge branch 'main' into feature/showtotalreword
# Conflicts:
#	data/src/main/java/one/nem/kidshift/data/impl/RewardDataDummyImpl.java
#	data/src/main/java/one/nem/kidshift/data/impl/TaskDataDummyImpl.java
#	data/src/main/java/one/nem/kidshift/data/modules/RewardDataDummyModule.java
#	data/src/main/java/one/nem/kidshift/data/modules/TaskDataDummyModule.java
2024-07-01 11:47:45 +09:00
100744f05c Merge pull request 'feature/register' (#105) from feature/register into main
Reviewed-on: #105
2024-07-01 02:45:53 +00:00
43be41c67b
不要な引数周りの実装を削除 2024-07-01 11:44:03 +09:00
a94d972048
未使用インポート削除 2024-07-01 11:42:28 +09:00
987f282310 Merge pull request 'タスク取得時DBにキャッシュするように' (#103) from feature/task_cache into main
Reviewed-on: #103
2024-06-30 07:34:59 +00:00
rca
4e3372594c デバッグ用ログ追加 2024-06-30 16:28:47 +09:00
rca
9f1f46c5c4 ログ追加 2024-06-30 16:26:51 +09:00
rca
9f198f61f8 キャッシュ取得処理実装 2024-06-30 16:24:43 +09:00
rca
8d17072ffe ログを日本語に 2024-06-30 16:22:47 +09:00
rca
bde2eb63e8 ログ追加 2024-06-30 16:21:21 +09:00
rca
b3aa1549c9 Workaround: Threadの終了を待つように 2024-06-30 16:15:14 +09:00
rca
0c8eba1cb9 修正 2024-06-30 16:11:20 +09:00
rca
3d8a37ea2d タグ追加処理修正 2024-06-29 16:07:47 +09:00
rca
98bd9275f6 タグ追加処理修正 2024-06-29 16:07:22 +09:00
rca
52ddbe27be ログを日本語に修正 2024-06-29 16:06:10 +09:00
rca
9175d222f2 ログ追加 2024-06-29 16:04:28 +09:00
rca
27548690c8 Logger追加 2024-06-29 16:03:15 +09:00
rca
83c8eb4bda キャッシュがない場合、タスクリストが更新されるまで待機してから返すように 2024-06-29 16:02:04 +09:00
rca
87d4ee6c07 別スレッドで更新を呼ぶようにした 2024-06-29 15:56:50 +09:00
rca
245a651f77 仕様変更に追従 2024-06-29 15:38:03 +09:00
rca
380e660344 Callback追加 2024-06-29 15:37:19 +09:00
rca
08c5c93c1d memo 2024-06-29 11:52:13 +09:00
rca
3a63c431e0 スコープ修正 2024-06-29 11:46:48 +09:00
rca
ae9e6eaf71 WIP 2024-06-29 11:45:35 +09:00
rca
4eb2bd32fd 型修正 2024-06-29 11:44:32 +09:00
rca
b90e0e1545 Callbackを引数として渡すように 2024-06-29 11:43:23 +09:00
rca
40d0979ff3 Callback作成 2024-06-29 11:41:55 +09:00
rca
6e874f6225 暫定エラー回避 2024-06-29 11:40:45 +09:00
rca
5d15a05d79 Inject追加 2024-06-29 11:40:16 +09:00
rca
b4cde1c2e6 fix arg 2024-06-29 11:38:55 +09:00
rca
be9163b7b2 nullの場合の処理を実装 2024-06-29 11:35:59 +09:00
rca
1fd0fd6b1d Linkage更新処理を実装 2024-06-29 11:34:43 +09:00
rca
1ee2860e73 Dao追加 2024-06-29 11:33:53 +09:00
rca
931786320d TaskItemModelにフィールド追加 2024-06-29 11:27:46 +09:00
rca
9ef445e9fc updateCache WIP 2024-06-29 11:24:58 +09:00
rca
a3807e5c57 add join 2024-06-29 11:16:25 +09:00
rca
442dc6df9c fetch周辺実装 2024-06-29 11:14:16 +09:00
rca
8fd9a8d3d8 fix name 2024-06-29 11:11:27 +09:00
rca
9e8b1be1eb fetchTaskListAsync実装 2024-06-29 11:01:41 +09:00