diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java index 4c17d1d..ba0dfb7 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java @@ -19,7 +19,6 @@ private PaintCanvas paintCanvas; private ActivityPaintBinding binding; - private PaintViewModel paintViewModel; //----------------------------------------------------------------- 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 a9860dc..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 @@ -28,7 +28,6 @@ private MutableLiveData mPageNo = new MutableLiveData<>(); private MutableLiveData mStrokeNo = new MutableLiveData<>(); private MutableLiveData> mStrokes = new MutableLiveData<>(); - private ScheduledThreadPoolExecutor thread = new ScheduledThreadPoolExecutor(1); //----------------------------------------------------------------- @@ -56,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/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.java index 25fe857..6d2efd9 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.java @@ -58,7 +58,8 @@ .addConverterFactory(JacksonConverterFactory.create()) .build(); } - +//----------------------------------------------------------------- +//----------▽▽POST▽▽---------- //----------------------------------------------------------------- //----------------------------------------------------------------- // ローカルでのストロークの追加(POST) @@ -108,7 +109,11 @@ } }); } - +//----------△△POST△△---------- +//----------------------------------------------------------------- +/////////////////////////////////////////////////////////////////////////////////////////////////////////// +//----------------------------------------------------------------- +//----------▽▽GET▽▽---------- //----------------------------------------------------------------- // 全strokeを取得する public void getStrokes(MutableLiveData> strokes) { @@ -151,7 +156,11 @@ } }); } - +//----------△△GET△△---------- +//----------------------------------------------------------------- +/////////////////////////////////////////////////////////////////////////////////////////////////////////// +//----------------------------------------------------------------- +//----------▽▽delete▽▽---------- //----------------------------------------------------------------- // "Clear"ボタンによる描画の全消去 / サーバー側の筆跡全削除 public void deleteStrokes() { @@ -170,7 +179,7 @@ } }); } - - //----------------------------------------------------------------- +//----------△△delete△△---------- +//----------------------------------------------------------------- } \ No newline at end of file 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 99e3755..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" /> - - + +