diff --git a/app/src/main/java/org/ntlab/amaryllis/client/entities/Category.java b/app/src/main/java/org/ntlab/amaryllis/client/entities/Category.java new file mode 100644 index 0000000..3e44534 --- /dev/null +++ b/app/src/main/java/org/ntlab/amaryllis/client/entities/Category.java @@ -0,0 +1,41 @@ +package org.ntlab.amaryllis.client.entities; + + + +public class Category { + private String cid; + private String name; + /** + * 文字列表現された色情報 + */ + private String color; + public Category(String cid,String name,String color){ + this.cid=cid; + this.name=name; + this.color=color; + } + + public String getcId() { + return cid; + } + + public String getName() { + return name; + } + public String getColor(){ + return color; + } + public void setCid(String cid) { + this.cid = cid; + } + + public void setName(String name) { + this.name = name; + } + + public void setColor(String color) { + this.color = color; + } + + +} diff --git a/app/src/main/java/org/ntlab/amaryllis/client/entities/Voicememo.java b/app/src/main/java/org/ntlab/amaryllis/client/entities/Voicememo.java index b644ad5..84c46a3 100644 --- a/app/src/main/java/org/ntlab/amaryllis/client/entities/Voicememo.java +++ b/app/src/main/java/org/ntlab/amaryllis/client/entities/Voicememo.java @@ -4,12 +4,10 @@ import org.w3c.dom.Comment; -import java.io.File; import java.util.ArrayList; import java.util.Calendar; import java.util.Collection; import java.util.HashMap; -import java.util.UUID; public class Voicememo { private String vid; diff --git a/app/src/main/java/org/ntlab/amaryllis/client/resources/CategoriesRest.java b/app/src/main/java/org/ntlab/amaryllis/client/resources/CategoriesRest.java new file mode 100644 index 0000000..5f26a14 --- /dev/null +++ b/app/src/main/java/org/ntlab/amaryllis/client/resources/CategoriesRest.java @@ -0,0 +1,22 @@ +package org.ntlab.amaryllis.client.resources; + +import org.ntlab.amaryllis.client.entities.Category; + +import java.util.ArrayList; + +import retrofit2.Call; +import retrofit2.http.GET; +import retrofit2.http.Path; + + +public interface CategoriesRest { + //すべてのcidを取得 + @GET("categories") + Call> getcategories(); + + //指定したカテゴリを取得 + @GET("categories/{cid}") + Call category( + @Path("cid") String cid + ); +} diff --git a/build.gradle b/build.gradle index 92a0c3b..b58dc04 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.0.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files