Skip to content
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

Jump to bottom

Fixed #1199 - Donation close button overlay #1200

Merged
merged 1 commit into from
Apr 12, 2024
Merged

Fixed #1199 - Donation close button overlay #1200

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
129 changes: 67 additions & 62 deletions onebusaway-android/src/main/res/layout/donation_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,87 +1,92 @@
<?xml version="1.0" encoding="utf-8"?>

<androidx.cardview.widget.CardView 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/donationView"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="62dp"
android:layout_alignParentTop="true"
android:animateLayoutChanges="true"
android:layout_alignParentEnd="true"
android:layout_width="fill_parent"
android:visibility="visible"
android:background="@color/quantum_white_100"
app:cardCornerRadius="8dp"
android:layout_height="wrap_content">
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/donationView"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="62dp"
android:layout_alignParentTop="true"
android:animateLayoutChanges="true"
android:layout_alignParentEnd="true"
android:layout_width="fill_parent"
android:visibility="visible"
android:background="@color/quantum_white_100"
app:cardCornerRadius="8dp"
android:layout_height="wrap_content">

<LinearLayout
android:padding="8dp"
android:orientation="vertical"
android:padding="8dp"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">

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

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">

<TextView
android:text="@string/donation_view_title"
style="@style/TextAppearance.MaterialComponents.Headline6"
android:layout_width="wrap_content"
android:layout_weight="0"
android:layout_height="wrap_content"
android:id="@+id/textView2" />
android:id="@+id/textView2"
style="@style/TextAppearance.MaterialComponents.Headline6"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
android:layout_weight="0"
android:text="@string/donation_view_title"
app:layout_constraintEnd_toStartOf="@+id/btnDonationViewClose"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<View
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="match_parent" />

<ImageButton
android:id="@+id/btnDonationViewClose"
android:src="@drawable/ic_close"
android:background="@android:color/transparent"
android:layout_width="40dp"
android:layout_height="40dp" />
</LinearLayout>
android:id="@+id/btnDonationViewClose"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
android:background="@android:color/transparent"
android:src="@drawable/ic_close"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

<TextView
android:text="@string/donation_view_body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/textView3" />
android:text="@string/donation_view_body"
android:layout_width="match_parent"
android:layout_margin="4dp"
android:layout_height="wrap_content"
android:id="@+id/textView3" />

<View
android:layout_width="match_parent"
android:layout_height="@dimen/activity_vertical_margin" />
android:layout_width="match_parent"
android:layout_height="@dimen/activity_vertical_margin" />

<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<Button
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:textSize="16sp"
android:text="@string/donation_view_learn_more_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/btnDonationViewLearnMore"
android:layout_weight="1" />
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:textSize="16sp"
android:text="@string/donation_view_learn_more_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/btnDonationViewLearnMore"
android:layout_weight="1" />

<Button
style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
android:textSize="16sp"
android:textColor="@color/quantum_white_100"
android:text="@string/donation_view_donate_now_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/btnDonationViewDonate"
android:layout_weight="1" />
style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
android:textSize="16sp"
android:textColor="@color/quantum_white_100"
android:text="@string/donation_view_donate_now_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/btnDonationViewDonate"
android:layout_weight="1" />
</LinearLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
Loading