GroupListActivityのListViewの作業途中

Fork: 0

nitta-lab-2019 / CosmosClient

Browse code GroupListActivityのListViewの作業途中 AchieveRequests AreaInformation AreaInformationUpdate CompareStoreLocation CreateIntentService GPSgetInService GroupListActivity NotificationClass RequestList RequestListActivity StoreLocationClass UpdateRequestList areaInfo master searchNotificationsFix20191114 sendNotification ...updateAreaInformation
1 parent 00e7455 commit 7527c86fb7a17ce81cec550d6f9380725e71ea1d t-sugisawa authored on 16 Jul 2019

Patch

Unified Split

Showing 3 changed files

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          app/src/main/java/com/example/cosmosclient/views/Cheeses.java
             "Group3\n  ケーキ\n  ほげほげ",
            "Group4\n  ほげほげ\n  ほげほげ",
            "Group5\n  ほげほげ\n  ほげほげ\n  ほげほげ\n  ほげほげ",
            "Group6\n  ほげほげ\n  ほげほげ\n  ほげほげ",
            "Group7\n  ほげほげ\n  ほげほげ"
            "Group7"
    };
}
             "Group3\n  ケーキ\n  ほげほげ",
             "Group4\n  ほげほげ\n  ほげほげ",
             "Group5\n  ほげほげ\n  ほげほげ\n  ほげほげ\n  ほげほげ",
             "Group6\n  ほげほげ\n  ほげほげ\n  ほげほげ",
+            "Group7\n  ほげほげ\n  ほげほげ"
+            "Group7"
     };
 }

                Ignore Space
               Show notes
              View
            
          
          4 ■■■■■
          app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java
         TextView group1 = findViewById(R.id.group1);
        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);
            }
        });
 
        // 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);
        }
/*
         TextView group1 = findViewById(R.id.group1);
         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);
             }
         });
         // 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);
         }
 /*

                Ignore Space
               Show notes
              View
            
          
          8 ■■■■■
          app/src/main/res/layout/item_grid.xml
         android:ellipsize="end"
        android:padding="15dp"
        android:gravity="left"
        />
<<<<<<< Updated upstream
 
    <ListView
        android:id="@id/listview"
        android:layout_width="match_parent"
        android:layout_height="wrap_content" />
 
=======
    <ListView
        android:id="@id/listview"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        />
>>>>>>> Stashed changes
</LinearLayout>
         android:ellipsize="end"
         android:padding="15dp"
         android:gravity="left"
         />
+<<<<<<< Updated upstream
     <ListView
         android:id="@id/listview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
+=======
+    <ListView
+        android:id="@id/listview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        />
+>>>>>>> Stashed changes
 </LinearLayout>

Show line notes below