aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/drawable/ic_baseline_assignment_ind_24.xml10
-rw-r--r--app/src/main/res/layout/activity_main.xml2
-rw-r--r--app/src/main/res/layout/activity_wiimmfi.xml24
-rw-r--r--app/src/main/res/layout/fragment_recent_friend_codes.xml14
-rw-r--r--app/src/main/res/layout/fragment_room.xml18
-rw-r--r--app/src/main/res/layout/friend_code_input_fragment.xml13
-rw-r--r--app/src/main/res/layout/recent_friend_codes_item.xml2
-rw-r--r--app/src/main/res/layout/room_player_data_item.xml7
-rw-r--r--app/src/main/res/menu/drawer_navigation_menu.xml2
-rw-r--r--app/src/main/res/values/colors.xml2
10 files changed, 70 insertions, 24 deletions
diff --git a/app/src/main/res/drawable/ic_baseline_assignment_ind_24.xml b/app/src/main/res/drawable/ic_baseline_assignment_ind_24.xml
new file mode 100644
index 0000000..d3ebec9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_assignment_ind_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:tint="?attr/colorControlNormal">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M19,3h-4.18C14.4,1.84 13.3,1 12,1c-1.3,0 -2.4,0.84 -2.82,2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM12,3c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM12,7c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM18,19L6,19v-1.4c0,-2 4,-3.1 6,-3.1s6,1.1 6,3.1L18,19z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index e13dc7b..05b6e5b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -38,7 +38,7 @@
app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
<androidx.fragment.app.FragmentContainerView
- android:id="@+id/recent_friend_codes_fragment"
+ android:id="@+id/room_fragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hapticFeedbackEnabled="false"
diff --git a/app/src/main/res/layout/activity_wiimmfi.xml b/app/src/main/res/layout/activity_wiimmfi.xml
index 1d4d077..92fe378 100644
--- a/app/src/main/res/layout/activity_wiimmfi.xml
+++ b/app/src/main/res/layout/activity_wiimmfi.xml
@@ -2,10 +2,10 @@
<androidx.drawerlayout.widget.DrawerLayout 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/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:id="@+id/drawer_layout"
- tools:context=".MainActivity">
+ tools:context=".wiimmfi.WiimmfiActivity">
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
@@ -13,28 +13,30 @@
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
+ style="@style/Widget.MaterialComponents.AppBarLayout.Primary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/Widget.MaterialComponents.AppBarLayout.Primary"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
+ style="@style/Widget.MaterialComponents.Toolbar.Primary"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
- app:title="Watching 0000-0000-0000"
- app:navigationIcon="@drawable/ic_baseline_menu_24"
- style="@style/Widget.MaterialComponents.Toolbar.Primary"
android:background="@android:color/transparent"
- android:elevation="0dp" />
+ android:elevation="0dp"
+ app:navigationIcon="@drawable/ic_baseline_menu_24"
+ app:title="Watching 0000-0000-0000" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.fragment.app.FragmentContainerView
- android:id="@+id/recent_friend_codes_fragment"
+ android:id="@+id/room_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
- app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+ app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+ </androidx.fragment.app.FragmentContainerView>
<!-- Screen content -->
<!-- Use app:layout_behavior="@string/appbar_scrolling_view_behavior" to fit below top app bar -->
@@ -47,8 +49,8 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start"
- app:menu="@menu/drawer_navigation_menu"
- >
+ app:menu="@menu/drawer_navigation_menu">
+
</com.google.android.material.navigation.NavigationView>
diff --git a/app/src/main/res/layout/fragment_recent_friend_codes.xml b/app/src/main/res/layout/fragment_recent_friend_codes.xml
index b1cbfe7..e05ce4a 100644
--- a/app/src/main/res/layout/fragment_recent_friend_codes.xml
+++ b/app/src/main/res/layout/fragment_recent_friend_codes.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/recent_friend_codes_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -12,7 +12,8 @@
android:padding="15dp"
android:text="Recently Watched Friend Codes:"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recent_friend_codes_recycler_view"
@@ -20,4 +21,11 @@
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView" />
+
+ <!-- <androidx.recyclerview.widget.RecyclerView-->
+ <!-- android:id="@+id/recent_friend_codes_recycler_view"-->
+ <!-- android:layout_width="match_parent"-->
+ <!-- android:layout_height="0dp"-->
+ <!-- app:layout_constraintBottom_toBottomOf="parent"-->
+ <!-- app:layout_constraintTop_toBottomOf="@+id/textView" />-->
</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_room.xml b/app/src/main/res/layout/fragment_room.xml
index 42d0d60..467348b 100644
--- a/app/src/main/res/layout/fragment_room.xml
+++ b/app/src/main/res/layout/fragment_room.xml
@@ -5,21 +5,33 @@
android:layout_height="match_parent"
android:foregroundTint="@color/white">
+ <TextView
+ android:id="@+id/room_header_text"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:padding="18dp"
+ android:text="TextView"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
+
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/player_data_recycler_view"
android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="0dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/room_header_text" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
- android:id="@+id/floatingActionButton"
+ android:id="@+id/refresh_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:clickable="true"
+ android:enabled="true"
android:foregroundTint="#FFFFFF"
app:backgroundTint="#1E88E5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:srcCompat="@drawable/ic_baseline_refresh_24"
- app:tint="@color/white"/>
+ app:tint="@color/white" />
</androidx.constraintlayout.widget.ConstraintLayout> \ 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
index b834f75..4f3b9ea 100644
--- a/app/src/main/res/layout/friend_code_input_fragment.xml
+++ b/app/src/main/res/layout/friend_code_input_fragment.xml
@@ -16,7 +16,7 @@
tools:layout_editor_absoluteY="15dp" />
<EditText
- android:id="@+id/editTextTextPersonName"
+ android:id="@+id/friend_code_edit_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:drawablePadding="15dp"
@@ -33,6 +33,15 @@
android:text="Watch"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/editTextTextPersonName" />
+ 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" />
</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/recent_friend_codes_item.xml b/app/src/main/res/layout/recent_friend_codes_item.xml
index cc2e5db..e56629a 100644
--- a/app/src/main/res/layout/recent_friend_codes_item.xml
+++ b/app/src/main/res/layout/recent_friend_codes_item.xml
@@ -6,7 +6,7 @@
android:layout_height="match_parent">
<Button
- android:id="@+id/button"
+ android:id="@+id/recent_friend_code_button"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="15dp"
diff --git a/app/src/main/res/layout/room_player_data_item.xml b/app/src/main/res/layout/room_player_data_item.xml
index e6e6ed8..e6fb5c2 100644
--- a/app/src/main/res/layout/room_player_data_item.xml
+++ b/app/src/main/res/layout/room_player_data_item.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.card.MaterialCardView 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/player_card_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="16dp">
+ android:layout_margin="16dp"
+ app:cardBackgroundColor="#FFFFFF">
<LinearLayout
android:layout_width="wrap_content"
@@ -32,6 +35,6 @@
android:layout_height="match_parent"
android:layout_margin="10dp"
android:text="0000-0000-0000"
- tools:textAlignment="viewEnd" />
+ android:textDirection="rtl" />
</com.google.android.material.card.MaterialCardView> \ No newline at end of file
diff --git a/app/src/main/res/menu/drawer_navigation_menu.xml b/app/src/main/res/menu/drawer_navigation_menu.xml
index 4482202..458698a 100644
--- a/app/src/main/res/menu/drawer_navigation_menu.xml
+++ b/app/src/main/res/menu/drawer_navigation_menu.xml
@@ -11,7 +11,7 @@
<item
android:id="@+id/roles"
android:title="Roles"
- android:icon="@drawable/ic_baseline_person_24"
+ android:icon="@drawable/ic_baseline_assignment_ind_24"
/>
<item
android:id="@+id/login_regions"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127..e3b20f7 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,6 @@
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
+ <color name="blue_700">#1E88E5</color>
+ <color name="blue_900">#0D47A1</color>
</resources> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 10:52:46 +0000