diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 63e623f..91e56cf 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -7,11 +7,11 @@ - + - + \ No newline at end of file diff --git a/app/src/main/java/com/example/nemophila/LoginActivity.java b/app/src/main/java/com/example/nemophila/LoginActivity.java index 2366fbf..c724040 100644 --- a/app/src/main/java/com/example/nemophila/LoginActivity.java +++ b/app/src/main/java/com/example/nemophila/LoginActivity.java @@ -40,10 +40,6 @@ nemophila = (Nemophila) this.getApplication(); //Nemophilaにtokenとuidがある場合ログイン画面をスキップ if ((nemophila.getUid() != null) && (nemophila.getToken() != null)){ - //座標指定(仮) - nemophila.setCameraLatitude(defaultLat); - nemophila.setCameraLongitude(defaultLong); - nemophila.setZoom(defaultZoom); Intent intent = new Intent(LoginActivity.this,MapsActivity.class); startActivity(intent); diff --git a/app/src/main/java/com/example/nemophila/SignUpActivity.java b/app/src/main/java/com/example/nemophila/SignUpActivity.java index 4296898..0cba923 100644 --- a/app/src/main/java/com/example/nemophila/SignUpActivity.java +++ b/app/src/main/java/com/example/nemophila/SignUpActivity.java @@ -27,9 +27,9 @@ private Nemophila nemophila; //座標指定 - private double defaultLat = 34.74; - private double defaultLong = 135.26; - private float defaultZoom = 15f; + private double defaultLat = 38.74; + private double defaultLong = 137.26; + private float defaultZoom = 5f; @Override protected void onCreate(Bundle savedInstanceState) { @@ -41,10 +41,6 @@ //Nemophilaにtokenとuidがある場合サインアップ画面をスキップ if ((nemophila.getUid() != null) && (nemophila.getToken() != null)){ - //座標指定(仮) - nemophila.setCameraLatitude(defaultLat); - nemophila.setCameraLongitude(defaultLong); - nemophila.setZoom(defaultZoom); Intent intent = new Intent(SignUpActivity.this,MapsActivity.class); startActivity(intent); diff --git a/app/src/main/java/com/example/nemophila/resources/AccountsRest.java b/app/src/main/java/com/example/nemophila/resources/AccountsRest.java index 83ab4a8..4d2660a 100644 --- a/app/src/main/java/com/example/nemophila/resources/AccountsRest.java +++ b/app/src/main/java/com/example/nemophila/resources/AccountsRest.java @@ -19,8 +19,6 @@ import retrofit2.http.Path; public interface AccountsRest { - @GET("accounts") - Call getAccounts(); @FormUrlEncoded @POST("accounts") diff --git a/app/src/main/java/com/example/nemophila/resources/FriendsRest.java b/app/src/main/java/com/example/nemophila/resources/FriendsRest.java index 85c6305..a5a4d22 100644 --- a/app/src/main/java/com/example/nemophila/resources/FriendsRest.java +++ b/app/src/main/java/com/example/nemophila/resources/FriendsRest.java @@ -69,5 +69,4 @@ @Path("requested_id") String requested_id, @Field("token") String token ); - } diff --git a/app/src/main/java/com/example/nemophila/resources/ShopsRest.java b/app/src/main/java/com/example/nemophila/resources/ShopsRest.java index c781f22..ec79553 100644 --- a/app/src/main/java/com/example/nemophila/resources/ShopsRest.java +++ b/app/src/main/java/com/example/nemophila/resources/ShopsRest.java @@ -34,24 +34,4 @@ @Field("longitude") double longitude, @Field("latitude") double latitude ); - - @GET("shops/{sid}") - Call getShop( - @Path("sid") String sid - ); - - @GET("shops/{sid}/posts") - Call getPosts( - @Path("sid") String sid - ); - - @FormUrlEncoded - @POST("shops/{sid}/posts/{uid}/{pid}") - Call deletePost( - @Path("sid") String sid, - - @Path("uid") String uid, - @Path("pid") String pid, - @Field("token") String token - ); }