diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4c3cd5d..f04b5bf 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -38,11 +38,7 @@ - - - - + + + + + diff --git a/app/src/main/java/com/example/cosmosclient/views/CheeseDynamicAdapter.java b/app/src/main/java/com/example/cosmosclient/views/CheeseDynamicAdapter.java index 3e366e8..f6131ad 100644 --- a/app/src/main/java/com/example/cosmosclient/views/CheeseDynamicAdapter.java +++ b/app/src/main/java/com/example/cosmosclient/views/CheeseDynamicAdapter.java @@ -70,13 +70,14 @@ itemList = (ListView) view.findViewById(R.id.listview); //image = (ImageView) view.findViewById(R.id.item_img); + /* ArrayList items = new ArrayList<>(); items.add("からし"); items.add("わさび"); items.add("砂糖"); - - ArrayAdapter adapter = new ArrayAdapter(getContext(), R.layout.item_list, items); - itemList.setAdapter(adapter); + */ + //ArrayAdapter adapter = new ArrayAdapter(getContext(), R.layout.item_list, items); + //itemList.setAdapter(adapter); } diff --git a/app/src/main/java/com/example/cosmosclient/views/Cheeses.java b/app/src/main/java/com/example/cosmosclient/views/Cheeses.java index a1386ac..d02cdc2 100644 --- a/app/src/main/java/com/example/cosmosclient/views/Cheeses.java +++ b/app/src/main/java/com/example/cosmosclient/views/Cheeses.java @@ -1,13 +1,16 @@ package com.example.cosmosclient.views; +import com.example.cosmosclient.resources.GroupsRest; +import retrofit2.Call; + public class Cheeses { public static final String[] sCheeseStrings = { - "ファミリー\n 紙コップ\n 延長ケーブル", - "会社\n からし", - "Group3\n ケーキ\n ほげほげ", - "Group4\n ほげほげ\n ほげほげ", - "Group5\n ほげほげ\n ほげほげ\n ほげほげ\n ほげほげ", - "Group6\n ほげほげ\n ほげほげ\n ほげほげ", + "ファミリー", + "会社", + "Group3", + "Group4", + "Group5", + "Group6", "Group7" }; } diff --git a/app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java b/app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java index 90dfc72..100eaa8 100644 --- a/app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java @@ -42,7 +42,7 @@ Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); - String[] list = {"ファミリー\n 紙コップ\n 延長ケーブル", "Group2\n からし", "Group3\n ケーキ\n something"}; + //String[] list = {"ファミリー\n 紙コップ\n 延長ケーブル", "Group2\n からし", "Group3\n ケーキ\n something"}; gridView = (DynamicGridView) findViewById(R.id.dynamic_grid); gridView.setAdapter((ListAdapter) new CheeseDynamicAdapter(this, diff --git a/app/src/main/res/layout/item_grid.xml b/app/src/main/res/layout/item_grid.xml index 4ec19f9..4fc0f67 100644 --- a/app/src/main/res/layout/item_grid.xml +++ b/app/src/main/res/layout/item_grid.xml @@ -28,7 +28,7 @@ \ No newline at end of file