diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/FollowAddJson.java b/app/src/main/java/org/ntlab/acanthus_client/entities/FollowAddJson.java new file mode 100644 index 0000000..c4841b3 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/FollowAddJson.java @@ -0,0 +1,23 @@ +package org.ntlab.acanthus_client.entities; + +public class FollowAddJson { + private Integer uid; + private Integer followUid; + + public Integer getUid() { + return uid; + } + + public Integer getFollowUid() { + return followUid; + } + + public void setUid(Integer uid) { + this.uid = uid; + } + + public void setFollowUid(Integer followUid) { + this.followUid = followUid; + } + +} diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/FollowUidJson.java b/app/src/main/java/org/ntlab/acanthus_client/entities/FollowUidJson.java new file mode 100644 index 0000000..ddf8087 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/FollowUidJson.java @@ -0,0 +1,17 @@ +package org.ntlab.acanthus_client.entities; + +import java.util.ArrayList; +import java.util.Collection; + +public class FollowUidJson { + private Collection uidList = new ArrayList<>(); + + public Collection getUidList() { + return uidList; + } + + public void setUidList(Collection uidList) { + this.uidList = uidList; + } + +} diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/FollowerUidJson.java b/app/src/main/java/org/ntlab/acanthus_client/entities/FollowerUidJson.java new file mode 100644 index 0000000..3498d99 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/FollowerUidJson.java @@ -0,0 +1,16 @@ +package org.ntlab.acanthus_client.entities; + +import java.util.ArrayList; +import java.util.Collection; + +public class FollowerUidJson { + private Collection uidList = new ArrayList<>(); + + public Collection getUidList() { + return uidList; + } + + public void setUidList(Collection uidList) { + this.uidList = uidList; + } +} diff --git a/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowersRest.java b/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowersRest.java new file mode 100644 index 0000000..b5d7e75 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowersRest.java @@ -0,0 +1,19 @@ +package org.ntlab.acanthus_client.resources.accounts; + +import org.ntlab.acanthus_client.entities.FollowerUidJson; + +import retrofit2.Call; +import retrofit2.http.GET; +import retrofit2.http.Path; +import retrofit2.http.Query; + +public interface FollowersRest { + + //アカウント別のフォロワー情報を取得するメソッド + + @GET("accounts/{uid}/followers") + Call getFollowers( + @Path("uid") Integer uid + ); + +} diff --git a/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowsRest.java b/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowsRest.java new file mode 100644 index 0000000..b177235 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowsRest.java @@ -0,0 +1,44 @@ +package org.ntlab.acanthus_client.resources.accounts; + +import org.ntlab.acanthus_client.entities.FollowAddJson; +import org.ntlab.acanthus_client.entities.FollowUidJson; + +import retrofit2.Call; +import retrofit2.http.DELETE; +import retrofit2.http.Field; +import retrofit2.http.FormUrlEncoded; +import retrofit2.http.GET; +import retrofit2.http.POST; +import retrofit2.http.Path; +import retrofit2.http.Query; + +public interface FollowsRest { + + //アカウント別のフォロー情報を取得するメソッド + + @GET("accounts/{uid}/follows") + Call getFollows( + @Path("uid") Integer uid + ); + + //ユーザーをフォローするメソッド + + @FormUrlEncoded + @POST("accounts/{uid}/follows") + Call addFollows( + @Path("uid") Integer uid, + @Field("token") String token, + @Field("followUid") Integer followUid + ); + + //ユーザーのフォローを解除するメソッド + + @FormUrlEncoded + @DELETE("accounts/{uid}/follows") + Call releaseFollows( + @Path("uid") Integer uid, + @Field("token") String token, + @Field("followUid") Integer followUid + ); + +} diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java index cf5b5b1..f93b07a 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java @@ -57,16 +57,9 @@ paint2.setColor(Color.RED);//色の指定 paint2.setStyle(Paint.Style.STROKE);//線をひく paint2.setStrokeWidth(20);//幅 - //描写するためにrunで回す。 thread.scheduleWithFixedDelay(this, 1000L, 1000L, TimeUnit.MILLISECONDS); } - // 一定間隔でサーバーから受け取ったstrokesの描写を行う - @Override - public void run() { - getCanvas(); - } - //----------------------------------------------------------------- // setter public void setPaintViewModel(PaintViewModel paintViewModel) { @@ -75,11 +68,9 @@ //----------------------------------------------------------------- //----------------------------------------------------------------- - //描写に関する部分 + // @Override protected void onDraw(Canvas canvas) { - //書き始めた段階から繰り返し呼ばれる - //手を放すと停止 super.onDraw(canvas); canvas.drawPath(path, paint); canvas.drawPath(path2, paint2); @@ -96,19 +87,19 @@ //(3-2)タッチの処理 switch (event.getAction()) { - case MotionEvent.ACTION_DOWN://タッチした瞬間 + case MotionEvent.ACTION_DOWN: Log.d("motion", "+++++++++++++++++++++++++++++++++++++++down======================================================"); onTouched(x, y); paintViewModel.addLocalStrokeRequest(); break; - case MotionEvent.ACTION_MOVE://指動かしている間 + case MotionEvent.ACTION_MOVE: Log.d("motion", "move"); onTouchedMove(x, y); paintViewModel.addPositionRequest(x, y); break; - case MotionEvent.ACTION_UP://指を放した瞬間 + case MotionEvent.ACTION_UP: Log.d("motion", "=====================================up======================================================"); break; } @@ -173,4 +164,10 @@ cnt = 0; } } + + // 一定間隔でサーバー上の筆跡を取得する（GET） + @Override + public void run() { + getCanvas(); + } } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java index 449c126..0670a5a 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java @@ -55,7 +55,7 @@ mStrokes.setValue(new ArrayList<>()); mStrokes.getValue().add(new Stroke()); - thread.scheduleWithFixedDelay(this, 1000L, 200L, TimeUnit.MILLISECONDS); + thread.scheduleWithFixedDelay(this, 1000L, 100L, TimeUnit.MILLISECONDS); } //----------------------------------------------------------------- diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5b9bdbf..a324943 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -3,7 +3,6 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/container" - android:layout_marginTop="?attr/actionBarSize" android:layout_width="match_parent" android:layout_height="match_parent" android:paddingTop="?attr/actionBarSize"> @@ -24,15 +23,15 @@ android:id="@+id/nav_host_fragment_activity_main" android:name="androidx.navigation.fragment.NavHostFragment" android:layout_width="412dp" - android:layout_height="666dp" + android:layout_height="0dp" android:layout_marginBottom="4dp" app:defaultNavHost="true" app:layout_constraintBottom_toTopOf="@+id/nav_view" - app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_bias="1.0" + app:layout_constraintVertical_bias="0.921" app:navGraph="@navigation/mobile_navigation" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml index 398eb8c..520b462 100644 --- a/app/src/main/res/layout/activity_sign_up.xml +++ b/app/src/main/res/layout/activity_sign_up.xml @@ -2,7 +2,6 @@ diff --git a/app/src/main/res/layout/animation_home.xml b/app/src/main/res/layout/animation_home.xml index 0026b53..84daeba 100644 --- a/app/src/main/res/layout/animation_home.xml +++ b/app/src/main/res/layout/animation_home.xml @@ -3,7 +3,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:layout_marginTop="?attr/actionBarSize" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/app/src/main/res/layout/fragment_edit.xml b/app/src/main/res/layout/fragment_edit.xml index b1cabc4..9825177 100644 --- a/app/src/main/res/layout/fragment_edit.xml +++ b/app/src/main/res/layout/fragment_edit.xml @@ -16,7 +16,7 @@ app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toEndOf="@+id/AnimationName" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_bias="0.531" /> + app:layout_constraintVertical_bias="0.087" /> + app:layout_constraintVertical_bias="0.086" /> + app:layout_constraintVertical_bias="0.087" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml index 8e0e615..72c3495 100644 --- a/app/src/main/res/layout/fragment_search.xml +++ b/app/src/main/res/layout/fragment_search.xml @@ -2,7 +2,6 @@ @@ -21,19 +20,6 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.023" /> - - + +