From 91e64950e68f1fecf4b6c3892d23cd8c7e91c805 Mon Sep 17 00:00:00 2001
From: insaiyancvk <cvamshik1@gmail.com>
Date: Wed, 22 Jan 2020 21:44:33 +0530
Subject: [PATCH 1/3] fix: softcoded strings in content_event.xml,
 feagment_profile.xml, item_social_link.xml, order_completed.xml

---
 app/src/main/res/layout/content_event.xml    | 2 +-
 app/src/main/res/layout/fragment_profile.xml | 4 ++--
 app/src/main/res/layout/item_social_link.xml | 2 +-
 app/src/main/res/menu/order_completed.xml    | 2 +-
 app/src/main/res/values/strings.xml          | 3 +++
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/content_event.xml b/app/src/main/res/layout/content_event.xml
index 2dfd7bb613..9c74751ce9 100644
--- a/app/src/main/res/layout/content_event.xml
+++ b/app/src/main/res/layout/content_event.xml
@@ -643,7 +643,7 @@
                     android:layout_marginLeft="@dimen/layout_margin_large"
                     android:layout_marginRight="@dimen/layout_margin_large"
                     android:layout_marginBottom="@dimen/layout_margin_large"
-                    android:text="Sessions"
+                    android:text="@string/sessions"
                     android:textColor="@color/dark_grey"
                     android:textSize="@dimen/event_details_headers" />
 
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index bf645d8bc4..c92b3d0ec7 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -148,7 +148,7 @@
                 android:layout_height="wrap_content"
                 android:textColor="@color/black"
                 android:textSize="@dimen/text_size_expanded_title"
-                android:text="General Settings and Support"/>
+                android:text="@string/general_settings_and_support"/>
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/event_details_divider"
@@ -201,7 +201,7 @@
                 android:layout_height="wrap_content"
                 android:textColor="@color/black"
                 android:textSize="@dimen/text_size_expanded_title"
-                android:text="Login"/>
+                android:text="@string/login"/>
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/event_details_divider"
diff --git a/app/src/main/res/layout/item_social_link.xml b/app/src/main/res/layout/item_social_link.xml
index 6622006e75..7f2f09f081 100644
--- a/app/src/main/res/layout/item_social_link.xml
+++ b/app/src/main/res/layout/item_social_link.xml
@@ -10,6 +10,6 @@
         android:layout_height="wrap_content"
         android:layout_marginRight="@dimen/layout_margin_medium"
         android:background="?attr/selectableItemBackgroundBorderless"
-        android:contentDescription="SocialLink"
+        android:contentDescription="@string/social_link"
         android:tint="@android:color/white" />
 </FrameLayout>
diff --git a/app/src/main/res/menu/order_completed.xml b/app/src/main/res/menu/order_completed.xml
index d7b8cadb3b..b77d47d154 100644
--- a/app/src/main/res/menu/order_completed.xml
+++ b/app/src/main/res/menu/order_completed.xml
@@ -5,7 +5,7 @@
     <item
         android:id="@+id/tick"
         android:icon="@drawable/ic_baseline_tick"
-        android:title="tick"
+        android:title="@string/tick"
         app:showAsAction="always" />
 
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 49aee7112b..09b1a94fdf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -534,5 +534,8 @@
     <string name="change_password_success_message">Password changed successfully!</string>
     <string name="tickets_for">Ticket(s) for %1$s</string>
     <string name="error_making_paypal_payment_message">Fail on making Paypal payment</string>
+    <string name="social_link">Social Link</string>
+    <string name="tick">tick</string>
+    <string name="general_settings_and_support">General Settings and Support</string>
 
 </resources>

From 3e1e52bf76e06aa6906e6dd27cd4fcd3b31b3857 Mon Sep 17 00:00:00 2001
From: insaiyancvk <cvamshik1@gmail.com>
Date: Thu, 23 Jan 2020 21:48:25 +0530
Subject: [PATCH 2/3] added a limit of 10 digits to phone number field

---
 app/src/main/res/layout/fragment_edit_profile.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/fragment_edit_profile.xml b/app/src/main/res/layout/fragment_edit_profile.xml
index a6070ef3f2..5ad7058d18 100644
--- a/app/src/main/res/layout/fragment_edit_profile.xml
+++ b/app/src/main/res/layout/fragment_edit_profile.xml
@@ -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

From c54cb4d3d9608da4c6b0020175b9abf2ec9246b2 Mon Sep 17 00:00:00 2001
From: insaiyancvk <cvamshik1@gmail.com>
Date: Tue, 4 Feb 2020 20:45:25 +0530
Subject: [PATCH 3/3] Added Scroll view in past tickets filter

---
 .../res/layout/fragment_expired_order.xml     | 261 +++++++++---------
 1 file changed, 136 insertions(+), 125 deletions(-)

diff --git a/app/src/main/res/layout/fragment_expired_order.xml b/app/src/main/res/layout/fragment_expired_order.xml
index 08f067ee89..8caba9df76 100644
--- a/app/src/main/res/layout/fragment_expired_order.xml
+++ b/app/src/main/res/layout/fragment_expired_order.xml
@@ -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>