diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7ec1c97..0fbac27 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -45,6 +45,7 @@ implementation(libs.converter.jackson) implementation(libs.navigation.runtime.android) implementation (libs.material.v1100) + implementation(libs.converter.scalars) testImplementation(libs.junit) androidTestImplementation(libs.ext.junit) androidTestImplementation(libs.espresso.core) diff --git a/app/src/main/java/com/example/tampopo_client/viewmodels/FriendViewModel.java b/app/src/main/java/com/example/tampopo_client/viewmodels/FriendViewModel.java index 9c4005c..91b8021 100644 --- a/app/src/main/java/com/example/tampopo_client/viewmodels/FriendViewModel.java +++ b/app/src/main/java/com/example/tampopo_client/viewmodels/FriendViewModel.java @@ -14,6 +14,7 @@ import retrofit2.Response; import retrofit2.Retrofit; import retrofit2.converter.jackson.JacksonConverterFactory; +import retrofit2.converter.scalars.ScalarsConverterFactory; import retrofit2.http.Field; public class FriendViewModel extends ViewModel { @@ -27,6 +28,7 @@ public FriendViewModel(){ this.retrofit = new Retrofit.Builder() .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/tampopo/") + .addConverterFactory(ScalarsConverterFactory.create()) .addConverterFactory(JacksonConverterFactory.create()) .build(); this.usersResource = retrofit.create(UserResource.class); 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 f16fdf6..4fe101d 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 @@ -12,6 +12,7 @@ import retrofit2.Response; import retrofit2.Retrofit; import retrofit2.converter.jackson.JacksonConverterFactory; +import retrofit2.converter.scalars.ScalarsConverterFactory; /*userだけなのでサーバーから情報を取ってくることは名前の変更 viewModelはviewからrequestをもらってmodelに流す @@ -49,6 +50,7 @@ public UserViewModel(){ this.retrofit = new Retrofit.Builder() .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/tampopo/") + .addConverterFactory(ScalarsConverterFactory.create()) .addConverterFactory(JacksonConverterFactory.create()) .build(); this.userResource = retrofit.create(UserResource.class); diff --git a/app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java b/app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java index 625e438..759f6b6 100644 --- a/app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java +++ b/app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java @@ -62,16 +62,15 @@ //アカウントの確認、問題なければ通信 - if (userViewModel.getUser().getValue() != null) { + //if (userViewModel.getUser().getValue() != null) { userViewModel.login(userId, password); tampopo.setUserId(userId); tampopo.setPassword(password); Intent intent = new Intent(RegisterActivity.this, MainActivity.class); startActivity(intent); - } else { - Toast.makeText(RegisterActivity.this, "アカウント作成に失敗しました", Toast.LENGTH_SHORT).show(); - } - +// } else { +// Toast.makeText(RegisterActivity.this, "アカウント作成に失敗しました", Toast.LENGTH_SHORT).show(); +// } } }); diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e181c51..561933d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,6 +16,7 @@ navigationRuntimeAndroid = "2.9.0" navigation = "2.6.0" viewpager2 = "1.0.0" +converterScalars = "3.0.0" [libraries] junit = { group = "junit", name = "junit", version.ref = "junit" } @@ -35,6 +36,7 @@ navigation-fragment = { module = "androidx.navigation:navigation-fragment", version.ref = "navigation" } navigation-ui = { module = "androidx.navigation:navigation-ui", version.ref = "navigation" } viewpager2 = { group = "androidx.viewpager2", name = "viewpager2", version.ref = "viewpager2" } +converter-scalars = { group = "com.squareup.retrofit2", name = "converter-scalars", version.ref = "converterScalars" } [plugins]