diff --git a/.idea/misc.xml b/.idea/misc.xml index 21433b1..e8b804a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,13 @@ - + + + + diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/Animation.java b/app/src/main/java/org/ntlab/acanthus_client/entities/Animation.java index db26207..60336d4 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/Animation.java +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/Animation.java @@ -22,13 +22,14 @@ private String description; private Account owner; private Boolean isPublic; - private LocalDateTime createdDate; - private LocalDateTime lastUpdate; + private String createdDate; + private String lastUpdate; private ArrayList hashTag = new ArrayList<>(); private ArrayList editors = new ArrayList<>(); private ArrayList invites = new ArrayList<>(); private HashMap pageMap = new HashMap<>(); - private Boolean isDummy; + private ArrayList pages = new ArrayList<>(); + private boolean isDummy; //----------------------------------------------------------------- public Animation() { @@ -70,11 +71,11 @@ return this.isPublic; } - public LocalDateTime getCreatedDate() { + public String getCreatedDate() { return this.createdDate; } - public LocalDateTime getLastUpdate() { + public String getLastUpdate() { return this.lastUpdate; } diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/Layer.java b/app/src/main/java/org/ntlab/acanthus_client/entities/Layer.java index 702ba20..6b0f466 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/Layer.java +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/Layer.java @@ -5,7 +5,7 @@ //----------------------------------------------------------------- // レイヤー情報 public class Layer { - private ArrayList strokes; + private ArrayList strokes = new ArrayList<>(); //----------------------------------------------------------------- // getter diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/Page.java b/app/src/main/java/org/ntlab/acanthus_client/entities/Page.java index baf5612..e5283cd 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/Page.java +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/Page.java @@ -3,7 +3,7 @@ //----------------------------------------------------------------- // ページ情報 public class Page { - private Layer layers; + private Layer layers = new Layer(); //----------------------------------------------------------------- // getter diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/Stroke.java b/app/src/main/java/org/ntlab/acanthus_client/entities/Stroke.java index 2c31ef5..a1a7c92 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/Stroke.java +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/Stroke.java @@ -7,9 +7,9 @@ public class Stroke { private static int strokeNoCount; //strokeNoを数えるためだけ private int strokeNo = 0; - private int pen; - private int color; - private int thickness; + private int pen = 0; + private int color = 0; + private int thickness = 0; private ArrayList positions = new ArrayList<>(); public int getStrokeNo() { diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java index ba7d666..0553b85 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java @@ -26,6 +26,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; +import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -100,8 +101,14 @@ listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView adapterView, View view, int position, long id) { - homeViewModel.setCurrentAnimation(animationJsonSortList.get(position).getAid(), acanthus); - transitionAnimationActivity(animationJsonSortList.get(position)); +// homeViewModel.setCurrentAnimation(animationJsonSortList.get(position).getAid(), acanthus); +// transitionAnimationActivity(animationJsonSortList.get(position)); + try { + homeViewModel.setCurrentAnimation(animationJsonSortList.get(position).getAid(), acanthus); + transitionAnimationActivity(animationJsonSortList.get(position)); + } catch (IOException e) { + e.printStackTrace(); + } } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeViewModel.java index 1309e8e..f59a968 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeViewModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeViewModel.java @@ -13,6 +13,7 @@ import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; +import java.io.IOException; import java.util.Collection; import retrofit2.Call; @@ -46,29 +47,31 @@ - public void setCurrentAnimation(Integer aid, Acanthus acanthus){ + public void setCurrentAnimation(Integer aid, Acanthus acanthus) throws IOException { Retrofit retrofit = new Retrofit.Builder() .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") .addConverterFactory(JacksonConverterFactory.create()) .build(); final GalleryRest galleryRest = retrofit.create(GalleryRest.class); - - Call call =galleryRest.getAnimationInformation(aid); - call.enqueue(new Callback() { - @Override - public void onResponse(Call call, Response response) { - if(response.isSuccessful()){ - animation = response.body(); - acanthus.setCurrentAnimation(animation); - } - } - - @Override - public void onFailure(Call call, Throwable t) { - - } - }); + Call call = galleryRest.getAnimationInformation(aid); + Response response = call.execute(); + animation = response.body(); + acanthus.setCurrentAnimation(animation); +// call.enqueue(new Callback() { +// @Override +// public void onResponse(Call call, Response response) { +// if(response.isSuccessful()){ +// animation = response.body(); +// acanthus.setCurrentAnimation(animation); +// } +// } +// +// @Override +// public void onFailure(Call call, Throwable t) { +// +// } +// }); }