diff --git a/app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java b/app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java index 4fe101d..1ddbd4b 100644 --- a/app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java +++ b/app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java @@ -43,6 +43,7 @@ private final UserResource userResource; private final MutableLiveData user = new MutableLiveData<>(); private final MutableLiveData token = new MutableLiveData<>(); + private final MutableLiveData icon = new MutableLiveData<>(); private final MutableLiveDataloading = new MutableLiveData<>(false); private final MutableLiveData error = new MutableLiveData<>(); @@ -58,6 +59,7 @@ public LiveData getUser() { return user; } public LiveData getToken() { return token; } + public LiveData getIcon() { return icon; } public LiveDataisLoading() { return loading;} public LiveData getError() { return error; } @@ -104,5 +106,43 @@ }); } + //アイコン + public void getIcon(String id) { + Call call = userResource.getIcon(id); + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + if (response.isSuccessful()) { + icon.setValue(response.body()); + System.out.println(response.code()); + } else { + System.out.println(response.code()); + } + } + @Override public void onFailure(Call call, Throwable t) { + System.out.println("エラー: " + t.getMessage()); + } + }); + } + + public void updateIcon(String id, String newIcon, String token) { + Call call = userResource.updateIcon(id, newIcon, token); + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + if (response.isSuccessful()) { + icon.setValue(response.body()); + System.out.println(response.code()); + + } else { + System.out.println(response.code()); + } + } + @Override public void onFailure(Call call, Throwable t) { + System.out.println("エラー: " + t.getMessage()); + } + }); + } + //viewModelのところでを呼び出すがフレンド系は西村さんの方で管理する } diff --git a/app/src/main/res/layout/activity_launch.xml b/app/src/main/res/layout/activity_launch.xml index cc3237c..0bbb192 100644 --- a/app/src/main/res/layout/activity_launch.xml +++ b/app/src/main/res/layout/activity_launch.xml @@ -6,7 +6,8 @@ android:id="@+id/main" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".views.LaunchActivity"> + tools:context=".views.LaunchActivity" + android:background="#E0F7FA"> + tools:context=".views.RegisterActivity" + android:background="#E0F7FA">