diff --git a/app/src/main/java/com/example/citrusclient/views/BookColorDialogFragment.java b/app/src/main/java/com/example/citrusclient/views/BookColorDialogFragment.java index fe52065..63d1bbb 100644 --- a/app/src/main/java/com/example/citrusclient/views/BookColorDialogFragment.java +++ b/app/src/main/java/com/example/citrusclient/views/BookColorDialogFragment.java @@ -56,13 +56,13 @@ } else if (selectedId == R.id.radioButtonAqua) { target.returnValue("#BEF7FF"); } else if (selectedId == R.id.radioButtonLavender) { - target.returnValue("#B994FF"); + target.returnValue("#D297FC"); } else if (selectedId == R.id.radioButtonJasmine) { target.returnValue("#FFFFFF"); } else if (selectedId == R.id.radioButtonCitrus) { - target.returnValue("#F6C755"); + target.returnValue("#FFFF99"); } else if (selectedId == R.id.radioButtonSakura) { - target.returnValue("#FFCBFA"); + target.returnValue("#FFECEF"); } } diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 80c11a8..a8f88b6 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -50,6 +50,7 @@ android:drawableLeft="@drawable/baseline_face_24" android:drawablePadding="8dp" android:hint="Username" + android:inputType="text" android:textColor="@color/black" android:textColorHighlight="@color/cardview_dark_background" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 785db3b..3658638 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -17,7 +17,8 @@ android:name="com.example.citrusclient.views.CreateBookFragment" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_weight="1" /> + android:layout_weight="1" + android:background="#EFFFE6" /> diff --git a/app/src/main/res/layout/fragment_book_color_dialog.xml b/app/src/main/res/layout/fragment_book_color_dialog.xml index 7f7c250..28a3524 100644 --- a/app/src/main/res/layout/fragment_book_color_dialog.xml +++ b/app/src/main/res/layout/fragment_book_color_dialog.xml @@ -33,7 +33,7 @@ android:layout_width="280dp" android:layout_height="wrap_content" android:layout_gravity="center" - android:buttonTint="#BEECAE" + android:buttonTint="#A7D697" android:text="Sprout" /> diff --git a/app/src/main/res/layout/fragment_create_book.xml b/app/src/main/res/layout/fragment_create_book.xml index d1d06e1..f1839a9 100644 --- a/app/src/main/res/layout/fragment_create_book.xml +++ b/app/src/main/res/layout/fragment_create_book.xml @@ -91,6 +91,7 @@ android:background="#4DE2FAD4" android:hint="本の名前" android:textAlignment="center" + android:inputType="text" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="1.0" diff --git a/app/src/main/res/layout/fragment_my_bookshelf_fragment.xml b/app/src/main/res/layout/fragment_my_bookshelf_fragment.xml index 4bee557..770710b 100644 --- a/app/src/main/res/layout/fragment_my_bookshelf_fragment.xml +++ b/app/src/main/res/layout/fragment_my_bookshelf_fragment.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="#80EFFFE6" tools:context=".views.MyBookshelfFragment"> + android:src="@drawable/baseline_add_24" + app:backgroundTint="#FFFFFF" />