From 11aa7c75e16d6819d0681f408c720cbc6a6754ba Mon Sep 17 00:00:00 2001 From: Bryson Steck Date: Tue, 18 May 2021 20:48:17 -0600 Subject: did a ton of stuff i dont remember like a dark mode and small enhancements --- app/src/main/res/anim/fade_in.xml | 8 +++ app/src/main/res/anim/fade_out.xml | 8 +++ app/src/main/res/anim/slide_in.xml | 8 +++ app/src/main/res/anim/slide_out.xml | 8 +++ app/src/main/res/layout/about_fragment.xml | 36 ++++++++++-- app/src/main/res/layout/activity_main.xml | 4 +- app/src/main/res/layout/activity_wiimmfi.xml | 6 +- app/src/main/res/layout/fragment_room.xml | 37 ------------ .../main/res/layout/friend_code_input_fragment.xml | 65 ---------------------- .../main/res/layout/header_navigation_drawer.xml | 17 ++++++ app/src/main/res/layout/room_fragment.xml | 41 ++++++++++++++ app/src/main/res/layout/watch_code_fragment.xml | 62 +++++++++++++++++++++ app/src/main/res/menu/drawer_navigation_menu.xml | 1 - app/src/main/res/transition/delayed_fade.xml | 6 ++ app/src/main/res/transition/fade.xml | 5 ++ app/src/main/res/transition/slide_right.xml | 7 +++ .../main/res/transition/slide_right_delayed.xml | 7 +++ app/src/main/res/values-night/themes.xml | 8 +-- app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/strings.xml | 9 +++ app/src/main/res/values/themes.xml | 3 +- 21 files changed, 230 insertions(+), 117 deletions(-) create mode 100644 app/src/main/res/anim/fade_in.xml create mode 100644 app/src/main/res/anim/fade_out.xml create mode 100644 app/src/main/res/anim/slide_in.xml create mode 100644 app/src/main/res/anim/slide_out.xml delete mode 100644 app/src/main/res/layout/fragment_room.xml delete mode 100644 app/src/main/res/layout/friend_code_input_fragment.xml create mode 100644 app/src/main/res/layout/header_navigation_drawer.xml create mode 100644 app/src/main/res/layout/room_fragment.xml create mode 100644 app/src/main/res/layout/watch_code_fragment.xml create mode 100644 app/src/main/res/transition/delayed_fade.xml create mode 100644 app/src/main/res/transition/fade.xml create mode 100644 app/src/main/res/transition/slide_right.xml create mode 100644 app/src/main/res/transition/slide_right_delayed.xml (limited to 'app/src/main/res') diff --git a/app/src/main/res/anim/fade_in.xml b/app/src/main/res/anim/fade_in.xml new file mode 100644 index 0000000..119faa5 --- /dev/null +++ b/app/src/main/res/anim/fade_in.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/anim/fade_out.xml b/app/src/main/res/anim/fade_out.xml new file mode 100644 index 0000000..7d171fc --- /dev/null +++ b/app/src/main/res/anim/fade_out.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/anim/slide_in.xml b/app/src/main/res/anim/slide_in.xml new file mode 100644 index 0000000..2c4f7ff --- /dev/null +++ b/app/src/main/res/anim/slide_in.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/anim/slide_out.xml b/app/src/main/res/anim/slide_out.xml new file mode 100644 index 0000000..5cc6127 --- /dev/null +++ b/app/src/main/res/anim/slide_out.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/about_fragment.xml b/app/src/main/res/layout/about_fragment.xml index 7fb085a..90a63ca 100644 --- a/app/src/main/res/layout/about_fragment.xml +++ b/app/src/main/res/layout/about_fragment.xml @@ -2,8 +2,10 @@ + android:layout_height="match_parent" + android:background="#FFFFFF"> @@ -68,8 +70,8 @@ android:id="@+id/github_text" android:layout_width="0dp" android:layout_height="wrap_content" - android:text="TextView" android:paddingBottom="15dp" + android:text="TextView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/textView7" /> @@ -90,8 +92,8 @@ android:id="@+id/contact_text" android:layout_width="0dp" android:layout_height="wrap_content" - android:text="TextView" android:paddingBottom="15dp" + android:text="TextView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/textView9" /> @@ -100,12 +102,22 @@ android:id="@+id/bugs_text" android:layout_width="0dp" android:layout_height="wrap_content" - android:paddingBottom="65dp" + android:paddingBottom="15dp" android:text="TextView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/textView13" /> + + + + - \ No newline at end of file + \ 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 1116b4b..08083c2 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -24,10 +24,10 @@ style="@style/Widget.MaterialComponents.Toolbar.Primary" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - android:background="@android:color/transparent" android:elevation="0dp" app:menu="@menu/top_app_bar" - app:title="Wiimmfi Watcher" /> + app:title="Wiimmfi Watcher" + app:titleTextColor="@color/white" /> diff --git a/app/src/main/res/layout/activity_wiimmfi.xml b/app/src/main/res/layout/activity_wiimmfi.xml index 92fe378..f62fe15 100644 --- a/app/src/main/res/layout/activity_wiimmfi.xml +++ b/app/src/main/res/layout/activity_wiimmfi.xml @@ -26,7 +26,9 @@ android:background="@android:color/transparent" android:elevation="0dp" app:navigationIcon="@drawable/ic_baseline_menu_24" - app:title="Watching 0000-0000-0000" /> + app:navigationIconTint="#FFFFFF" + app:title="Watching 0000-0000-0000" + app:titleTextColor="#FFFFFF" /> @@ -49,6 +51,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="start" + android:theme="@style/Theme.WiimmfiWatcher" + app:headerLayout="@layout/header_navigation_drawer" app:menu="@menu/drawer_navigation_menu"> diff --git a/app/src/main/res/layout/fragment_room.xml b/app/src/main/res/layout/fragment_room.xml deleted file mode 100644 index 467348b..0000000 --- a/app/src/main/res/layout/fragment_room.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/friend_code_input_fragment.xml b/app/src/main/res/layout/friend_code_input_fragment.xml deleted file mode 100644 index 0dcf568..0000000 --- a/app/src/main/res/layout/friend_code_input_fragment.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - -