Merge remote-tracking branch 'origin/master'

Fork: 0

nitta-lab-2021 / org.ntlab.acanthus_client

Browse code Merge remote-tracking branch 'origin/master' README master
commit 62eae4f8e67316504660064cc4496da9edcdb50a 2 parents acb0525 + bce3e3d t-tai authored on 25 Jun 2021

Patch

Unified Split

Showing 13 changed files

                Ignore Space
               Show notes
              View
            
          
          37 ■■■■■
          app/src/main/java/org/ntlab/acanthus_client/entities/Pen.java
        
        
        
          0 → 100644
             package org.ntlab.acanthus_client.entities;
 
//-----------------------------------------------------------------
//
public class Pen {
    private Integer penType;
    private Integer color;
    private Integer thickness;
 
    //-----------------------------------------------------------------
    //-----------------------------------------------------------------
    //
    public Pen(Integer penType, Integer color, Integer thickness) {
        this.penType = penType;
        this.color = color;
        this.thickness = thickness;
    }
    //-----------------------------------------------------------------
    // getter
    public Integer getPenType() {
        return this.penType;
    }
 
    public Integer getColor() {
        return this.getColor();
    }
 
    public Integer getThickness() {
        return this.thickness;
    }
    //-----------------------------------------------------------------
    // setter
 
    //-----------------------------------------------------------------
 
}
+package org.ntlab.acanthus_client.entities;
+//-----------------------------------------------------------------
+//
+public class Pen {
+    private Integer penType;
+    private Integer color;
+    private Integer thickness;
+    //-----------------------------------------------------------------
+    //-----------------------------------------------------------------
+    //
+    public Pen(Integer penType, Integer color, Integer thickness) {
+        this.penType = penType;
+        this.color = color;
+        this.thickness = thickness;
+    }
+    //-----------------------------------------------------------------
+    // getter
+    public Integer getPenType() {
+        return this.penType;
+    }
+    public Integer getColor() {
+        return this.getColor();
+    }
+    public Integer getThickness() {
+        return this.thickness;
+    }
+    //-----------------------------------------------------------------
+    // setter
+    //-----------------------------------------------------------------
+}

                Ignore Space
               Show notes
              View
            
          
          63 ■■■■■
          app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/InvitedConnectionModel.java
        
        
        
          0 → 100644
             package org.ntlab.acanthus_client.views.main_menu_ui.mypage;
 
import org.ntlab.acanthus_client.Acanthus;
import org.ntlab.acanthus_client.resources.accounts.InvitedRest;
 
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
import retrofit2.Retrofit;
import retrofit2.converter.jackson.JacksonConverterFactory;
import retrofit2.converter.scalars.ScalarsConverterFactory;
 
//-----------------------------------------------------------------
//
public class InvitedConnectionModel {
 
    private Retrofit retrofit;
    private Acanthus acanthus;
 
    //-----------------------------------------------------------------
    //-----------------------------------------------------------------
    //
    public InvitedConnectionModel(Acanthus acanthus) {
        init(acanthus);
    }
 
    //-----------------------------------------------------------------
    //-----------------------------------------------------------------
    //
    public void init(Acanthus acanthus) {
        this.acanthus = acanthus;
        this.retrofit = new Retrofit.Builder()
                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/")
                .addConverterFactory(ScalarsConverterFactory.create())
                .addConverterFactory(JacksonConverterFactory.create())
                .build();
    }
 
    //-----------------------------------------------------------------
    //
    public void checkInvited() {
        final InvitedRest invitedRest = retrofit.create(InvitedRest.class);
 
        Call<Boolean> call = invitedRest.checkAccountInvited(
                acanthus.getPreferenceUid(), acanthus.getAid());
 
        call.enqueue(new Callback<Boolean>() {
            @Override
            public void onResponse(Call<Boolean> call, Response<Boolean> response) {
 
            }
 
            @Override
            public void onFailure(Call<Boolean> call, Throwable t) {
 
            }
        });
 
    }
    //-----------------------------------------------------------------
 
}
+package org.ntlab.acanthus_client.views.main_menu_ui.mypage;
+import org.ntlab.acanthus_client.Acanthus;
+import org.ntlab.acanthus_client.resources.accounts.InvitedRest;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+import retrofit2.Retrofit;
+import retrofit2.converter.jackson.JacksonConverterFactory;
+import retrofit2.converter.scalars.ScalarsConverterFactory;
+//-----------------------------------------------------------------
+//
+public class InvitedConnectionModel {
+    private Retrofit retrofit;
+    private Acanthus acanthus;
+    //-----------------------------------------------------------------
+    //-----------------------------------------------------------------
+    //
+    public InvitedConnectionModel(Acanthus acanthus) {
+        init(acanthus);
+    }
+    //-----------------------------------------------------------------
+    //-----------------------------------------------------------------
+    //
+    public void init(Acanthus acanthus) {
+        this.acanthus = acanthus;
+        this.retrofit = new Retrofit.Builder()
+                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/")
+                .addConverterFactory(ScalarsConverterFactory.create())
+                .addConverterFactory(JacksonConverterFactory.create())
+                .build();
+    }
+    //-----------------------------------------------------------------
+    //
+    public void checkInvited() {
+        final InvitedRest invitedRest = retrofit.create(InvitedRest.class);
+        Call<Boolean> call = invitedRest.checkAccountInvited(
+                acanthus.getPreferenceUid(), acanthus.getAid());
+        call.enqueue(new Callback<Boolean>() {
+            @Override
+            public void onResponse(Call<Boolean> call, Response<Boolean> response) {
+            }
+            @Override
+            public void onFailure(Call<Boolean> call, Throwable t) {
+            }
+        });
+    }
+    //-----------------------------------------------------------------
+}

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

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageModelContainer.java 0 → 100644

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

Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/InviteConnectionModel.java 100644 → 0

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/InvitesConnectionModel.java 0 → 100644

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/PaintConnectionModel.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintModelContainer.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/res/layout/activity_paint.xml

Show line notes below