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 5c62d2b..210fbd8 100644 --- a/app/src/main/java/com/example/cosmosclient/views/CheeseDynamicAdapter.java +++ b/app/src/main/java/com/example/cosmosclient/views/CheeseDynamicAdapter.java @@ -5,13 +5,16 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ArrayAdapter; import android.widget.ImageView; +import android.widget.ListView; import android.widget.TextView; import com.example.cosmosclient.R; import org.askerov.dynamicgrid.BaseDynamicGridAdapter; +import java.util.ArrayList; import java.util.List; public class CheeseDynamicAdapter extends BaseDynamicGridAdapter { @@ -58,15 +61,29 @@ private class CheeseViewHolder { private TextView titleText; - private ImageView image; + private ListView itemList; + //private ImageView image; private CheeseViewHolder(View view) { titleText = (TextView) view.findViewById(R.id.item_title); - image = (ImageView) view.findViewById(R.id.item_img); + 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); } + + void build(String title) { titleText.setText(title); + + //itemText.setText(items); //image.setImageResource(R.drawable.ic_launcher); } } 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 d57f508..a1386ac 100644 --- a/app/src/main/java/com/example/cosmosclient/views/Cheeses.java +++ b/app/src/main/java/com/example/cosmosclient/views/Cheeses.java @@ -8,6 +8,6 @@ "Group4\n ほげほげ\n ほげほげ", "Group5\n ほげほげ\n ほげほげ\n ほげほげ\n ほげほげ", "Group6\n ほげほげ\n ほげほげ\n ほげほげ", - "Group7\n ほげほげ\n ほげほげ" + "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 1c51c9c..22b50ec 100644 --- a/app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java @@ -85,6 +85,7 @@ group1.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { + gridView.stopEditMode(); Intent intent=new Intent(GroupListActivity.this, com.example.cosmosclient.views.RequestListActivity.class); startActivity(intent); } @@ -141,12 +142,15 @@ // Handle navigation view item clicks here. int id = item.getItemId(); if ( id == R.id.createNewGroupButton){ + gridView.stopEditMode(); Intent intent=new Intent(GroupListActivity.this, com.example.cosmosclient.views.CreateGroupActivity.class); startActivity(intent); } else if (id == R.id.joinGroupButton){ + gridView.stopEditMode(); Intent intent=new Intent(GroupListActivity.this, com.example.cosmosclient.views.JoinGroupActionsActivity.class); startActivity(intent); } else if (id == R.id.signOutButton){ + gridView.stopEditMode(); Intent intent=new Intent(GroupListActivity.this, com.example.cosmosclient.views.SigninActivity.class); startActivity(intent); } diff --git a/app/src/main/res/layout/item_grid.xml b/app/src/main/res/layout/item_grid.xml index 89e6a64..e3df2b7 100644 --- a/app/src/main/res/layout/item_grid.xml +++ b/app/src/main/res/layout/item_grid.xml @@ -24,4 +24,9 @@ android:gravity="left" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml new file mode 100644 index 0000000..1b0e575 --- /dev/null +++ b/app/src/main/res/layout/item_list.xml @@ -0,0 +1,12 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml new file mode 100644 index 0000000..c4f5b5b --- /dev/null +++ b/app/src/main/res/values/ids.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/dynamicgrid/build/generated/source/buildConfig/debug/org/askerov/dynamicgrid/BuildConfig.java b/dynamicgrid/build/generated/source/buildConfig/debug/org/askerov/dynamicgrid/BuildConfig.java deleted file mode 100644 index 7d59d2c..0000000 --- a/dynamicgrid/build/generated/source/buildConfig/debug/org/askerov/dynamicgrid/BuildConfig.java +++ /dev/null @@ -1,13 +0,0 @@ -/** - * Automatically generated file. DO NOT MODIFY - */ -package org.askerov.dynamicgrid; - -public final class BuildConfig { - public static final boolean DEBUG = Boolean.parseBoolean("true"); - public static final String APPLICATION_ID = "org.askerov.dynamicgrid"; - public static final String BUILD_TYPE = "debug"; - public static final String FLAVOR = ""; - public static final int VERSION_CODE = 1; - public static final String VERSION_NAME = "1.0"; -} diff --git a/dynamicgrid/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml b/dynamicgrid/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml deleted file mode 100644 index 969f1b9..0000000 --- a/dynamicgrid/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/dynamicgrid/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/generateDebugRFile/R.jar b/dynamicgrid/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/generateDebugRFile/R.jar deleted file mode 100644 index 20aacba..0000000 --- a/dynamicgrid/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/generateDebugRFile/R.jar +++ /dev/null Binary files differ diff --git a/dynamicgrid/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/dynamicgrid/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml deleted file mode 100644 index 7ae3cc3..0000000 --- a/dynamicgrid/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/dynamicgrid/build/intermediates/incremental/mergeDebugShaders/merger.xml b/dynamicgrid/build/intermediates/incremental/mergeDebugShaders/merger.xml deleted file mode 100644 index e63d0d4..0000000 --- a/dynamicgrid/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/dynamicgrid/build/intermediates/incremental/packageDebugAssets/merger.xml b/dynamicgrid/build/intermediates/incremental/packageDebugAssets/merger.xml deleted file mode 100644 index fec599c..0000000 --- a/dynamicgrid/build/intermediates/incremental/packageDebugAssets/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/dynamicgrid/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/dynamicgrid/build/intermediates/incremental/packageDebugResources/compile-file-map.properties deleted file mode 100644 index c1e61e4..0000000 --- a/dynamicgrid/build/intermediates/incremental/packageDebugResources/compile-file-map.properties +++ /dev/null @@ -1 +0,0 @@ -#Tue Jun 25 13:06:52 JST 2019 diff --git a/dynamicgrid/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml b/dynamicgrid/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml deleted file mode 100644 index 29b2c0a..0000000 --- a/dynamicgrid/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - 16dp - - \ No newline at end of file diff --git a/dynamicgrid/build/intermediates/incremental/packageDebugResources/merger.xml b/dynamicgrid/build/intermediates/incremental/packageDebugResources/merger.xml deleted file mode 100644 index e654bbb..0000000 --- a/dynamicgrid/build/intermediates/incremental/packageDebugResources/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - -16dp \ No newline at end of file diff --git a/dynamicgrid/build/intermediates/library_manifest/debug/AndroidManifest.xml b/dynamicgrid/build/intermediates/library_manifest/debug/AndroidManifest.xml deleted file mode 100644 index 969f1b9..0000000 --- a/dynamicgrid/build/intermediates/library_manifest/debug/AndroidManifest.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/dynamicgrid/build/intermediates/packaged_res/debug/values/values.xml b/dynamicgrid/build/intermediates/packaged_res/debug/values/values.xml deleted file mode 100644 index 29b2c0a..0000000 --- a/dynamicgrid/build/intermediates/packaged_res/debug/values/values.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - 16dp - - \ No newline at end of file diff --git a/dynamicgrid/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt b/dynamicgrid/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt deleted file mode 100644 index 9dad010..0000000 --- a/dynamicgrid/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt +++ /dev/null @@ -1,3 +0,0 @@ -org.askerov.dynamicgrid -dimen dgv_overlap_if_switch_straight_line -id dgv_wobble_tag diff --git a/dynamicgrid/build/intermediates/symbols/debug/R.txt b/dynamicgrid/build/intermediates/symbols/debug/R.txt deleted file mode 100644 index 2f85ae6..0000000 --- a/dynamicgrid/build/intermediates/symbols/debug/R.txt +++ /dev/null @@ -1,2 +0,0 @@ -int dimen dgv_overlap_if_switch_straight_line 0x7f070001 -int id dgv_wobble_tag 0x7f0b0001 diff --git a/dynamicgrid/build/outputs/logs/manifest-merger-debug-report.txt b/dynamicgrid/build/outputs/logs/manifest-merger-debug-report.txt deleted file mode 100644 index 6c0b85e..0000000 --- a/dynamicgrid/build/outputs/logs/manifest-merger-debug-report.txt +++ /dev/null @@ -1,37 +0,0 @@ --- Merging decision tree log --- -manifest -ADDED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml:2:1-7:12 -INJECTED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml:2:1-7:12 -INJECTED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml:2:1-7:12 -INJECTED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml:2:1-7:12 -INJECTED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml:2:1-7:12 -INJECTED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml:2:1-7:12 -INJECTED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml:2:1-7:12 - package - ADDED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml:3:11-44 - INJECTED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml - INJECTED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml - android:versionName - ADDED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml:5:11-36 - INJECTED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml - INJECTED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml - xmlns:android - ADDED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml:2:11-69 - android:versionCode - ADDED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml:4:11-34 - INJECTED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml - INJECTED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml -uses-sdk -INJECTED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml reason: use-sdk injection requested -INJECTED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml -INJECTED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml -INJECTED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml -INJECTED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml - android:targetSdkVersion - INJECTED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml - ADDED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml - INJECTED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml - android:minSdkVersion - INJECTED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml - ADDED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml - INJECTED from C:\Users\student\AndroidStudioProjects\cosmosCliant\dynamicgrid\AndroidManifest.xml