Skip to content

[MS-227] Removing unused CoordinatorLayout in favor of ConstraintLayout on dashboard fragment #597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexandr-simprints merged 1 commit into from
Mar 5, 2024
Merged

[MS-227] Removing unused CoordinatorLayout in favor of ConstraintLayout on dashboard fragment #597

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 23 additions & 14 deletions feature/dashboard/src/main/res/layout/fragment_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout 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"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
Expand All @@ -8,8 +8,12 @@
android:theme="@style/Theme.Simprints">

<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:id="@+id/appBarLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/dashboardToolbar"
Expand All @@ -21,10 +25,13 @@
</com.google.android.material.appbar.AppBarLayout>

<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="?attr/actionBarSize"
android:background="?attr/colorPrimary">
android:layout_width="0dp"
android:layout_height="0dp"
android:background="?attr/colorPrimary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout">

<LinearLayout
android:id="@+id/dashboard_cards"
Expand Down Expand Up @@ -60,12 +67,14 @@

</LinearLayout>
</ScrollView>

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/rootedDeviceError"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/rootedDeviceError"
android:visibility="gone"
android:background="@color/simprints_red">
android:background="@color/simprints_red"
android:visibility="gone">

<TextView
style="@style/Text.Headline5.White.Bold"
android:layout_width="0dp"
Expand All @@ -74,12 +83,12 @@
android:layout_marginBottom="24dp"
android:gravity="center"
android:maxLines="2"
android:text="@string/orchestrator_rooted_device_error_title"
app:layout_constraintBottom_toTopOf="@id/alertImage"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintWidth_percent="0.8"
android:text="@string/orchestrator_rooted_device_error_title" />
app:layout_constraintWidth_percent="0.8" />

<ImageView
android:id="@+id/alertImage"
Expand All @@ -88,15 +97,15 @@
android:layout_marginVertical="16dp"
android:padding="16dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_alert_default"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHeight_percent="0.33"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.3"
app:layout_constraintWidth_percent="0.5"
android:src="@drawable/ic_alert_default"
tools:ignore="ContentDescription" />

</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</androidx.constraintlayout.widget.ConstraintLayout>