diff --git a/app/src/main/java/com/example/cosmosclient/views/Signin.java b/app/src/main/java/com/example/cosmosclient/views/Signin.java index d5ed0b2..08ae5bc 100644 --- a/app/src/main/java/com/example/cosmosclient/views/Signin.java +++ b/app/src/main/java/com/example/cosmosclient/views/Signin.java @@ -7,6 +7,6 @@ import retrofit2.http.Path; public interface Signin { - @POST("/users/{uId}/login") + @POST("users/{uId}/login") Call loginList(@Path("uId") String uId, @Path("pw")String pw); } diff --git a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java index 9d15889..d29bb2e 100644 --- a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java @@ -32,12 +32,14 @@ //retrofitの処理 final Retrofit retrofit = new Retrofit.Builder() - .baseUrl("nitta-lab-www.is.konan-u.ac.jp") + .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/cosmos/") .addConverterFactory(JacksonConverterFactory.create()) .build(); //interfaceから実装を取得 final Signin signin = retrofit.create(Signin.class); + + //Sign inボタンの処理 SigninButton.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/example/cosmosclient/views/Signup.java b/app/src/main/java/com/example/cosmosclient/views/Signup.java index 9e83c16..c42c962 100644 --- a/app/src/main/java/com/example/cosmosclient/views/Signup.java +++ b/app/src/main/java/com/example/cosmosclient/views/Signup.java @@ -5,7 +5,7 @@ import retrofit2.http.Path; public interface Signup { - @POST("/users") + @POST("users") //icon-image一応入れてる Call listUser(@Path("name") String name,@Path("pw") String pw,@Path("icon-image") String icon_image); } diff --git a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java index 228babb..58747fd 100644 --- a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java @@ -29,7 +29,7 @@ //retrofitの処理 final Retrofit retrofit = new Retrofit.Builder() - .baseUrl("nitta-lab-www.is.konan-u.ac.jp") + .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/cosmos/") .addConverterFactory(JacksonConverterFactory.create()) .build(); //interfaceから実装を取得 diff --git a/app/src/main/res/layout/activity_signup.xml b/app/src/main/res/layout/activity_signup.xml index e170878..92cbdbe 100644 --- a/app/src/main/res/layout/activity_signup.xml +++ b/app/src/main/res/layout/activity_signup.xml @@ -99,7 +99,7 @@ android:ems="10" android:hint="@string/confirm_password" android:inputType="textPassword" - android:textSize="14sp" + android:textSize="18sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.445" app:layout_constraintStart_toStartOf="parent" @@ -117,7 +117,7 @@ android:ems="10" android:hint="@string/password" android:inputType="textPassword" - android:textSize="14sp" + android:textSize="18sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.445" app:layout_constraintStart_toStartOf="parent" @@ -135,7 +135,7 @@ android:ems="10" android:hint="@string/e_mail_address" android:inputType="text" - android:textSize="14sp" + android:textSize="18sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.445" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c6b0fa3..7794610 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -9,7 +9,7 @@ ログイン アカウント作成 サインイン - アカウントをお持ちの場合 + アカウントをお持ちではない場合 パスワードを忘れた場合 新規登録 AddMemberActivity