diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2179e9b..012205b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <application
+        android:name=".Tampopo"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
diff --git a/app/src/main/java/com/example/tampopo_client/Tampopo.java b/app/src/main/java/com/example/tampopo_client/Tampopo.java
new file mode 100644
index 0000000..3cff24c
--- /dev/null
+++ b/app/src/main/java/com/example/tampopo_client/Tampopo.java
@@ -0,0 +1,33 @@
+package com.example.tampopo_client;
+
+import android.app.Application;
+
+public class Tampopo extends Application {
+  private String token;
+  private String userId;
+  private String password;
+
+  public String getToken() {
+    return token;
+  }
+
+  public void setToken(String token) {
+    this.token = token;
+  }
+
+  public String getUserId() {
+    return userId;
+  }
+
+  public void setUserId(String userId) {
+    this.userId = userId;
+  }
+
+  public String getPassword() {
+    return password;
+  }
+
+  public void setPassword(String password) {
+    this.password = password;
+  }
+}
diff --git a/app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java b/app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java
index effcf58..3054883 100644
--- a/app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java
+++ b/app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java
@@ -24,6 +24,16 @@
 viewModel側　
 viewModelからsetValueで値を変えていく
 updateUserName、updateEmail、login、createUserもある。それらを書いていく。viewから必要なものを出していく
+
+viewとviewModels
+イベントパターン
+1.画面を表示するごとに値を取る
+2.ボタンを押した際の通信をする
+3.画面の途中で更新する
+
+view側がviewModelを使うための方法
+1.最初にUserViewModel userViewModelで宣言　88行目 userViewModelのインスタンスを作る
+
 */
 
 public class UserViewModel extends ViewModel {
@@ -49,7 +59,8 @@
     public LiveData<Boolean>isLoading() { return loading;}
     public LiveData<String> getError()  { return error;  }
 
-    //新規登録
+    //新規登録　enqueueで非同期処理、Callbackで成功失敗の処理、LiveDataに反映
+    //サーバーから返ってきた型と合わせないとFailureに流れる
     public void createUser(String id, String password) {
         loading.setValue(true);
         userResource.createUser(id, password).enqueue(new Callback<User>() {
@@ -63,7 +74,27 @@
             }
             @Override public void onFailure(Call<User> c, Throwable t) {
                 loading.setValue(false);
-                error.setValue("ネットワークエラー: " + t.getMessage());
+                error.setValue("エラー: " + t.getMessage());
+            }
+        });
+    }
+
+    //ログイン
+    public void login(String id, String password) {
+        loading.setValue(true);
+        userResource.login(id, password).enqueue(new Callback<String>() {
+            @Override public void onResponse(Call<String> c, Response<String> res) {
+                loading.setValue(false);
+                if (res.isSuccessful()) {
+                    setValue(res.body());
+                    userResource.getUser(id);
+                } else {
+                    error.setValue("ログイン失敗: " + res.code());
+                }
+            }
+            @Override public void onFailure(Call<String> c, Throwable t) {
+                loading.setValue(false);
+                error.setValue("エラー: " + t.getMessage());
             }
         });
     }
diff --git a/app/src/main/java/com/example/tampopo_client/views/LoginActivity.java b/app/src/main/java/com/example/tampopo_client/views/LoginActivity.java
index a72efcb..d34fc94 100644
--- a/app/src/main/java/com/example/tampopo_client/views/LoginActivity.java
+++ b/app/src/main/java/com/example/tampopo_client/views/LoginActivity.java
@@ -1,15 +1,24 @@
 package com.example.tampopo_client.views;
 
+import android.content.Intent;
 import android.os.Bundle;
+import android.content.Intent;
 
+import android.view.View;
+import android.view.View.OnClickListener;
+
+import android.widget.Button;
 import androidx.activity.EdgeToEdge;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
+import androidx.lifecycle.ViewModelProvider;
+import com.example.tampopo_client.views.MainActivity;
 import com.example.tampopo_client.R;
 
 public class LoginActivity extends AppCompatActivity {
+  UserViewModel userViewModel;
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
@@ -21,5 +30,26 @@
       v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
       return insets;
     });
+    userViewModel = new ViewModelProvider(this).get(UserViewModel.class);
+
+    Button button_login = (Button) findViewById(R.id.loginbutton);
+    button_login.setOnClickListener(new OnClickListener(){
+
+      public void onClick(View v){
+        Intent intent = new Intent(LoginActivity.this, MainActivity.class);
+        startActivity(intent);
+
+      }
+    });
+
+    Button button_createaccount = (Button) findViewById(R.id.createaccountbutton);
+    button_createaccount.setOnClickListener(new OnClickListener(){
+
+      public void onClick(View v){
+        Intent intent = new Intent(LoginActivity.this, RegisterActivity.class);
+        startActivity(intent);
+      }
+    });
+
   }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/eye.png b/app/src/main/res/drawable/eye.png
new file mode 100644
index 0000000..0cb343f
--- /dev/null
+++ b/app/src/main/res/drawable/eye.png
Binary files differ
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 072e326..15a2dfc 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -5,6 +5,115 @@
   android:id="@+id/main"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  tools:context=".views.LoginActivity">
+  tools:context=".views.LoginActivity"
+  android:background="#E0F7FA">
+
+
+  <TextView
+    android:id="@+id/logintextView"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="ログイン"
+    android:textSize="24sp"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintHorizontal_bias="0.5"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintVertical_bias="0.219" />
+  <EditText
+    android:id="@+id/userIDText"
+    android:layout_width="310dp"
+    android:layout_height="53dp"
+    android:ems="10"
+    android:hint=" ユーザーID"
+    android:inputType="text"
+    android:background="#FFFFFF"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintHorizontal_bias="0.5"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintVertical_bias="0.391" />
+  <EditText
+    android:id="@+id/PasswordText"
+    android:layout_width="310dp"
+    android:layout_height="53dp"
+    android:ems="10"
+    android:hint=" パスワード"
+    android:inputType="textPassword"
+    android:background="#FFFFFF"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintHorizontal_bias="0.5"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintVertical_bias="0.518" />
+  <Button
+    android:id="@+id/loginbutton"
+    android:layout_width="310dp"
+    android:layout_height="55dp"
+    android:text="ログイン"
+    android:textSize="19sp"
+    android:textColor="#000000"
+    app:backgroundTint="#FFFF55"
+    app:cornerRadius="5dp"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintVertical_bias="0.68" />
+  <TextView
+    android:id="@+id/registertextView"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="まだアカウントをお持ちでない方は＿＿＿＿＿"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintHorizontal_bias="0.5"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintVertical_bias="0.835" />
+  <Button
+    android:id="@+id/createaccountbutton"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="こちら"
+    android:background="@android:color/transparent"
+    android:textColor="#000000"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintHorizontal_bias="0.846"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintVertical_bias="0.844" />
+  <TextView
+    android:id="@+id/textView"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"
+    android:text="※ユーザーIDまたはパスワードが正しくありません。"
+    android:textColor="#FF0000"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintHorizontal_bias="0.5"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintVertical_bias="0.76" />
+
+  <ImageButton
+    android:id="@+id/passwordimageView"
+    android:layout_width="40dp"
+    android:layout_height="40dp"
+    android:layout_weight="1"
+    android:src="@drawable/eye"
+    android:scaleType="fitCenter"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintHorizontal_bias="0.83"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintVertical_bias="0.52"
+    android:background="@android:color/transparent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 1622dc6..3255594 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Base.Theme.Tampopoclient" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Base.Theme.Tampopoclient" parent="Theme.AppCompat.DayNight.NoActionBar">
         <!-- Customize your dark theme here. -->
         <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
     </style>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 97bf585..b4bacf5 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Base.Theme.Tampopoclient" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Base.Theme.Tampopoclient" parent="Theme.AppCompat.DayNight.NoActionBar">
         <!-- Customize your light theme here. -->
         <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
     </style>