diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1f943f0..3599197 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
         android:networkSecurityConfig="@xml/network_security_config">
         <activity
             android:name=".views.MainActivity"
-            android:exported="true">
+            android:exported="false">
 
         </activity>
         <activity
diff --git a/app/src/main/java/com/example/citrusclient/views/LoginActivity.java b/app/src/main/java/com/example/citrusclient/views/LoginActivity.java
index 4ef1225..bae33bb 100644
--- a/app/src/main/java/com/example/citrusclient/views/LoginActivity.java
+++ b/app/src/main/java/com/example/citrusclient/views/LoginActivity.java
@@ -19,18 +19,26 @@
         super.onCreate(savedInstanceState);
         EdgeToEdge.enable(this);
         setContentView(R.layout.activity_login);
-
-        username = findViewById(R.id.username);
-        password = findViewById(R.id.password);
-        loginButton = findViewById(R.id.loginButton);
         ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
             Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
             v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
             return insets;
         });
 
-        Button nextButton = (Button)findViewById(R.id.newAccount);
-        nextButton.setOnClickListener(new View.OnClickListener(){
+        // username = findViewById(R.id.username);
+        // password = findViewById(R.id.password);
+        // loginButton = findViewById(R.id.loginButton);
+
+        Button loginButton = (Button)findViewById(R.id.loginButton);
+        loginButton.setOnClickListener(new View.OnClickListener(){
+
+            public void onClick(View v){
+                Intent intent = new Intent(LoginActivity.this,MainActivity.class);
+                startActivity(intent);
+            }
+        });
+        Button newButton = (Button)findViewById(R.id.newAccount);
+        newButton.setOnClickListener(new View.OnClickListener(){
 
             public void onClick(View v){
                 Intent intent = new Intent(LoginActivity.this,MainActivity.class);
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 18a868c..775e98c 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,90 +1,102 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/loginbkg_1"
-    android:gravity="center"
-    android:orientation="vertical"
-    tools:context=".MainActivity">
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:card_view="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/main"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:background="@drawable/loginbkg_1"
+  android:gravity="center"
+  android:orientation="vertical"
+  tools:context=".MainActivity">
 
     <!--下の文字-->
 
+    <Button
+      android:id="@+id/newAccount"
+      android:layout_width="300dp"
+      android:layout_height="58dp"
+      android:layout_marginBottom="88dp"
+      android:backgroundTint="#00BCD4"
+      android:text="新規登録はこちら"
+      android:textSize="18sp"
+      app:cornerRadius="20dp"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/linearLayout" />
+
     <LinearLayout
-        android:id="@+id/linearLayout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.503">
+      android:id="@+id/linearLayout"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintHorizontal_bias="0.0"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      app:layout_constraintVertical_bias="0.503">
 
         <androidx.cardview.widget.CardView
-            android:id="@+id/cardView2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="30dp"
-            android:background="@drawable/custom_edittext"
-            app:cardCornerRadius="30dp"
-            app:cardElevation="20dp"
-            tools:layout_editor_absoluteX="30dp">
+          android:id="@+id/cardView2"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_margin="30dp"
+          android:background="@color/purple_200"
+          app:cardCornerRadius="30dp"
+          app:cardElevation="20dp"
+          tools:layout_editor_absoluteX="30dp">
 
             <LinearLayout
-                android:layout_width="376dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:orientation="vertical"
-                android:padding="40dp"> <!--24やった-->
-
+              android:layout_width="376dp"
+              android:layout_height="wrap_content"
+              android:layout_gravity="center_horizontal"
+              android:padding="40dp"
+              android:orientation="vertical"> <!--24やった-->
 
                 <TextView
-                    android:id="@+id/loginText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="Login"
-                    android:textAlignment="center"
-                    android:textColor="#00BCD4"
-                    android:textSize="36sp"
-                    android:textStyle="bold" />
+                  android:id="@+id/loginText"
+                  android:textStyle="bold"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:text="Login"
+                  android:textAlignment="center"
+                  android:textColor="#00BCD4"
+                  android:textSize="36sp" />
 
                 <EditText
-                    android:id="@+id/username"
-                    android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:layout_marginTop="40dp"
-                    android:drawableLeft="@drawable/baseline_face_24"
-                    android:drawablePadding="8dp"
-                    android:hint="Username"
-                    android:padding="8dp"
-                    android:textColor="@color/black"
-                    android:textColorHighlight="@color/cardview_dark_background" />
-
+                  android:id="@+id/username"
+                  android:layout_width="match_parent"
+                  android:layout_height="50dp"
+                  android:layout_marginTop="40dp"
+                  android:padding="8dp"
+                  android:drawableLeft="@drawable/baseline_face_24"
+                  android:drawablePadding="8dp"
+                  android:hint="Username"
+                  android:textColor="@color/black"
+                  android:textColorHighlight="@color/cardview_dark_background" />
                 <EditText
-                    android:id="@+id/password"
-                    android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:layout_marginTop="20dp"
-                    android:drawableLeft="@android:drawable/ic_secure"
-                    android:drawablePadding="8dp"
-                    android:hint=" Password"
-                    android:inputType="textPassword"
-                    android:padding="13dp"
-                    android:textColor="@color/black"
-                    android:textColorHighlight="@color/cardview_dark_background" />
-
+                  android:id="@+id/password"
+                  android:layout_width="match_parent"
+                  android:layout_height="50dp"
+                  android:layout_marginTop="20dp"
+                  android:padding="13dp"
+                  android:drawableLeft="@android:drawable/ic_secure"
+                  android:drawablePadding="8dp"
+                  android:hint=" Password"
+                  android:inputType="textPassword"
+                  android:textColor="@color/black"
+                  android:textColorHighlight="@color/cardview_dark_background" />
                 <Button
-                    android:id="@+id/loginButton"
-                    android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:layout_marginTop="30dp"
-                    android:backgroundTint="#00BCD4"
-                    android:text="Login"
-                    android:textSize="18sp"
-                    app:cornerRadius="20dp" />
+                  android:id="@+id/loginButton"
+                  android:layout_width="match_parent"
+                  android:layout_height="60dp"
+                  android:layout_marginTop="30dp"
+                  android:backgroundTint="#00BCD4"
+                  android:text="Login"
+                  android:textSize="18sp"
+                  app:cornerRadius="20dp" />
 
                 <!--パスワード-->
 
@@ -96,19 +108,5 @@
         </androidx.cardview.widget.CardView>
     </LinearLayout>
 
-    <Button
-        android:id="@+id/newAccount"
-        android:layout_width="300dp"
-        android:layout_height="58dp"
-        android:layout_marginBottom="88dp"
-        android:backgroundTint="#00BCD4"
-        android:text="新規登録はこちら"
-        android:textSize="18sp"
-        app:cornerRadius="20dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linearLayout" />
-
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file