Merge branch 'master' into michishitaEdit

Fork: 0

nitta-lab-2021 / org.ntlab.acanthus_client

Browse code Merge branch 'master' into michishitaEdit README master
commit 14067edc17aa6d5a6f98c550fadc7367aaed57a5 2 parents ad42f38 + 16f72ab s-michishita authored on 16 Jul 2021

Patch

Unified Split

Showing 15 changed files

                Ignore Space
               Show notes
              View
            
          
          10 ■■■■■
          app/src/main/java/org/ntlab/acanthus_client/resources/gallery/StrokesRest.java
 public interface StrokesRest {
 
    //-----------------------------------------------------------------
    //
    @GET("gallery/{aid}/pageMap/0/layers/0/strokes")
    Call<Collection<Stroke>> getStrokes(@Path("aid") Integer aid);
    @GET("gallery/{aid}/pageMap/{pid}/layers/{layerNo}/strokes")
    Call<Collection<Stroke>> getStrokes(@Path("aid") Integer aid, @Path("pid") Integer pid, @Path("layerNo") Integer layerNo);
 
    //-----------------------------------------------------------------
    //
    @FormUrlEncoded
    @POST("gallery/{aid}/pageMap/0/layers/0/strokes")
    Call<Integer> addStroke(@Path("aid") Integer aid, @Field("uid") Integer uid, @Field("uidToken") String uidToken,
    @POST("gallery/{aid}/pageMap/{pid}/layers/{layerNo}/strokes")
    Call<Integer> addStroke(@Path("aid") Integer aid, @Path("pid") Integer pid, @Path("layerNo") Integer layerNo,
                            @Field("uid") Integer uid, @Field("uidToken") String uidToken,
                            @Field("pen") Integer pen, @Field("color") Integer color, @Field("thick") Integer thick);
 
    //-----------------------------------------------------------------
    //
 public interface StrokesRest {
     //-----------------------------------------------------------------
     //
+    @GET("gallery/{aid}/pageMap/0/layers/0/strokes")
+    Call<Collection<Stroke>> getStrokes(@Path("aid") Integer aid);
+    @GET("gallery/{aid}/pageMap/{pid}/layers/{layerNo}/strokes")
+    Call<Collection<Stroke>> getStrokes(@Path("aid") Integer aid, @Path("pid") Integer pid, @Path("layerNo") Integer layerNo);
     //-----------------------------------------------------------------
     //
     @FormUrlEncoded
+    @POST("gallery/{aid}/pageMap/0/layers/0/strokes")
+    Call<Integer> addStroke(@Path("aid") Integer aid, @Field("uid") Integer uid, @Field("uidToken") String uidToken,
+    @POST("gallery/{aid}/pageMap/{pid}/layers/{layerNo}/strokes")
+    Call<Integer> addStroke(@Path("aid") Integer aid, @Path("pid") Integer pid, @Path("layerNo") Integer layerNo,
+                            @Field("uid") Integer uid, @Field("uidToken") String uidToken,
                             @Field("pen") Integer pen, @Field("color") Integer color, @Field("thick") Integer thick);
     //-----------------------------------------------------------------
     //

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationViewModel.java
     // StrokesRestをGETする。
    public void getAnimationStrokes() {
        final StrokesRest strokesRest = retrofit.create(StrokesRest.class);
        Call<Collection<Stroke>> strokes = strokesRest.getStrokes(acanthus.getAid());
        Call<Collection<Stroke>> strokes = strokesRest.getStrokes(acanthus.getAid(), 0, 0);
    }
 
}
     // StrokesRestをGETする。
     public void getAnimationStrokes() {
         final StrokesRest strokesRest = retrofit.create(StrokesRest.class);
+        Call<Collection<Stroke>> strokes = strokesRest.getStrokes(acanthus.getAid());
+        Call<Collection<Stroke>> strokes = strokesRest.getStrokes(acanthus.getAid(), 0, 0);
     }
 }

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageConnectionModel.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.java

Ignore Space Show notes View app/src/main/res/drawable/ic_paint_tool_button.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/sample1.png 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/sample2.png 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/sample3.png 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/sample4.png 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/sample5.png 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/activity_paint.xml

Show line notes below