diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e938999..58c5659 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
+ xmlns:tools="http://schemas.android.com/tools" >
-
-
-
-
-
-
-
-
-
-
-
+ tools:targetApi="31" >
+
+
+
+
+
+
+
-
-
-
-
-
+ tools:ignore="DuplicateActivity" >
@@ -67,12 +57,4 @@
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/java/com/example/oplogy/MainActivity.java b/app/src/main/java/com/example/oplogy/MainActivity.java
index d7dc725..8a767e3 100644
--- a/app/src/main/java/com/example/oplogy/MainActivity.java
+++ b/app/src/main/java/com/example/oplogy/MainActivity.java
@@ -87,7 +87,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
// セットアップのクリック処理
if(view == setUp){
imageSetup.setImageResource(R.drawable.ischecked_uuid);
- Intent toSetup = new Intent(MainActivity.this,SetupActivity.class);
+ Intent toSetup = new Intent(MainActivity.this, SetUpActivity.class);
startActivity(toSetup);
}
diff --git a/app/src/main/res/layout/activity_set_up.xml b/app/src/main/res/layout/activity_set_up.xml
index d08c2e3..a919523 100644
--- a/app/src/main/res/layout/activity_set_up.xml
+++ b/app/src/main/res/layout/activity_set_up.xml
@@ -1,12 +1,12 @@
+ android:gravity="center">
-
+
-
+
@@ -45,20 +45,20 @@
android:padding="10dp"
android:gravity="center">
-
+
-
+
@@ -69,19 +69,19 @@
android:padding="10dp"
android:gravity="center">
-
+
-
+
@@ -92,19 +92,19 @@
android:padding="10dp"
android:gravity="center">
-
+
-
+
@@ -115,46 +115,46 @@
android:padding="10dp"
android:gravity="center">
-
+
-
+
-
+
-
+
-
+
-
+
@@ -165,20 +165,20 @@
android:padding="10dp"
android:gravity="center">
-
+
-
+
@@ -189,20 +189,20 @@
android:padding="10dp"
android:gravity="center">
-
+
-
+
@@ -213,18 +213,18 @@
android:weightSum="2"
android:layout_marginTop="20sp">
-
+
-
+
diff --git a/app/src/main/res/layout/setup.xml b/app/src/main/res/layout/setup.xml
deleted file mode 100644
index eeacfd1..0000000
--- a/app/src/main/res/layout/setup.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
\ No newline at end of file