diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e830906..fae94f7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -52,12 +52,12 @@ android:name=".LoginActivity" android:exported="true" android:label="@string/title_activity_login"> - - + + - - + + - - + + - - + + diff --git a/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java b/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java index 42479b7..56add7a 100644 --- a/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java +++ b/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java @@ -41,7 +41,7 @@ public MutableLiveData> getAccountPostsLiveData() { return accountPostsLiveData; } // 対象のアカウント情報の取得 - public void getAccount(String uid) { + public Account getAccount(String uid) { Call call = accountsRest.getAccount(uid); call.enqueue(new Callback() { @@ -58,6 +58,7 @@ System.out.println("correspondence error"); } }); + return null; } // 対象のアカウント情報の削除