kidshift/KidShift
3
0
Fork 0
Code Issues 9 Pull Requests Wiki Activity

Merge pull request 'hotfix/hotfix' (#97) from hotfix/hotfix into main

Browse Source 
Reviewed-on: #97
This commit is contained in:
Fujimatsu 2024-06-28 03:57:00 +00:00
commit 86a5cb8d04
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
feature/parent/src/main/java/one/nem/kidshift/feature/parent/ParentMainFragment.java
View File

@ -71,7 +71,7 @@ public class ParentMainFragment extends Fragment {
RecyclerView.LayoutManager layoutManager1 = new LinearLayoutManager(getContext());
recyclerView1.setLayoutManager(layoutManager1);
List<ChildModel> child = childData.getChildList();
List<ChildModel> child = childData.getChildList().join();
RecyclerView.Adapter mainAdapter1 = new ChildListAdapter(child);
recyclerView1.setAdapter(mainAdapter1);

7
feature/setting/src/main/java/one/nem/kidshift/feature/setting/SettingMainFragment.java
View File

@ -131,13 +131,14 @@ public class SettingMainFragment extends Fragment {
// Pull-to-refresh（スワイプで更新）
SwipeRefreshLayout swipeRefreshLayout = view.findViewById(R.id.swipe_refresh_layout);
ParentModel finalParent = parent;
swipeRefreshLayout.setOnRefreshListener(() ->{
TextView username = view.findViewById(R.id.username);
TextView useradress = view.findViewById(R.id.useradress);
username.setText(parent.getDisplayName());
useradress.setText(parent.getEmail());
username.setText(finalParent.getDisplayName());
useradress.setText(finalParent.getEmail());
RecyclerView recyclerView = view.findViewById(R.id.childrecyclerview);
@ -146,7 +147,7 @@ public class SettingMainFragment extends Fragment {
RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(getContext());
recyclerView.setLayoutManager(layoutManager);
List<ChildModel> child = childData.getChildList();
List<ChildModel> child = childData.getChildList().join();
RecyclerView.Adapter mainAdapter = new SettingAdapter(child);
recyclerView.setAdapter(mainAdapter);

5
gradle/libs.versions.toml
View File

@ -11,11 +11,14 @@ constraintlayout = "2.1.4"
nav = "2.7.7"
swiperefreshlayout = "1.1.0"
retrofit = "2.11.0"
room = "2.5.0"
room = "2.6.1"
javafaker = "1.0.2"
[libraries]
converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
junit = { group = "junit", name = "junit", version.ref = "junit" }
javafaker = { module = "com.github.javafaker:javafaker", version.ref = "javafaker" }
ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }