diff options
Diffstat (limited to 'androidApp/src/main/res/layout')
| -rw-r--r-- | androidApp/src/main/res/layout/details_activity.xml | 26 | ||||
| -rw-r--r-- | androidApp/src/main/res/layout/user_information_activity.xml | 8 |
2 files changed, 25 insertions, 9 deletions
diff --git a/androidApp/src/main/res/layout/details_activity.xml b/androidApp/src/main/res/layout/details_activity.xml index f79ea69..37d3b15 100644 --- a/androidApp/src/main/res/layout/details_activity.xml +++ b/androidApp/src/main/res/layout/details_activity.xml @@ -5,13 +5,28 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/closeButton" + android:layout_width="wrap_content" + android:layout_height="0dp" + android:contentDescription="@string/shared_close" + android:src="@drawable/icon_close" + app:fabSize="mini" + app:backgroundTint="@android:color/white" + android:layout_margin="@dimen/fab_margin" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toStartOf="@id/detailsTabs"/> + <com.google.android.material.tabs.TabLayout android:id="@+id/detailsTabs" - android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_width="0dp" + android:layout_height="0dp" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintStart_toEndOf="@id/closeButton" + app:layout_constraintBottom_toTopOf="@id/detailsPager" + app:tabTextAppearance="@style/SmallTabText" /> <androidx.viewpager2.widget.ViewPager2 android:id="@+id/detailsPager" @@ -20,6 +35,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/detailsTabs" /> + android:layout_marginTop="@dimen/fab_margin" + app:layout_constraintTop_toBottomOf="@id/closeButton" /> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/androidApp/src/main/res/layout/user_information_activity.xml b/androidApp/src/main/res/layout/user_information_activity.xml index c409e98..bc81b20 100644 --- a/androidApp/src/main/res/layout/user_information_activity.xml +++ b/androidApp/src/main/res/layout/user_information_activity.xml @@ -7,13 +7,13 @@ android:layout_height="match_parent"> <com.google.android.material.floatingactionbutton.FloatingActionButton - android:id="@+id/backButton" + android:id="@+id/closeButton" android:layout_width="wrap_content" android:layout_height="0dp" android:layout_margin="@dimen/fab_margin" android:backgroundTint="@android:color/white" - android:contentDescription="@string/open_profile" - android:src="@drawable/icon_back" + android:contentDescription="@string/shared_close" + android:src="@drawable/icon_close" app:borderWidth="0dp" app:elevation="@dimen/fab_elevation" app:fabSize="mini" @@ -24,7 +24,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginTop="@dimen/fab_margin" - app:layout_constraintTop_toBottomOf="@id/backButton" + app:layout_constraintTop_toBottomOf="@id/closeButton" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent"> |