Skip to content

Commit

Permalink
Better tablet layout
Browse files Browse the repository at this point in the history
  • Loading branch information
@AChep
AChep committed Apr 23, 2022
1 parent b88a8f3 commit 72352cd
Show file tree
Hide file tree
Showing 8 changed files with 534 additions and 460 deletions.
368 changes: 190 additions & 178 deletions app/src/main/res/layout/fragment_about.xml
View file

Large diffs are not rendered by default.

26 changes: 17 additions & 9 deletions app/src/main/res/layout/fragment_donate.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout 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">

Expand All @@ -12,7 +11,7 @@
app:liftOnScroll="true">

<com.google.android.material.appbar.CollapsingToolbarLayout
style="?attr/collapsingToolbarLayoutLargeStyle"
style="@style/ToolbarStyle"
android:layout_width="match_parent"
android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
Expand All @@ -23,7 +22,8 @@
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:navigationIcon="@drawable/ic_arrow_left"
app:title="@string/donate_iap" />
app:title="@string/donate_iap"
app:titleCentered="@bool/titleCentered" />

</com.google.android.material.appbar.CollapsingToolbarLayout>

Expand All @@ -36,9 +36,9 @@
android:clipToPadding="false"
app:layout_behavior="@string/appbar_scrolling_view_behavior">

<FrameLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="wrap_content">

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
Expand All @@ -47,15 +47,21 @@
android:clipToPadding="false"
android:nestedScrollingEnabled="false"
android:paddingTop="16dp"
android:paddingBottom="16dp" />
android:paddingBottom="16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_max="@dimen/sheetMaxWidth" />

<ProgressBar
android:id="@+id/progressView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="16dp"
android:visibility="gone" />
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

<TextView
android:id="@+id/errorView"
Expand All @@ -66,9 +72,11 @@
android:text="@string/error"
android:visibility="gone"
app:drawableTint="?android:textColorPrimary"
app:drawableTopCompat="@drawable/ic_sad" />
app:drawableTopCompat="@drawable/ic_sad"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.core.widget.NestedScrollView>

Expand Down
300 changes: 156 additions & 144 deletions app/src/main/res/layout/fragment_donate_quote.xml
View file

Large diffs are not rendered by default.

150 changes: 81 additions & 69 deletions app/src/main/res/layout/fragment_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,83 +103,95 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/barrier">

<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:layout_height="wrap_content">

<com.google.android.material.card.MaterialCardView
android:id="@+id/warContainer"
android:layout_width="match_parent"
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
app:cardBackgroundColor="?colorErrorContainer"
app:cardCornerRadius="24dp"
app:cardElevation="0dp"
app:strokeWidth="0dp">

<LinearLayout
android:clipToPadding="false"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_max="@dimen/sheetMaxWidth">

<com.google.android.material.card.MaterialCardView
android:id="@+id/warContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingVertical="16dp">

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical"
android:background="?selectableItemBackground"
android:gravity="center_vertical"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:text="@string/war_title"
android:textAppearance="?textAppearanceTitleMedium"
android:textColor="?colorOnErrorContainer" />

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical"
android:background="?selectableItemBackground"
android:gravity="center_vertical"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:text="@string/war_text"
android:textAppearance="?textAppearanceBodyMedium"
android:textColor="?colorOnErrorContainer" />

<TextView
android:id="@+id/warLearnMoreBtn"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
app:cardBackgroundColor="?colorErrorContainer"
app:cardCornerRadius="24dp"
app:cardElevation="0dp"
app:strokeWidth="0dp">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="?selectableItemBackground"
android:drawablePadding="16dp"
android:paddingHorizontal="16dp"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:text="@string/war_learn_more"
android:textAppearance="?textAppearanceBodyLarge"
android:textColor="?colorOnErrorContainer"
app:drawableEndCompat="@drawable/ic_chevron"
app:drawableStartCompat="@drawable/ic_outline_info"
app:drawableTint="?colorOnErrorContainer" />

</LinearLayout>

</com.google.android.material.card.MaterialCardView>

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:nestedScrollingEnabled="false" />
android:orientation="vertical"
android:paddingVertical="16dp">

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical"
android:background="?selectableItemBackground"
android:gravity="center_vertical"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:text="@string/war_title"
android:textAppearance="?textAppearanceTitleMedium"
android:textColor="?colorOnErrorContainer" />

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical"
android:background="?selectableItemBackground"
android:gravity="center_vertical"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:text="@string/war_text"
android:textAppearance="?textAppearanceBodyMedium"
android:textColor="?colorOnErrorContainer" />

<TextView
android:id="@+id/warLearnMoreBtn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="?selectableItemBackground"
android:drawablePadding="16dp"
android:paddingHorizontal="16dp"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:text="@string/war_learn_more"
android:textAppearance="?textAppearanceBodyLarge"
android:textColor="?colorOnErrorContainer"
app:drawableEndCompat="@drawable/ic_chevron"
app:drawableStartCompat="@drawable/ic_outline_info"
app:drawableTint="?colorOnErrorContainer" />

</LinearLayout>

</com.google.android.material.card.MaterialCardView>

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:nestedScrollingEnabled="false" />

</LinearLayout>

</androidx.constraintlayout.widget.ConstraintLayout>

</LinearLayout>
</androidx.core.widget.NestedScrollView>

<com.google.android.material.progressindicator.LinearProgressIndicator
Expand Down

0 comments on commit 72352cd

Please sign in to comment.