Skip to content

fix: added a scroll view in past ticket filter #2636

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

Open
wants to merge 4 commits into
base: development
Choose a base branch
from
Open

fix: added a scroll view in past ticket filter #2636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
91e6495
fix: softcoded strings in content_event.xml, feagment_profile.xml, it…
insaiyancvk Jan 22, 2020
3e1e52b
added a limit of 10 digits to phone number field
insaiyancvk Jan 23, 2020
1e75921
Merge https://github.com/fossasia/open-event-attendee-android into pa…
insaiyancvk Feb 4, 2020
c54cb4d
Added Scroll view in past tickets filter
insaiyancvk Feb 4, 2020
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
3 changes: 2 additions & 1 deletion app/src/main/res/layout/fragment_edit_profile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@
android:id="@+id/phone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="number" />
android:inputType="number"
android:maxLength="10" />
</com.google.android.material.textfield.TextInputLayout>

<com.google.android.material.textfield.TextInputLayout
Expand Down
261 changes: 136 additions & 125 deletions app/src/main/res/layout/fragment_expired_order.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,134 +1,145 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<layout 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"
android:orientation="vertical">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorPrimary"
app:navigationIcon="@drawable/ic_arrow_back_white_cct"
app:title="@string/past_tickets"
app:titleTextColor="@color/white">
<ImageView
android:id="@+id/filterToolbar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:padding="@dimen/padding_large"
android:background="?selectableItemBackground"
android:src="@drawable/ic_filter" />
</androidx.appcompat.widget.Toolbar>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipeRefresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.core.widget.NestedScrollView
android:id="@+id/ordersNestedScrollView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_margin_medium"
android:layout_marginBottom="@dimen/layout_margin_medium"
android:orientation="vertical">

<LinearLayout
xmlns:tools="http://schemas.android.com/tools">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/layout_margin_medium"
android:layout_marginEnd="@dimen/layout_margin_medium"
android:orientation="vertical">

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/ordersRecycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal"
android:scrollbars="vertical"
tools:itemCount="6"
tools:listitem="@layout/item_card_order" />

<include android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_margin_extra_large"
android:visibility="gone"
tools:visibility="visible"
layout="@layout/content_no_internet" />


android:layout_height="match_parent">
<LinearLayout
android:id="@+id/noTicketsScreen"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/layout_margin_extra_large"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">

<RelativeLayout
android:layout_width="@dimen/item_image_view_large"
android:layout_height="@dimen/item_image_view_large"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/layout_margin_large">

<ImageView
android:layout_width="@dimen/item_image_view_large"
android:layout_height="@dimen/item_image_view_large"
android:layout_centerInParent="true"
android:scaleType="centerCrop"
app:srcCompat="@drawable/round_shape" />
android:layout_height="match_parent"
android:orientation="vertical">

<ImageView
android:id="@+id/ticketImageView"
android:layout_width="@dimen/item_image_view"
android:layout_height="@dimen/item_image_view"
android:layout_centerInParent="true"
android:scaleType="centerCrop"
app:srcCompat="@drawable/ic_baseline_ticket"
app:tint="@color/colorPrimary"/>

</RelativeLayout>

<TextView
android:id="@+id/noTicketMessage"
android:layout_width="wrap_content"
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/layout_margin_extra_large"
android:text="@string/no_past_tickets"
android:textSize="@dimen/text_size_medium" />
android:background="@color/colorPrimary"
app:navigationIcon="@drawable/ic_arrow_back_white_cct"
app:title="@string/past_tickets"
app:titleTextColor="@color/white">

</LinearLayout>

<com.facebook.shimmer.ShimmerFrameLayout
android:id="@+id/shimmerSearch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone">

<LinearLayout
<ImageView
android:id="@+id/filterToolbar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:padding="@dimen/padding_large"
android:background="?selectableItemBackground"
android:src="@drawable/ic_filter" />
</androidx.appcompat.widget.Toolbar>

<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipeRefresh"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

<include layout="@layout/placeholder_item_card_tickets" />

<include layout="@layout/placeholder_item_card_tickets" />

<include layout="@layout/placeholder_item_card_tickets" />

<include layout="@layout/placeholder_item_card_tickets" />

<include layout="@layout/placeholder_item_card_tickets" />
</LinearLayout>
</com.facebook.shimmer.ShimmerFrameLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</LinearLayout>
android:layout_height="match_parent">

<androidx.core.widget.NestedScrollView
android:id="@+id/ordersNestedScrollView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_margin_medium"
android:layout_marginBottom="@dimen/layout_margin_medium"
android:orientation="vertical">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/layout_margin_medium"
android:layout_marginEnd="@dimen/layout_margin_medium"
android:orientation="vertical">

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/ordersRecycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal"
android:scrollbars="vertical"
tools:itemCount="6"
tools:listitem="@layout/item_card_order" />

<include
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_margin_extra_large"
android:visibility="gone"
tools:visibility="visible"
layout="@layout/content_no_internet" />


<LinearLayout
android:id="@+id/noTicketsScreen"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/layout_margin_extra_large"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">

<RelativeLayout
android:layout_width="@dimen/item_image_view_large"
android:layout_height="@dimen/item_image_view_large"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/layout_margin_large">

<ImageView
android:layout_width="@dimen/item_image_view_large"
android:layout_height="@dimen/item_image_view_large"
android:layout_centerInParent="true"
android:scaleType="centerCrop"
app:srcCompat="@drawable/round_shape" />

<ImageView
android:id="@+id/ticketImageView"
android:layout_width="@dimen/item_image_view"
android:layout_height="@dimen/item_image_view"
android:layout_centerInParent="true"
android:scaleType="centerCrop"
app:srcCompat="@drawable/ic_baseline_ticket"
app:tint="@color/colorPrimary" />

</RelativeLayout>

<TextView
android:id="@+id/noTicketMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/layout_margin_extra_large"
android:text="@string/no_past_tickets"
android:textSize="@dimen/text_size_medium" />

</LinearLayout>

<com.facebook.shimmer.ShimmerFrameLayout
android:id="@+id/shimmerSearch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

<include layout="@layout/placeholder_item_card_tickets" />

<include layout="@layout/placeholder_item_card_tickets" />

<include layout="@layout/placeholder_item_card_tickets" />

<include layout="@layout/placeholder_item_card_tickets" />

<include layout="@layout/placeholder_item_card_tickets" />
</LinearLayout>
</com.facebook.shimmer.ShimmerFrameLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</LinearLayout>
</ScrollView>
</layout>