diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenActivity.java index f78cae3..250f5b3 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenActivity.java @@ -41,6 +41,7 @@ @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setTheme(R.style.AppTheme_NoTitleBar);//タイトルバーを消す init(); } 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 908c394..7eb1d91 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 @@ -30,6 +30,7 @@ private CreateViewModel createViewModel; private FragmentCreateBinding binding; private HomeViewModel homeViewModel; + private Acanthus acanthus; public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -57,7 +58,7 @@ Integer uid = 1; String token = "abc0"; - Acanthus acanthus = (Acanthus) getActivity().getApplication(); + acanthus = (Acanthus) getActivity().getApplication(); appButton.setOnClickListener(v -> { //Integer uid = acanthus.getPreferenceUid(); String name = ((EditText)view.findViewById(R.id.AnimationNameCreate)).getText().toString(); diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java index fa4840d..9d473e0 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java @@ -101,6 +101,8 @@ ListView listView = (ListView) getActivity().findViewById(R.id.list_view); listView.addHeaderView(header); + homeViewModel.updateGallery(acanthus); // ギャラリーをアップデート + // SwipeRefreshLayoutを作成 createSwipeRefreshLayout(); diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java index e0b1794..d614b1f 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java @@ -51,8 +51,6 @@ View root = binding.getRoot(); ListView listView = binding.animationView; - - updateGallery(); // // final TextView textView = binding.textHome; // homeViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/sign_up/SignUpActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/sign_up/SignUpActivity.java index 8d4d1fa..25744bb 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/sign_up/SignUpActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/sign_up/SignUpActivity.java @@ -32,6 +32,7 @@ @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setTheme(R.style.AppTheme_NoTitleBar);//タイトルバーを消す init(); } diff --git a/app/src/main/res/layout/activity_login_screen.xml b/app/src/main/res/layout/activity_login_screen.xml index ff13fca..9ec0573 100644 --- a/app/src/main/res/layout/activity_login_screen.xml +++ b/app/src/main/res/layout/activity_login_screen.xml @@ -51,7 +51,8 @@ android:gravity="center|center_vertical" android:ems="10" android:inputType="textEmailAddress" - android:text="d0@dummy.com" /> + android:text="d0@dummy.com" + android:textColor="@color/black"/> @@ -82,7 +83,8 @@ android:gravity="center|center_vertical" android:ems="10" android:inputType="textPassword" - android:text="nittalab" /> + android:text="nittalab" + android:textColor="@color/black"/> @@ -115,6 +117,7 @@ android:gravity="center|center_vertical" android:onClick="onClickSignUp" android:text="新規登録はこちら" + android:textColor="@color/black" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml index 34e086d..3300896 100644 --- a/app/src/main/res/layout/activity_sign_up.xml +++ b/app/src/main/res/layout/activity_sign_up.xml @@ -50,7 +50,8 @@ android:gravity="center|center_vertical" android:ems="10" android:inputType="textPersonName" - android:text="name" /> + android:text="name" + android:textColor="@color/black"/> @@ -81,7 +82,8 @@ android:gravity="center|center_vertical" android:ems="10" android:inputType="textEmailAddress" - android:text="d0@dummy.com" /> + android:text="d0@dummy.com" + android:textColor="@color/black"/> @@ -112,7 +114,8 @@ android:gravity="center|center_vertical" android:ems="10" android:inputType="textPassword" - android:text="nittalab" /> + android:text="nittalab" + android:textColor="@color/black"/> @@ -145,7 +148,8 @@ android:gravity="center|center_vertical" android:onClick="onClickAlreadyLoggedIn" android:text="ログインはこちら" - android:textStyle="bold" /> + android:textStyle="bold" + android:textColor="@color/black"/>