diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/activity_main.xml | 21 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_wiimmfi.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/friend_code_input_fragment.xml | 1 |
3 files changed, 12 insertions, 12 deletions
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 47d93ae..e13dc7b 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,16 +7,17 @@ android:id="@+id/drawer_layout" tools:context=".MainActivity"> - <androidx.coordinatorlayout.widget.CoordinatorLayout + <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true"> <com.google.android.material.appbar.AppBarLayout - style="@style/Widget.MaterialComponents.AppBarLayout.Primary" + android:id="@+id/appBarLayout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fitsSystemWindows="true"> + android:fitsSystemWindows="true" + app:layout_constraintTop_toTopOf="parent"> <com.google.android.material.appbar.MaterialToolbar android:id="@+id/toolbar" @@ -31,22 +32,22 @@ </com.google.android.material.appbar.AppBarLayout> <androidx.fragment.app.FragmentContainerView - android:id="@+id/fragment_container2" + android:id="@+id/friend_code_input_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" - app:layout_behavior="@string/appbar_scrolling_view_behavior" /> + app:layout_constraintTop_toBottomOf="@+id/appBarLayout" /> <androidx.fragment.app.FragmentContainerView - android:id="@+id/fragment_container" + android:id="@+id/recent_friend_codes_fragment" android:layout_width="match_parent" - android:layout_height="match_parent" - app:layout_behavior="@string/appbar_scrolling_view_behavior" - /> + android:layout_height="wrap_content" + android:hapticFeedbackEnabled="false" + app:layout_constraintTop_toBottomOf="@+id/friend_code_input_fragment" /> <!-- Screen content --> <!-- Use app:layout_behavior="@string/appbar_scrolling_view_behavior" to fit below top app bar --> - </androidx.coordinatorlayout.widget.CoordinatorLayout> + </androidx.constraintlayout.widget.ConstraintLayout> </androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_wiimmfi.xml b/app/src/main/res/layout/activity_wiimmfi.xml index c7a94fd..1d4d077 100644 --- a/app/src/main/res/layout/activity_wiimmfi.xml +++ b/app/src/main/res/layout/activity_wiimmfi.xml @@ -31,7 +31,7 @@ </com.google.android.material.appbar.AppBarLayout> <androidx.fragment.app.FragmentContainerView - android:id="@+id/fragment_container" + android:id="@+id/recent_friend_codes_fragment" android:layout_width="match_parent" android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> 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 66c62ed..b834f75 100644 --- a/app/src/main/res/layout/friend_code_input_fragment.xml +++ b/app/src/main/res/layout/friend_code_input_fragment.xml @@ -22,7 +22,6 @@ android:drawablePadding="15dp" android:ems="10" android:inputType="textPersonName" - android:text="Friend code" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/textView2" /> |