From dd198b239f6fb09bca755525e89150533835da6f Mon Sep 17 00:00:00 2001 From: rca Date: Sat, 29 Jun 2024 04:58:26 +0900 Subject: [PATCH 01/16] =?UTF-8?q?UserBaseModel=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../one/nem/kidshift/model/UserBaseModel.java | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 model/src/main/java/one/nem/kidshift/model/UserBaseModel.java diff --git a/model/src/main/java/one/nem/kidshift/model/UserBaseModel.java b/model/src/main/java/one/nem/kidshift/model/UserBaseModel.java new file mode 100644 index 0000000..af0fb20 --- /dev/null +++ b/model/src/main/java/one/nem/kidshift/model/UserBaseModel.java @@ -0,0 +1,35 @@ +package one.nem.kidshift.model; + +public class UserBaseModel { + + private String id; + private String name; + + public UserBaseModel(String id, String name) { + this.id = id; + this.name = name; + } + + public UserBaseModel(String name) { + this.name = name; + } + + public UserBaseModel() { + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} From c01e8e4a92acc28e6f6a21c81ef151dea59436bc Mon Sep 17 00:00:00 2001 From: rca Date: Sat, 29 Jun 2024 04:59:23 +0900 Subject: [PATCH 02/16] =?UTF-8?q?ChildModel=E3=82=92UserBaseModel=E3=81=8B?= =?UTF-8?q?=E3=82=89=E7=B6=99=E6=89=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../one/nem/kidshift/model/ChildModel.java | 47 +------------------ 1 file changed, 2 insertions(+), 45 deletions(-) diff --git a/model/src/main/java/one/nem/kidshift/model/ChildModel.java b/model/src/main/java/one/nem/kidshift/model/ChildModel.java index 3dd8c38..627256e 100644 --- a/model/src/main/java/one/nem/kidshift/model/ChildModel.java +++ b/model/src/main/java/one/nem/kidshift/model/ChildModel.java @@ -1,50 +1,7 @@ package one.nem.kidshift.model; -// TODO: parent, childを共通クラスから継承させる -public class ChildModel { - String internalId; - String displayName; - String homeGroupId; +public class ChildModel extends UserBaseModel { - public ChildModel(String internalId, String displayName, String homeGroupId) { - this.internalId = internalId; - this.displayName = displayName; - this.homeGroupId = homeGroupId; - } + // Additional fields - public ChildModel(String internalId, String displayName) { - this.internalId = internalId; - this.displayName = displayName; - } - - public ChildModel(String internalId) { - this.internalId = internalId; - } - - public ChildModel() { - } - - public String getInternalId() { - return internalId; - } - - public void setInternalId(String internalId) { - this.internalId = internalId; - } - - public String getDisplayName() { - return displayName; - } - - public void setDisplayName(String displayName) { - this.displayName = displayName; - } - - public String getHomeGroupId() { - return homeGroupId; - } - - public void setHomeGroupId(String homeGroupId) { - this.homeGroupId = homeGroupId; - } } From 72c32b73c3eb8775053d04d131e4052be25af7c4 Mon Sep 17 00:00:00 2001 From: rca Date: Sat, 29 Jun 2024 05:01:09 +0900 Subject: [PATCH 03/16] =?UTF-8?q?ParentModel=E3=82=92UserBaseModel?= =?UTF-8?q?=E3=81=8B=E3=82=89=E7=B6=99=E6=89=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../one/nem/kidshift/model/ParentModel.java | 54 ++++--------------- 1 file changed, 11 insertions(+), 43 deletions(-) diff --git a/model/src/main/java/one/nem/kidshift/model/ParentModel.java b/model/src/main/java/one/nem/kidshift/model/ParentModel.java index 81a7a89..c6f51ea 100644 --- a/model/src/main/java/one/nem/kidshift/model/ParentModel.java +++ b/model/src/main/java/one/nem/kidshift/model/ParentModel.java @@ -1,65 +1,33 @@ package one.nem.kidshift.model; // TODO: parent, childを共通クラスから継承させる -public class ParentModel { - String internalId; - String displayName; - String homeGroupId; - String email; +public class ParentModel extends UserBaseModel { - public ParentModel(String internalId, String displayName, String homeGroupId, String email) { - this.internalId = internalId; - this.displayName = displayName; - this.homeGroupId = homeGroupId; + private String email; + + public ParentModel(String id, String name, String email) { + super(id, name); this.email = email; } - public ParentModel(String internalId, String displayName, String homeGroupId) { - this.internalId = internalId; - this.displayName = displayName; - this.homeGroupId = homeGroupId; + private ParentModel(UserBaseModel userBaseModel, String email) { + super(userBaseModel.getId().isEmpty() ? null : userBaseModel.getId(), userBaseModel.getName()); + this.email = email; } - public ParentModel(String internalId, String displayName) { - this.internalId = internalId; - this.displayName = displayName; + public ParentModel(String name, String email) { + super(name); + this.email = email; } public ParentModel() { } - // Getter - - public String getInternalId() { - return internalId; - } - - public String getDisplayName() { - return displayName; - } - - public String getHomeGroupId() { - return homeGroupId; - } public String getEmail() { return email; } - // Setter - - public void setInternalId(String internalId) { - this.internalId = internalId; - } - - public void setDisplayName(String displayName) { - this.displayName = displayName; - } - - public void setHomeGroupId(String homeGroupId) { - this.homeGroupId = homeGroupId; - } - public void setEmail(String email) { this.email = email; } From 2a368bfcd4ca8cbe65f654ef1bd9436cf9c5510c Mon Sep 17 00:00:00 2001 From: rca Date: Sat, 29 Jun 2024 05:02:11 +0900 Subject: [PATCH 04/16] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/src/main/java/one/nem/kidshift/model/ParentModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/src/main/java/one/nem/kidshift/model/ParentModel.java b/model/src/main/java/one/nem/kidshift/model/ParentModel.java index c6f51ea..bc68036 100644 --- a/model/src/main/java/one/nem/kidshift/model/ParentModel.java +++ b/model/src/main/java/one/nem/kidshift/model/ParentModel.java @@ -1,8 +1,8 @@ package one.nem.kidshift.model; -// TODO: parent, childを共通クラスから継承させる public class ParentModel extends UserBaseModel { + private String email; public ParentModel(String id, String name, String email) { From 422d01c32456a8f16c8eadec3f234b746df93993 Mon Sep 17 00:00:00 2001 From: rca Date: Sat, 29 Jun 2024 05:05:19 +0900 Subject: [PATCH 05/16] =?UTF-8?q?Converter=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/converter/ParentModelConverter.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/ParentModelConverter.java diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/ParentModelConverter.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/ParentModelConverter.java new file mode 100644 index 0000000..0f5148f --- /dev/null +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/ParentModelConverter.java @@ -0,0 +1,23 @@ +package one.nem.kidshift.data.retrofit.model.converter; + +import one.nem.kidshift.data.retrofit.model.parent.ParentInfoResponse; +import one.nem.kidshift.model.ParentModel; + +public class ParentModelConverter { + public static ParentModel parentListResponseToParentModel(ParentInfoResponse parentInfoResponse) { + return new ParentModel(parentInfoResponse.getId(), parentInfoResponse.getDisplayName(), parentInfoResponse.getEmail()); + } + + public static ParentModel parentInfoResponseToParentModel(ParentInfoResponse parentInfoResponse) { + return new ParentModel(parentInfoResponse.getId(), parentInfoResponse.getDisplayName(), parentInfoResponse.getEmail()); + } + + public static ParentInfoResponse parentModelToParentInfoResponse(ParentModel parentModel) { + return new ParentInfoResponse(parentModel.getId(), parentModel.getName(), parentModel.getEmail()); + } + + public static ParentModel parentModelToParentModel(ParentModel parentModel) { + return new ParentModel(parentModel.getId(), parentModel.getName(), parentModel.getEmail()); + } + +} From c60398e96c6b244d52b0c702aa61605141728589 Mon Sep 17 00:00:00 2001 From: rca Date: Sat, 29 Jun 2024 05:06:08 +0900 Subject: [PATCH 06/16] =?UTF-8?q?=E3=83=9F=E3=82=B9=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../retrofit/model/converter/ParentModelConverter.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/ParentModelConverter.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/ParentModelConverter.java index 0f5148f..dde708c 100644 --- a/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/ParentModelConverter.java +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/ParentModelConverter.java @@ -4,9 +4,6 @@ import one.nem.kidshift.data.retrofit.model.parent.ParentInfoResponse; import one.nem.kidshift.model.ParentModel; public class ParentModelConverter { - public static ParentModel parentListResponseToParentModel(ParentInfoResponse parentInfoResponse) { - return new ParentModel(parentInfoResponse.getId(), parentInfoResponse.getDisplayName(), parentInfoResponse.getEmail()); - } public static ParentModel parentInfoResponseToParentModel(ParentInfoResponse parentInfoResponse) { return new ParentModel(parentInfoResponse.getId(), parentInfoResponse.getDisplayName(), parentInfoResponse.getEmail()); @@ -16,8 +13,4 @@ public class ParentModelConverter { return new ParentInfoResponse(parentModel.getId(), parentModel.getName(), parentModel.getEmail()); } - public static ParentModel parentModelToParentModel(ParentModel parentModel) { - return new ParentModel(parentModel.getId(), parentModel.getName(), parentModel.getEmail()); - } - } From 2f2091e394db4f2ba9e29d335959a431b7aabbc0 Mon Sep 17 00:00:00 2001 From: rca Date: Sat, 29 Jun 2024 05:11:04 +0900 Subject: [PATCH 07/16] =?UTF-8?q?ChildAddRequest,=20ChildListResponse?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/converter/ChildModelConverter.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/ChildModelConverter.java diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/ChildModelConverter.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/ChildModelConverter.java new file mode 100644 index 0000000..5717f54 --- /dev/null +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/ChildModelConverter.java @@ -0,0 +1,29 @@ +package one.nem.kidshift.data.retrofit.model.converter; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +import one.nem.kidshift.data.retrofit.model.child.ChildAddRequest; +import one.nem.kidshift.data.retrofit.model.child.ChildListResponse; +import one.nem.kidshift.data.retrofit.model.child.ChildResponse; +import one.nem.kidshift.model.ChildModel; + +public class ChildModelConverter { + + public static ChildAddRequest childModelToChildAddRequest(ChildModel childModel) { + ChildAddRequest request = new ChildAddRequest(); + request.setName(childModel.getName()); + return request; + } + + public static List childListResponseToChildModelList(ChildListResponse childListResponse) { + return childListResponse.getList().stream().map(child -> { + ChildModel model = new ChildModel(); + model.setName(child.getName()); + model.setId(child.getId()); + return model; + }).collect(Collectors.toList()); + } + +} From bc9d15ab42eb36b157331af830603a192bb1f813 Mon Sep 17 00:00:00 2001 From: rca Date: Sat, 29 Jun 2024 05:12:20 +0900 Subject: [PATCH 08/16] =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=83=A9=E3=82=AF=E3=82=BF=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/one/nem/kidshift/model/ChildModel.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/model/src/main/java/one/nem/kidshift/model/ChildModel.java b/model/src/main/java/one/nem/kidshift/model/ChildModel.java index 627256e..3add88d 100644 --- a/model/src/main/java/one/nem/kidshift/model/ChildModel.java +++ b/model/src/main/java/one/nem/kidshift/model/ChildModel.java @@ -4,4 +4,15 @@ public class ChildModel extends UserBaseModel { // Additional fields + public ChildModel(String id, String name) { + super(id, name); + } + + public ChildModel(String name) { + super(name); + } + + public ChildModel() { + } + } From ce138bd9627af957a1f1603793785142be359847 Mon Sep 17 00:00:00 2001 From: rca Date: Sat, 29 Jun 2024 05:12:32 +0900 Subject: [PATCH 09/16] =?UTF-8?q?Converter=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/retrofit/model/converter/ChildModelConverter.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/ChildModelConverter.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/ChildModelConverter.java index 5717f54..408ba82 100644 --- a/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/ChildModelConverter.java +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/ChildModelConverter.java @@ -26,4 +26,8 @@ public class ChildModelConverter { }).collect(Collectors.toList()); } + public static ChildModel childResponseToChildModel(ChildResponse childResponse) { + return new ChildModel(childResponse.getId(), childResponse.getName()); + } + } From 4c13265a27779e9725fe0265cece348d3c2122f9 Mon Sep 17 00:00:00 2001 From: rca Date: Sat, 29 Jun 2024 05:13:05 +0900 Subject: [PATCH 10/16] =?UTF-8?q?=E5=8A=B9=E7=8E=87=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/retrofit/model/converter/ChildModelConverter.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/ChildModelConverter.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/ChildModelConverter.java index 408ba82..697c0ff 100644 --- a/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/ChildModelConverter.java +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/ChildModelConverter.java @@ -18,12 +18,7 @@ public class ChildModelConverter { } public static List childListResponseToChildModelList(ChildListResponse childListResponse) { - return childListResponse.getList().stream().map(child -> { - ChildModel model = new ChildModel(); - model.setName(child.getName()); - model.setId(child.getId()); - return model; - }).collect(Collectors.toList()); + return childListResponse.getList().stream().map(ChildModelConverter::childResponseToChildModel).collect(Collectors.toList()); } public static ChildModel childResponseToChildModel(ChildResponse childResponse) { From e2542d7080d5baa24feba0ae8af2d2184710de64 Mon Sep 17 00:00:00 2001 From: rca Date: Sat, 29 Jun 2024 05:15:57 +0900 Subject: [PATCH 11/16] =?UTF-8?q?=E5=AE=9F=E8=A3=85=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/one/nem/kidshift/data/impl/ChildDataImpl.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/data/src/main/java/one/nem/kidshift/data/impl/ChildDataImpl.java b/data/src/main/java/one/nem/kidshift/data/impl/ChildDataImpl.java index fd77791..1eb718e 100644 --- a/data/src/main/java/one/nem/kidshift/data/impl/ChildDataImpl.java +++ b/data/src/main/java/one/nem/kidshift/data/impl/ChildDataImpl.java @@ -9,6 +9,7 @@ import javax.inject.Inject; import one.nem.kidshift.data.ChildData; import one.nem.kidshift.data.retrofit.KidShiftApiService; import one.nem.kidshift.data.retrofit.model.child.ChildListResponse; +import one.nem.kidshift.data.retrofit.model.converter.ChildModelConverter; import one.nem.kidshift.model.ChildModel; import one.nem.kidshift.utils.KSLogger; import retrofit2.Call; @@ -41,13 +42,8 @@ public class ChildDataImpl implements ChildData { ChildListResponse body = response.body(); if (body == null) return null; - return body.getList().stream().map(child -> { - ChildModel model = new ChildModel(); - model.setDisplayName(child.getName().isEmpty() ? child.getId() : child.getName()); - model.setInternalId(child.getId()); - // 他のプロパティも処理する - return model; - }).collect(Collectors.toList()); + + return ChildModelConverter.childListResponseToChildModelList(body); } catch (Exception e) { logger.error(e.getMessage()); return null; From 04d85134bc87d9488894f6bc8a3b5cafe91bdae7 Mon Sep 17 00:00:00 2001 From: rca Date: Sat, 29 Jun 2024 05:17:15 +0900 Subject: [PATCH 12/16] =?UTF-8?q?=E5=AE=9F=E8=A3=85=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/one/nem/kidshift/data/impl/KSActionsImpl.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/data/src/main/java/one/nem/kidshift/data/impl/KSActionsImpl.java b/data/src/main/java/one/nem/kidshift/data/impl/KSActionsImpl.java index 6b2558c..264b3f5 100644 --- a/data/src/main/java/one/nem/kidshift/data/impl/KSActionsImpl.java +++ b/data/src/main/java/one/nem/kidshift/data/impl/KSActionsImpl.java @@ -7,6 +7,7 @@ import javax.inject.Inject; import one.nem.kidshift.data.KSActions; import one.nem.kidshift.data.UserSettings; import one.nem.kidshift.data.retrofit.KidShiftApiService; +import one.nem.kidshift.data.retrofit.model.converter.ParentModelConverter; import one.nem.kidshift.data.retrofit.model.parent.ParentInfoResponse; import one.nem.kidshift.data.retrofit.model.task.TaskListResponse; import one.nem.kidshift.model.ParentModel; @@ -70,13 +71,7 @@ public class KSActionsImpl implements KSActions { throw new RuntimeException("Error fetching parent info: " + response.errorBody().string()); } ParentInfoResponse responseBody = response.body(); - ParentModel parent = new ParentModel(); - // TODO: 詰め替えをどこかにまとめる, 他のプロパティも処理する - parent.setInternalId(responseBody.getId()); - parent.setEmail(responseBody.getEmail()); - parent.setDisplayName(responseBody.getEmail()); // Workaround - logger.info("Parent fetched with status: " + response.code()); - logger.debug("Parent: " + parent); + ParentModel parent = ParentModelConverter.parentInfoResponseToParentModel(responseBody); // Save to cache userSettings.getCache().setParent(parent); logger.info("Parent saved to cache"); From a7e1884c23cac222a21e95d2402b47ad52c177bb Mon Sep 17 00:00:00 2001 From: rca Date: Sat, 29 Jun 2024 05:17:32 +0900 Subject: [PATCH 13/16] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/one/nem/kidshift/data/impl/KSActionsImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/src/main/java/one/nem/kidshift/data/impl/KSActionsImpl.java b/data/src/main/java/one/nem/kidshift/data/impl/KSActionsImpl.java index 264b3f5..1608d67 100644 --- a/data/src/main/java/one/nem/kidshift/data/impl/KSActionsImpl.java +++ b/data/src/main/java/one/nem/kidshift/data/impl/KSActionsImpl.java @@ -59,7 +59,7 @@ public class KSActionsImpl implements KSActions { } @Override - public CompletableFuture syncParent() { + public CompletableFuture syncParent() { // TODO-rca: null対処, キャッシュ対応 logger.info("syncParent called and started"); return CompletableFuture.supplyAsync(() -> { logger.info("fetching..."); From 716317d7e95b45a30e52c99ddfb9d33183fc789a Mon Sep 17 00:00:00 2001 From: rca Date: Sat, 29 Jun 2024 05:18:08 +0900 Subject: [PATCH 14/16] =?UTF-8?q?=E5=AE=9F=E8=A3=85=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/one/nem/kidshift/feature/parent/ChildListAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/parent/src/main/java/one/nem/kidshift/feature/parent/ChildListAdapter.java b/feature/parent/src/main/java/one/nem/kidshift/feature/parent/ChildListAdapter.java index a36f5af..20d268c 100644 --- a/feature/parent/src/main/java/one/nem/kidshift/feature/parent/ChildListAdapter.java +++ b/feature/parent/src/main/java/one/nem/kidshift/feature/parent/ChildListAdapter.java @@ -41,7 +41,7 @@ public class ChildListAdapter extends RecyclerView.Adapter Date: Sat, 29 Jun 2024 05:18:31 +0900 Subject: [PATCH 15/16] =?UTF-8?q?=E5=AE=9F=E8=A3=85=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/one/nem/kidshift/feature/setting/SettingAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/setting/src/main/java/one/nem/kidshift/feature/setting/SettingAdapter.java b/feature/setting/src/main/java/one/nem/kidshift/feature/setting/SettingAdapter.java index eb4d6b3..2cb3931 100644 --- a/feature/setting/src/main/java/one/nem/kidshift/feature/setting/SettingAdapter.java +++ b/feature/setting/src/main/java/one/nem/kidshift/feature/setting/SettingAdapter.java @@ -42,7 +42,7 @@ public class SettingAdapter extends RecyclerView.Adapter Date: Sat, 29 Jun 2024 05:19:07 +0900 Subject: [PATCH 16/16] =?UTF-8?q?=E5=AE=9F=E8=A3=85=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nem/kidshift/feature/setting/SettingMainFragment.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/feature/setting/src/main/java/one/nem/kidshift/feature/setting/SettingMainFragment.java b/feature/setting/src/main/java/one/nem/kidshift/feature/setting/SettingMainFragment.java index 104034c..b952dea 100644 --- a/feature/setting/src/main/java/one/nem/kidshift/feature/setting/SettingMainFragment.java +++ b/feature/setting/src/main/java/one/nem/kidshift/feature/setting/SettingMainFragment.java @@ -120,7 +120,7 @@ public class SettingMainFragment extends Fragment { if (parent == null) { parent = new ParentModel(); // Workaround（非ログインデバッグ用） - parent.setDisplayName("親の名前"); + parent.setName("親の名前"); parent.setEmail("親のアドレス"); } @@ -137,7 +137,7 @@ public class SettingMainFragment extends Fragment { TextView username = view.findViewById(R.id.username); TextView useradress = view.findViewById(R.id.useradress); - username.setText(finalParent.getDisplayName()); + username.setText(finalParent.getName()); useradress.setText(finalParent.getEmail()); RecyclerView recyclerView = view.findViewById(R.id.childrecyclerview); @@ -160,7 +160,7 @@ public class SettingMainFragment extends Fragment { TextView username = view.findViewById(R.id.username); TextView useradress = view.findViewById(R.id.useradress); - username.setText(parent.getDisplayName()); + username.setText(parent.getName()); useradress.setText(parent.getEmail()); RecyclerView recyclerView = view.findViewById(R.id.childrecyclerview);