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

rename

Browse Source
This commit is contained in:
ろむねこ 2024-07-09 16:22:23 +09:00
parent cc5560745f
commit 94f47982f7
Signed by: Fujimatsu
GPG Key ID: FA1F39A1BA37D168
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/one/nem/kidshift/MainActivity.java
View File

@ -184,9 +184,10 @@ public class MainActivity extends AppCompatActivity {
} else {
parentData.getParentDirect().thenAccept(parentModel -> {
((TextView) view.findViewById(R.id.userNameTextView)).setText(parentModel.getName());
logger.debug("ParentModel: " + parentModel.getName() + ", " + parentModel.getEmail());
((TextView) view.findViewById(R.id.emailTextView)).setText(parentModel.getEmail());
((Chip) view.findViewById(R.id.chip)).setText("保護者/Parent");
});
}).join();
}
view.findViewById(R.id.userNameEditButton).setOnClickListener(v -> {
@ -220,7 +221,7 @@ public class MainActivity extends AppCompatActivity {
new MaterialAlertDialogBuilder(this)
.setTitle("アカウント情報")
.setMessage("Placeholder")
.setView(view)
.setPositiveButton("OK", (dialog, which) -> {
// Do nothing
})

2
data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/ParentModelConverter.java
View File

@ -11,7 +11,7 @@ public class ParentModelConverter {
* @return ParentModel
*/
public static ParentModel parentInfoResponseToParentModel(ParentInfoResponse parentInfoResponse) {
return new ParentModel(parentInfoResponse.getId(), parentInfoResponse.getDisplayName(), parentInfoResponse.getEmail());
return new ParentModel(parentInfoResponse.getId(), parentInfoResponse.getDisplay_name(), parentInfoResponse.getEmail());
}
/**

16
data/src/main/java/one/nem/kidshift/data/retrofit/model/parent/ParentInfoResponse.java
View File

@ -4,18 +4,18 @@ public class ParentInfoResponse {
private String id;
private String email;
private String displayName;
private String display_name;
/**
* コンストラクタ (全プロパティ)
* @param id 親ID
* @param email メールアドレス
* @param displayName 表示名
* @param display_name 表示名
*/
public ParentInfoResponse(String id, String email, String displayName) {
public ParentInfoResponse(String id, String email, String display_name) {
this.id = id;
this.email = email;
this.displayName = displayName;
this.display_name = display_name;
}
public String getId() {
@ -26,8 +26,8 @@ public class ParentInfoResponse {
return email;
}
public String getDisplayName() {
return displayName;
public String getDisplay_name() {
return display_name;
}
public void setId(String id) {
@ -38,7 +38,7 @@ public class ParentInfoResponse {
this.email = email;
}
public void setDisplayName(String displayName) {
this.displayName = displayName;
public void setDisplay_name(String display_name) {
this.display_name = display_name;
}
}