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 79afe5b..5c62d2b 100644 --- a/app/src/main/java/com/example/cosmosclient/views/CheeseDynamicAdapter.java +++ b/app/src/main/java/com/example/cosmosclient/views/CheeseDynamicAdapter.java @@ -1,6 +1,7 @@ package com.example.cosmosclient.views; import android.content.Context; +import android.graphics.Color; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -28,6 +29,29 @@ } else { holder = (CheeseViewHolder) convertView.getTag(); } + switch (position) { + case 0: + convertView.setBackgroundColor(Color.argb(100, 200, 100, 100)); + break; + case 1: + convertView.setBackgroundColor(Color.argb(100, 200, 200, 100)); + break; + case 2: + convertView.setBackgroundColor(Color.argb(100, 100, 100, 100)); + break; + case 3: + convertView.setBackgroundColor(Color.argb(100, 200, 100, 200)); + break; + case 4: + convertView.setBackgroundColor(Color.argb(100, 100, 200, 100)); + break; + case 5: + convertView.setBackgroundColor(Color.argb(100, 100, 200, 200)); + break; + case 6: + convertView.setBackgroundColor(Color.argb(100, 100, 100, 200)); + break; + } holder.build(getItem(position).toString()); return convertView; } 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 a89f133..d57f508 100644 --- a/app/src/main/java/com/example/cosmosclient/views/Cheeses.java +++ b/app/src/main/java/com/example/cosmosclient/views/Cheeses.java @@ -2,8 +2,12 @@ public class Cheeses { public static final String[] sCheeseStrings = { - "Hushallsost", "Iberico", "Idaho Goatster", - "Idiazabal", "Il Boschetto al Tartufo", "Ile d'Yeu", "Isle of Mull", "Jarlsberg", - "Jermi Tortes", "Jibneh Arabieh", "Jindi Brie", "Jubilee Blue", "Juustoleipa" + "ファミリー\n 紙コップ\n 延長ケーブル", + "会社\n からし", + "Group3\n ケーキ\n ほげほげ", + "Group4\n ほげほげ\n ほげほげ", + "Group5\n ほげほげ\n ほげほげ\n ほげほげ\n ほげほげ", + "Group6\n ほげほげ\n ほげほげ\n ほげほげ", + "Group7\n ほげほげ\n ほげほげ" }; } 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 3e1a4e9..29b998f 100644 --- a/app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java @@ -1,7 +1,9 @@ package com.example.cosmosclient.views; import android.content.Intent; +import android.nfc.Tag; import android.os.Bundle; +import android.util.Log; import android.view.View; import android.support.v4.view.GravityCompat; import android.support.v7.app.ActionBarDrawerToggle; @@ -12,9 +14,12 @@ import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.view.Menu; +import android.widget.AdapterView; import android.widget.ArrayAdapter; +import android.widget.GridView; import android.widget.ListAdapter; import android.widget.TextView; +import android.widget.Toast; import com.example.cosmosclient.views.DynamicGridView; @@ -44,6 +49,37 @@ new ArrayList(Arrays.asList(Cheeses.sCheeseStrings)), getResources().getInteger(R.integer.column_count))); + gridView.setOnDragListener(new DynamicGridView.OnDragListener() { + @Override + public void onDragStarted(int position) { + Log.d(TAG, "drag started at position" + position); + } + + @Override + public void onDragPositionsChanged(int oldPosition, int newPosition) { + Log.d(TAG, String.format("drag item position changed from %d to %d", oldPosition, newPosition)); + } + + }); + + gridView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() { + @Override + public boolean onItemLongClick(AdapterView parent, View view, int position, long id) { + gridView.startEditMode(position); + return true; + } + }); + + gridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { +// Toast.makeText(GroupListActivity.this, parent.getAdapter().getItem(position).toString(), +// Toast.LENGTH_SHORT).show(); + Intent intent=new Intent(GroupListActivity.this, com.example.cosmosclient.views.RequestListActivity.class); + startActivity(intent); + } + }); + /* とりあえずの画面遷移なので変更するかも */ TextView group1 = findViewById(R.id.group1); group1.setOnClickListener(new View.OnClickListener() { @@ -69,6 +105,8 @@ DrawerLayout drawer = findViewById(R.id.drawer_layout); if (drawer.isDrawerOpen(GravityCompat.START)) { drawer.closeDrawer(GravityCompat.START); + } else if (gridView.isEditMode()) { + gridView.stopEditMode(); } else { super.onBackPressed(); } diff --git a/app/src/main/res/layout/content_group_list.xml b/app/src/main/res/layout/content_group_list.xml index cf998f9..28cf0c7 100644 --- a/app/src/main/res/layout/content_group_list.xml +++ b/app/src/main/res/layout/content_group_list.xml @@ -31,13 +31,17 @@ @@ -64,6 +69,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="object1" + android:visibility="invisible" app:layout_constraintBottom_toBottomOf="@+id/group1" app:layout_constraintEnd_toEndOf="@+id/group1" app:layout_constraintHorizontal_bias="0.246" @@ -76,6 +82,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="object2" + android:visibility="invisible" app:layout_constraintEnd_toEndOf="@+id/checkBox" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@+id/checkBox" diff --git a/app/src/main/res/layout/item_grid.xml b/app/src/main/res/layout/item_grid.xml index f0aac47..89e6a64 100644 --- a/app/src/main/res/layout/item_grid.xml +++ b/app/src/main/res/layout/item_grid.xml @@ -4,7 +4,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:minHeight="96dp" android:gravity="center" android:orientation="vertical" > @@ -20,10 +19,9 @@ android:id="@+id/item_title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:singleLine="true" android:ellipsize="end" - android:padding="1dp" - android:gravity="center" + android:padding="15dp" + android:gravity="left" /> \ 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 index ce3c12e..20aacba 100644 --- 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 Binary files differ diff --git a/dynamicgrid/build/intermediates/incremental/debug-mergeJniLibs/merge-state b/dynamicgrid/build/intermediates/incremental/debug-mergeJniLibs/merge-state index 7158089..4577682 100644 --- a/dynamicgrid/build/intermediates/incremental/debug-mergeJniLibs/merge-state +++ b/dynamicgrid/build/intermediates/incremental/debug-mergeJniLibs/merge-state Binary files differ diff --git a/dynamicgrid/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/dynamicgrid/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index 7f1364b..7ae3cc3 100644 --- a/dynamicgrid/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/dynamicgrid/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/dynamicgrid/build/intermediates/incremental/mergeDebugShaders/merger.xml b/dynamicgrid/build/intermediates/incremental/mergeDebugShaders/merger.xml index 52eaf4d..e63d0d4 100644 --- a/dynamicgrid/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/dynamicgrid/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/dynamicgrid/build/intermediates/incremental/packageDebugAssets/merger.xml b/dynamicgrid/build/intermediates/incremental/packageDebugAssets/merger.xml index 797d31d..fec599c 100644 --- a/dynamicgrid/build/intermediates/incremental/packageDebugAssets/merger.xml +++ b/dynamicgrid/build/intermediates/incremental/packageDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ 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 index f2a9f44..c1e61e4 100644 --- a/dynamicgrid/build/intermediates/incremental/packageDebugResources/compile-file-map.properties +++ b/dynamicgrid/build/intermediates/incremental/packageDebugResources/compile-file-map.properties @@ -1 +1 @@ -#Tue Jun 18 16:00:02 JST 2019 +#Tue Jun 25 13:06:52 JST 2019 diff --git a/dynamicgrid/build/intermediates/incremental/packageDebugResources/merger.xml b/dynamicgrid/build/intermediates/incremental/packageDebugResources/merger.xml index ed6162c..e654bbb 100644 --- a/dynamicgrid/build/intermediates/incremental/packageDebugResources/merger.xml +++ b/dynamicgrid/build/intermediates/incremental/packageDebugResources/merger.xml @@ -1,2 +1,2 @@ -16dp \ No newline at end of file +16dp \ No newline at end of file