From 99de732dbb33635daa15b3610a8ab5301c483602 Mon Sep 17 00:00:00 2001
From: oKikuti <fureiazumajp@gmail.com>
Date: Tue, 11 Jun 2024 13:32:34 +0900
Subject: [PATCH] =?UTF-8?q?=E8=8F=8A=E6=B1=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

提出状況のインテントを変えました。確認をお願いします。
---
 .../java/com/example/oplogy/MainActivity.java | 22 ++------
 app/src/main/res/layout/main.xml              | 53 +------------------
 2 files changed, 6 insertions(+), 69 deletions(-)

diff --git a/app/src/main/java/com/example/oplogy/MainActivity.java b/app/src/main/java/com/example/oplogy/MainActivity.java
index 5700f05..e5bc0e8 100644
--- a/app/src/main/java/com/example/oplogy/MainActivity.java
+++ b/app/src/main/java/com/example/oplogy/MainActivity.java
@@ -26,11 +26,8 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     private TextView root;
     private ImageView imageRoot;
     private int previousRoot = 0; //元の画像のインデックス
-
-//    未提出・提出済みのボタン
-    private Button notSubmission;
-    private Button submission;
-
+    //    提出状況のTextViewとImageView
+    private TextView submission;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -50,14 +47,11 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         root = findViewById(R.id.root);
         root.setOnClickListener(this);
         imageRoot = findViewById(R.id.imageRoot);
-
-//        未提出のボタンのインテント
-        notSubmission = findViewById(R.id.notSubmission);
-        notSubmission.setOnClickListener(this);
-//        未提出のボタンのインテント
+//        提出状況のインテント
         submission = findViewById(R.id.submission);
         submission.setOnClickListener(this);
 
+
     }
 
 
@@ -83,14 +77,8 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
             imageRoot.setImageResource(R.drawable.pin);
             Intent toRoot = new Intent(MainActivity.this,RootSearchActivity.class);
             startActivity(toRoot);
-
         }
-
-        if(view == notSubmission){
-            Intent toNotsubmission = new Intent(MainActivity.this,SubmissionActivity.class);
-            startActivity(toNotsubmission);
-        }
-
+//        提出状況のクリック処理
         if(view == submission){
             Intent toSubmission = new Intent(MainActivity.this,SubmissionActivity.class);
             startActivity(toSubmission);
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
index 2b5113d..d227a24 100644
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -108,6 +108,7 @@
 
 <!--    提出状況のレイアウト-->
     <TextView
+        android:id="@+id/submission"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="提出状況"
@@ -116,62 +117,10 @@
         android:gravity="center"
         android:layout_gravity="center"/>
 
-    <LinearLayout
-        android:layout_width="359dp"
-        android:layout_height="0dp"
-        android:layout_gravity="center"
-        android:layout_weight="1"
-        android:orientation="horizontal"
-        android:weightSum="5">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="未提出"
-            android:textSize="25dp"
-            android:textStyle="bold"
-            android:layout_weight="3"
-            android:gravity="center"
-            android:layout_gravity="center"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="提出済み"
-            android:textSize="25dp"
-            android:textStyle="bold"
-            android:layout_weight="2"
-            android:gravity="center"
-            android:layout_gravity="center"/>
-    </LinearLayout>
 
 
-<!--    未提出・提出済みのボタンのレイアウト-->
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_gravity="center"
-        android:layout_weight="5"
-        android:weightSum="10"
-        android:orientation="horizontal">
-
-        <Button
-            android:id="@+id/notSubmission"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:text="未提出"
-            android:textSize="25dp"
-            android:layout_weight="5"/>
 
 
-        <Button
-            android:id="@+id/submission"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:text="提出済"
-            android:textSize="25dp"
-            android:layout_weight="5"/>
-    </LinearLayout>
 
 
 </LinearLayout>
\ No newline at end of file