diff options
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/about_fragment.xml | 36 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_main.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_wiimmfi.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/layout/friend_code_input_fragment.xml | 65 | ||||
| -rw-r--r-- | app/src/main/res/layout/header_navigation_drawer.xml | 17 | ||||
| -rw-r--r-- | app/src/main/res/layout/room_fragment.xml (renamed from app/src/main/res/layout/fragment_room.xml) | 6 | ||||
| -rw-r--r-- | app/src/main/res/layout/watch_code_fragment.xml | 62 |
7 files changed, 121 insertions, 75 deletions
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 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/about_view" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:background="#FFFFFF"> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" @@ -47,8 +49,8 @@ android:id="@+id/about_me_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/textView5" /> @@ -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,13 +102,23 @@ 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" /> <TextView + android:id="@+id/license_text" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:paddingBottom="65dp" + android:text="TextView" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/textView4" /> + + <TextView android:id="@+id/textView13" android:layout_width="0dp" android:layout_height="wrap_content" @@ -117,5 +129,17 @@ app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/contact_text" /> + + <TextView + android:id="@+id/textView4" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:text="License and Copyright" + android:textSize="24sp" + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/bugs_text" /> </androidx.constraintlayout.widget.ConstraintLayout> - </ScrollView>
\ No newline at end of file +</ScrollView>
\ 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" /> </com.google.android.material.appbar.AppBarLayout> 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" /> </com.google.android.material.appbar.AppBarLayout> @@ -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"> </com.google.android.material.navigation.NavigationView> 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:padding="15dp"> - - <TextView - android:id="@+id/textView2" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:text="Enter a friend code to watch:" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - tools:layout_editor_absoluteY="15dp" /> - - <EditText - android:id="@+id/friend_code_edit_text" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:drawablePadding="15dp" - android:ems="10" - android:inputType="textPersonName" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/textView2" /> - - <Button - android:id="@+id/watch_button" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:text="Watch" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/friend_code_edit_text" /> - - <TextView - android:id="@+id/error_text" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:textColor="#B71C1C" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/watch_button" /> - - <TextView - android:id="@+id/textView3" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:text="Recently Watched Friend Codes:" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/error_text" /> - - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/recent_friend_codes_recycler_view" - android:layout_width="match_parent" - android:layout_height="wrap_content" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.0" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/textView3" /> - -</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/header_navigation_drawer.xml b/app/src/main/res/layout/header_navigation_drawer.xml new file mode 100644 index 0000000..8fc058d --- /dev/null +++ b/app/src/main/res/layout/header_navigation_drawer.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" android:layout_width="match_parent" + android:layout_height="match_parent"> + + + <TextView + android:id="@+id/user_navigation_drawer" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="24dp" + android:layout_marginTop="50dp" + android:layout_marginEnd="24dp" + android:text="Player Details" + android:textAppearance="?attr/textAppearanceHeadline6" /> + +</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_room.xml b/app/src/main/res/layout/room_fragment.xml index 467348b..81f8419 100644 --- a/app/src/main/res/layout/fragment_room.xml +++ b/app/src/main/res/layout/room_fragment.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" android:foregroundTint="@color/white"> @@ -19,7 +20,9 @@ android:layout_width="match_parent" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintTop_toBottomOf="@+id/room_header_text" /> + app:layout_constraintTop_toBottomOf="@+id/room_header_text" > + + </androidx.recyclerview.widget.RecyclerView> <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/refresh_button" @@ -34,4 +37,5 @@ app:layout_constraintEnd_toEndOf="parent" app:srcCompat="@drawable/ic_baseline_refresh_24" app:tint="@color/white" /> + </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/watch_code_fragment.xml b/app/src/main/res/layout/watch_code_fragment.xml new file mode 100644 index 0000000..ad8745b --- /dev/null +++ b/app/src/main/res/layout/watch_code_fragment.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/watch_code_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="15dp"> + + <com.google.android.material.textfield.TextInputLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:endIconMode="clear_text"> + + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/friend_code_edit_text" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:drawablePadding="15dp" + android:ems="10" + android:hint="Enter a friend code to watch" + android:inputType="phone" + android:textColorHint="#1E88E5" /> + </com.google.android.material.textfield.TextInputLayout> + + <Button + android:id="@+id/watch_button" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="Watch" + app:backgroundTint="@color/blue_700" /> + + <TextView + android:id="@+id/error_text" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="#B71C1C" /> + + <TextView + android:id="@+id/textView3" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="Recently Watched Friend Codes:" /> + + <ScrollView + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/recent_friend_codes_recycler_view" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + </LinearLayout> + </ScrollView> + +</LinearLayout> |