diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java index 6295b16..9bbd223 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java @@ -14,6 +14,7 @@ import org.ntlab.acanthus_client.databinding.ActivityMainBinding; import org.ntlab.acanthus_client.views.main_menu_ui.mypage.MyPageFragment; +import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; import androidx.core.app.ShareCompat; import androidx.fragment.app.FragmentManager; @@ -95,4 +96,12 @@ } } + // 戻るボタン「←」をアクションバー(上部バー)にセットするメソッドを定義 + public void setupBackButton(boolean enableBackButton) { + // アクションバーを取得 + ActionBar actionBar = getSupportActionBar(); + // アクションバーに戻るボタン「←」をセット(引数が true: 表示、false: 非表示) + actionBar.setDisplayHomeAsUpEnabled(enableBackButton); + } + } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/create/CreateFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/create/CreateFragment.java index a505b2e..d1718d2 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/create/CreateFragment.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/create/CreateFragment.java @@ -20,6 +20,7 @@ import org.ntlab.acanthus_client.R; import org.ntlab.acanthus_client.databinding.FragmentCreateBinding; import org.ntlab.acanthus_client.databinding.FragmentEditBinding; +import org.ntlab.acanthus_client.views.MainActivity; import org.ntlab.acanthus_client.views.main_menu_ui.edit.EditViewModel; import org.ntlab.acanthus_client.views.paint.PaintActivity; @@ -35,6 +36,10 @@ binding = FragmentCreateBinding.inflate(inflater, container, false); View root = binding.getRoot(); + // 戻るボタン + MainActivity activity = (MainActivity) getActivity(); + activity.setupBackButton(false); + return root; } diff --git a/app/src/main/res/layout/activity_terms_of_service.xml b/app/src/main/res/layout/activity_terms_of_service.xml index d5cb2c9..1f1b26a 100644 --- a/app/src/main/res/layout/activity_terms_of_service.xml +++ b/app/src/main/res/layout/activity_terms_of_service.xml @@ -1,9 +1,796 @@ - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file