diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3ae2b1e..1b4f7a5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
android:supportsRtl="true"
android:theme="@style/Theme.Acanthus"
android:usesCleartextTraffic="true">
-
+
diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageFragment.java
index d32f402..15fa47b 100644
--- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageFragment.java
+++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageFragment.java
@@ -7,20 +7,16 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
-import android.widget.EditText;
import android.widget.TextView;
import org.ntlab.acanthus_client.Acanthus;
-import org.ntlab.acanthus_client.R;
import org.ntlab.acanthus_client.databinding.FragmentMypageBinding;
-import org.ntlab.acanthus_client.entities.Animation;
import org.ntlab.acanthus_client.views.animation.AnimationActivity;
import org.ntlab.acanthus_client.views.main_menu_ui.mypage.others.AppInformationActivity;
-import org.ntlab.acanthus_client.views.main_menu_ui.mypage.others.LogoutActivity;
+import org.ntlab.acanthus_client.views.main_menu_ui.mypage.logout.LogoutActivity;
import org.ntlab.acanthus_client.views.main_menu_ui.mypage.others.PrivacyPolicyActivity;
import org.ntlab.acanthus_client.views.main_menu_ui.mypage.others.TermsOfServiceActivity;
-import org.ntlab.acanthus_client.views.paint.PaintActivity;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -28,8 +24,6 @@
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
-import static android.os.Build.VERSION_CODES.R;
-
//-----------------------------------------------------------------
//
public class MyPageFragment extends Fragment {
diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/logout/LogoutActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/logout/LogoutActivity.java
new file mode 100644
index 0000000..b844efd
--- /dev/null
+++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/logout/LogoutActivity.java
@@ -0,0 +1,25 @@
+package org.ntlab.acanthus_client.views.main_menu_ui.mypage.logout;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+
+import org.ntlab.acanthus_client.R;
+
+public class LogoutActivity extends AppCompatActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setTitle( "ログアウト" );
+ init();
+ }
+
+ //-----------------------------------------------------------------
+ //-----------------------------------------------------------------
+ // 初期化
+ private void init() {
+ setContentView(R.layout.activity_logout);
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/others/LogoutActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/others/LogoutActivity.java
deleted file mode 100644
index 273697f..0000000
--- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/others/LogoutActivity.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.ntlab.acanthus_client.views.main_menu_ui.mypage.others;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.os.Bundle;
-
-import org.ntlab.acanthus_client.R;
-
-public class LogoutActivity extends AppCompatActivity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setTitle( "ログアウト" );
- init();
- }
-
- //-----------------------------------------------------------------
- //-----------------------------------------------------------------
- // 初期化
- private void init() {
- setContentView(R.layout.activity_logout);
- }
-
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_logout.xml b/app/src/main/res/layout/activity_logout.xml
index 822fab0..f52f9a8 100644
--- a/app/src/main/res/layout/activity_logout.xml
+++ b/app/src/main/res/layout/activity_logout.xml
@@ -4,6 +4,60 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".views.main_menu_ui.mypage.others.LogoutActivity">
+ tools:context=".views.main_menu_ui.mypage.logout.LogoutActivity">
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 20e04a9..bc7aaad 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -12,6 +12,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="0dp"
android:layout_marginEnd="0dp"
+ app:labelVisibilityMode="labeled"
android:background="?android:attr/windowBackground"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"