From ff432cf3a6b220f1d1b2fda747f88295d42b70ed Mon Sep 17 00:00:00 2001 From: Vamsi Krishna Date: Thu, 15 Oct 2020 20:55:25 +0530 Subject: [PATCH 01/19] favouritefragment --- .../fossasia/openevent/general/event/paging/EventsDataSource.kt | 1 + app/src/main/res/layout/fragment_favorite.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/fossasia/openevent/general/event/paging/EventsDataSource.kt b/app/src/main/java/org/fossasia/openevent/general/event/paging/EventsDataSource.kt index 1763f27207..cd951a8c7a 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/paging/EventsDataSource.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/paging/EventsDataSource.kt @@ -46,6 +46,7 @@ class EventsDataSource( if (response.isEmpty()) mutableProgress.value = false initialCallback?.onResult(response, null, adjacentPage) callback?.onResult(response, adjacentPage) + }, { error -> Timber.e(error, "Fail on fetching page of events") } diff --git a/app/src/main/res/layout/fragment_favorite.xml b/app/src/main/res/layout/fragment_favorite.xml index b9165ee994..c570202362 100644 --- a/app/src/main/res/layout/fragment_favorite.xml +++ b/app/src/main/res/layout/fragment_favorite.xml @@ -49,7 +49,6 @@ android:id="@+id/favoriteProgressBar" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:visibility="gone" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -76,6 +75,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:orientation="vertical" + android:visibility="invisible" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent"> From 3b0b0d674b32fb65d275b4adf109136d23d405eb Mon Sep 17 00:00:00 2001 From: Vamsi Krishna Date: Thu, 15 Oct 2020 20:55:25 +0530 Subject: [PATCH 02/19] firstcommit --- .../fossasia/openevent/general/event/paging/EventsDataSource.kt | 1 + app/src/main/res/layout/fragment_favorite.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/fossasia/openevent/general/event/paging/EventsDataSource.kt b/app/src/main/java/org/fossasia/openevent/general/event/paging/EventsDataSource.kt index 1763f27207..cd951a8c7a 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/paging/EventsDataSource.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/paging/EventsDataSource.kt @@ -46,6 +46,7 @@ class EventsDataSource( if (response.isEmpty()) mutableProgress.value = false initialCallback?.onResult(response, null, adjacentPage) callback?.onResult(response, adjacentPage) + }, { error -> Timber.e(error, "Fail on fetching page of events") } diff --git a/app/src/main/res/layout/fragment_favorite.xml b/app/src/main/res/layout/fragment_favorite.xml index b9165ee994..c570202362 100644 --- a/app/src/main/res/layout/fragment_favorite.xml +++ b/app/src/main/res/layout/fragment_favorite.xml @@ -49,7 +49,6 @@ android:id="@+id/favoriteProgressBar" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:visibility="gone" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -76,6 +75,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:orientation="vertical" + android:visibility="invisible" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent"> From 4cba6b80e24b6206970265df69593aaad90996a6 Mon Sep 17 00:00:00 2001 From: Vamsi Krishna Date: Thu, 15 Oct 2020 21:58:39 +0530 Subject: [PATCH 03/19] secondcommit --- .../fossasia/openevent/general/event/paging/EventsDataSource.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/org/fossasia/openevent/general/event/paging/EventsDataSource.kt b/app/src/main/java/org/fossasia/openevent/general/event/paging/EventsDataSource.kt index cd951a8c7a..1763f27207 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/paging/EventsDataSource.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/paging/EventsDataSource.kt @@ -46,7 +46,6 @@ class EventsDataSource( if (response.isEmpty()) mutableProgress.value = false initialCallback?.onResult(response, null, adjacentPage) callback?.onResult(response, adjacentPage) - }, { error -> Timber.e(error, "Fail on fetching page of events") } From 7c54edc7338f0ab7220ceac08415adb41aa41cf5 Mon Sep 17 00:00:00 2001 From: Vamsi Krishna Date: Tue, 3 Nov 2020 20:39:57 +0530 Subject: [PATCH 04/19] fix no internet issue --- .../openevent/general/order/OrdersUnderUserFragment.kt | 6 ++++-- app/src/main/res/layout/fragment_orders_under_user.xml | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt index c689b68373..f41a635c18 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt @@ -41,6 +41,7 @@ import org.fossasia.openevent.general.utils.extensions.nonNull import org.fossasia.openevent.general.utils.extensions.showWithFading import org.jetbrains.anko.design.longSnackbar import org.koin.androidx.viewmodel.ext.android.viewModel +import timber.log.Timber const val ORDERS_FRAGMENT = "ordersFragment" @@ -76,15 +77,16 @@ class OrdersUnderUserFragment : Fragment(), BottomIconDoubleClick { ordersUnderUserVM.connection .nonNull() .observe(viewLifecycleOwner, Observer { isConnected -> + showNoInternetScreen(!isConnected) + if(isConnected){ val currentItems = ordersUnderUserVM.eventAndOrderPaged.value if (currentItems != null) { - showNoInternetScreen(false) showNoTicketsScreen(currentItems.size == 0) ordersPagedListAdapter.submitList(currentItems) } else { ordersUnderUserVM.getOrdersAndEventsOfUser(showExpired = false, fromDb = true) } - }) + }}) ordersUnderUserVM.numOfTickets .nonNull() diff --git a/app/src/main/res/layout/fragment_orders_under_user.xml b/app/src/main/res/layout/fragment_orders_under_user.xml index 86b085fee7..7b99df79bd 100644 --- a/app/src/main/res/layout/fragment_orders_under_user.xml +++ b/app/src/main/res/layout/fragment_orders_under_user.xml @@ -99,6 +99,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintLeft_toLeftOf="parent" + android:layout_marginTop="@dimen/layout_margin_extra_large" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/ordersRecycler" android:visibility="gone"> From e0b4cb6554bb3e5c990cae817f26b2b6d163cc48 Mon Sep 17 00:00:00 2001 From: Vamsi Krishna Date: Tue, 3 Nov 2020 21:33:53 +0530 Subject: [PATCH 05/19] fixed internet issue 2 --- .../fossasia/openevent/general/order/OrdersUnderUserFragment.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt index f41a635c18..26906f1113 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt @@ -41,7 +41,6 @@ import org.fossasia.openevent.general.utils.extensions.nonNull import org.fossasia.openevent.general.utils.extensions.showWithFading import org.jetbrains.anko.design.longSnackbar import org.koin.androidx.viewmodel.ext.android.viewModel -import timber.log.Timber const val ORDERS_FRAGMENT = "ordersFragment" From 53d0ae8135db90d3dd43700272bd3dc1ae20b1a5 Mon Sep 17 00:00:00 2001 From: Vamsi Krishna Date: Tue, 3 Nov 2020 21:33:53 +0530 Subject: [PATCH 06/19] third commit --- .../fossasia/openevent/general/order/OrdersUnderUserFragment.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt index f41a635c18..26906f1113 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt @@ -41,7 +41,6 @@ import org.fossasia.openevent.general.utils.extensions.nonNull import org.fossasia.openevent.general.utils.extensions.showWithFading import org.jetbrains.anko.design.longSnackbar import org.koin.androidx.viewmodel.ext.android.viewModel -import timber.log.Timber const val ORDERS_FRAGMENT = "ordersFragment" From 7309e07816574b48118785a5ae14c2617f848002 Mon Sep 17 00:00:00 2001 From: Vamsi Krishna Date: Tue, 3 Nov 2020 22:55:11 +0530 Subject: [PATCH 07/19] third commit --- .../fossasia/openevent/general/order/OrdersUnderUserFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt index 26906f1113..e2f67de58b 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt @@ -41,7 +41,7 @@ import org.fossasia.openevent.general.utils.extensions.nonNull import org.fossasia.openevent.general.utils.extensions.showWithFading import org.jetbrains.anko.design.longSnackbar import org.koin.androidx.viewmodel.ext.android.viewModel - +: const val ORDERS_FRAGMENT = "ordersFragment" class OrdersUnderUserFragment : Fragment(), BottomIconDoubleClick { From 79d3c4cc5f8989f88d2a4d52739443f32f12b8a9 Mon Sep 17 00:00:00 2001 From: Vamsi Krishna Date: Tue, 3 Nov 2020 23:09:37 +0530 Subject: [PATCH 08/19] thirdcommit --- .../openevent/general/order/OrdersUnderUserFragment.kt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt index 7777839100..26906f1113 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt @@ -41,11 +41,7 @@ import org.fossasia.openevent.general.utils.extensions.nonNull import org.fossasia.openevent.general.utils.extensions.showWithFading import org.jetbrains.anko.design.longSnackbar import org.koin.androidx.viewmodel.ext.android.viewModel -<<<<<<< HEAD -: -======= ->>>>>>> e0b4cb6554bb3e5c990cae817f26b2b6d163cc48 const val ORDERS_FRAGMENT = "ordersFragment" class OrdersUnderUserFragment : Fragment(), BottomIconDoubleClick { From 57dc2650f4d4397a4cb3f04cfbf4f34594b5857b Mon Sep 17 00:00:00 2001 From: Vamsi Krishna Date: Tue, 3 Nov 2020 23:18:21 +0530 Subject: [PATCH 09/19] thirdcommit' --- .../fossasia/openevent/general/order/OrdersUnderUserFragment.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt index 26906f1113..e96509b0eb 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt @@ -43,7 +43,6 @@ import org.jetbrains.anko.design.longSnackbar import org.koin.androidx.viewmodel.ext.android.viewModel const val ORDERS_FRAGMENT = "ordersFragment" - class OrdersUnderUserFragment : Fragment(), BottomIconDoubleClick { private lateinit var rootView: View From 62681c4ca3b7d702104a3d8b847a3000e8f26b5a Mon Sep 17 00:00:00 2001 From: Vamsi Krishna Date: Tue, 3 Nov 2020 23:25:51 +0530 Subject: [PATCH 10/19] thirdcommit --- .../fossasia/openevent/general/order/OrdersUnderUserFragment.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt index e96509b0eb..26906f1113 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt @@ -43,6 +43,7 @@ import org.jetbrains.anko.design.longSnackbar import org.koin.androidx.viewmodel.ext.android.viewModel const val ORDERS_FRAGMENT = "ordersFragment" + class OrdersUnderUserFragment : Fragment(), BottomIconDoubleClick { private lateinit var rootView: View From 1e30b5630d97f197baeb7ad3cdcf428d5f171be8 Mon Sep 17 00:00:00 2001 From: Vamsi Krishna Date: Thu, 5 Nov 2020 19:27:42 +0530 Subject: [PATCH 11/19] thirdcommit --- .../openevent/general/order/OrdersUnderUserFragment.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt index 26906f1113..2396f0cd76 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt @@ -76,10 +76,12 @@ class OrdersUnderUserFragment : Fragment(), BottomIconDoubleClick { ordersUnderUserVM.connection .nonNull() .observe(viewLifecycleOwner, Observer { isConnected -> - showNoInternetScreen(!isConnected) - if(isConnected){ + if(!isConnected) + showNoInternetScreen(true) + else{ val currentItems = ordersUnderUserVM.eventAndOrderPaged.value if (currentItems != null) { + showNoInternetScreen(false) showNoTicketsScreen(currentItems.size == 0) ordersPagedListAdapter.submitList(currentItems) } else { From 146c0cb13bed9ab276f9e8eeaf16514c697e668e Mon Sep 17 00:00:00 2001 From: Vamsi Krishna Date: Thu, 5 Nov 2020 22:30:12 +0530 Subject: [PATCH 12/19] thirdcommit --- .../openevent/general/order/OrdersUnderUserFragment.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt index 2396f0cd76..3933dd3e14 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt @@ -76,9 +76,10 @@ class OrdersUnderUserFragment : Fragment(), BottomIconDoubleClick { ordersUnderUserVM.connection .nonNull() .observe(viewLifecycleOwner, Observer { isConnected -> - if(!isConnected) + if (!isConnected) showNoInternetScreen(true) - else{ + + else { val currentItems = ordersUnderUserVM.eventAndOrderPaged.value if (currentItems != null) { showNoInternetScreen(false) @@ -87,7 +88,7 @@ class OrdersUnderUserFragment : Fragment(), BottomIconDoubleClick { } else { ordersUnderUserVM.getOrdersAndEventsOfUser(showExpired = false, fromDb = true) } - }}) + } }) ordersUnderUserVM.numOfTickets .nonNull() From 6195a5fb4634254746de2f0863a08e6168bf39f6 Mon Sep 17 00:00:00 2001 From: Vamsi Krishna Date: Fri, 6 Nov 2020 10:09:41 +0530 Subject: [PATCH 13/19] thirdcommit --- .../fossasia/openevent/general/order/OrdersUnderUserFragment.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt index 3933dd3e14..31e979833a 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt @@ -78,7 +78,6 @@ class OrdersUnderUserFragment : Fragment(), BottomIconDoubleClick { .observe(viewLifecycleOwner, Observer { isConnected -> if (!isConnected) showNoInternetScreen(true) - else { val currentItems = ordersUnderUserVM.eventAndOrderPaged.value if (currentItems != null) { From 8650bb986babef09d3d7aa154bdacd3be7520ee7 Mon Sep 17 00:00:00 2001 From: Vamsi Krishna Date: Fri, 6 Nov 2020 11:37:01 +0530 Subject: [PATCH 14/19] thirdcommit fixedindentation --- .../general/order/OrdersUnderUserFragment.kt | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt index 31e979833a..0a13f90a52 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt @@ -76,17 +76,18 @@ class OrdersUnderUserFragment : Fragment(), BottomIconDoubleClick { ordersUnderUserVM.connection .nonNull() .observe(viewLifecycleOwner, Observer { isConnected -> - if (!isConnected) + if (!isConnected) { showNoInternetScreen(true) - else { - val currentItems = ordersUnderUserVM.eventAndOrderPaged.value - if (currentItems != null) { - showNoInternetScreen(false) - showNoTicketsScreen(currentItems.size == 0) - ordersPagedListAdapter.submitList(currentItems) - } else { - ordersUnderUserVM.getOrdersAndEventsOfUser(showExpired = false, fromDb = true) } + else { + val currentItems = ordersUnderUserVM.eventAndOrderPaged.value + if (currentItems != null) { + showNoInternetScreen(false) + showNoTicketsScreen(currentItems.size == 0) + ordersPagedListAdapter.submitList(currentItems) + } else { + ordersUnderUserVM.getOrdersAndEventsOfUser(showExpired = false, fromDb = true) + } } }) ordersUnderUserVM.numOfTickets From 26266ebc039e08a2da7d3d734bb8a30ff941a2ca Mon Sep 17 00:00:00 2001 From: Vamsi Krishna Date: Fri, 6 Nov 2020 12:37:14 +0530 Subject: [PATCH 15/19] thirdcommitfixed --- .../general/order/OrdersUnderUserFragment.kt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt index 0a13f90a52..3ddbc4f6c2 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt @@ -80,14 +80,14 @@ class OrdersUnderUserFragment : Fragment(), BottomIconDoubleClick { showNoInternetScreen(true) } else { - val currentItems = ordersUnderUserVM.eventAndOrderPaged.value - if (currentItems != null) { - showNoInternetScreen(false) - showNoTicketsScreen(currentItems.size == 0) - ordersPagedListAdapter.submitList(currentItems) - } else { - ordersUnderUserVM.getOrdersAndEventsOfUser(showExpired = false, fromDb = true) - } + val currentItems = ordersUnderUserVM.eventAndOrderPaged.value + if (currentItems != null) { + showNoInternetScreen(false) + showNoTicketsScreen(currentItems.size == 0) + ordersPagedListAdapter.submitList(currentItems) + } else { + ordersUnderUserVM.getOrdersAndEventsOfUser(showExpired = false, fromDb = true) + } } }) ordersUnderUserVM.numOfTickets From 782974b1c5d5d74a53f32df5ba30e207ea766b0a Mon Sep 17 00:00:00 2001 From: Vamsi Krishna Date: Fri, 6 Nov 2020 12:55:07 +0530 Subject: [PATCH 16/19] thirdcommit --- .../openevent/general/order/OrdersUnderUserFragment.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt index 3ddbc4f6c2..fc72f46757 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt @@ -78,8 +78,7 @@ class OrdersUnderUserFragment : Fragment(), BottomIconDoubleClick { .observe(viewLifecycleOwner, Observer { isConnected -> if (!isConnected) { showNoInternetScreen(true) - } - else { + } else { val currentItems = ordersUnderUserVM.eventAndOrderPaged.value if (currentItems != null) { showNoInternetScreen(false) From 6b46766a4f3c98560ed80e56060df1f5fc042644 Mon Sep 17 00:00:00 2001 From: Vamsi Krishna Date: Fri, 6 Nov 2020 15:04:14 +0530 Subject: [PATCH 17/19] thirdcommitfinal --- .../general/order/OrdersUnderUserFragment.kt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt index fc72f46757..30aa421cf4 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt @@ -79,15 +79,16 @@ class OrdersUnderUserFragment : Fragment(), BottomIconDoubleClick { if (!isConnected) { showNoInternetScreen(true) } else { - val currentItems = ordersUnderUserVM.eventAndOrderPaged.value - if (currentItems != null) { - showNoInternetScreen(false) - showNoTicketsScreen(currentItems.size == 0) - ordersPagedListAdapter.submitList(currentItems) - } else { - ordersUnderUserVM.getOrdersAndEventsOfUser(showExpired = false, fromDb = true) + val currentItems = ordersUnderUserVM.eventAndOrderPaged.value + if (currentItems != null) { + showNoInternetScreen(false) + showNoTicketsScreen(currentItems.size == 0) + ordersPagedListAdapter.submitList(currentItems) + } else { + ordersUnderUserVM.getOrdersAndEventsOfUser(showExpired = false, fromDb = true) + } } - } }) + }) ordersUnderUserVM.numOfTickets .nonNull() From 190de4f5a3f2237b3abeb5d00815d5eed05a3177 Mon Sep 17 00:00:00 2001 From: Vamsi Krishna Date: Wed, 20 Jan 2021 23:19:53 +0530 Subject: [PATCH 18/19] fix snackbar message --- .../openevent/general/data/Resource.kt | 2 +- .../general/event/EventDetailsFragment.kt | 48 +++++++++++-------- .../general/event/EventDetailsViewModel.kt | 1 + .../openevent/general/event/EventsFragment.kt | 28 ++++++----- app/src/main/res/values/strings.xml | 2 +- 5 files changed, 47 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/org/fossasia/openevent/general/data/Resource.kt b/app/src/main/java/org/fossasia/openevent/general/data/Resource.kt index 49206069a2..2183cff3b8 100644 --- a/app/src/main/java/org/fossasia/openevent/general/data/Resource.kt +++ b/app/src/main/java/org/fossasia/openevent/general/data/Resource.kt @@ -12,7 +12,7 @@ class Resource { fun getString(@StringRes resId: Int) = context?.getString(resId) - fun getString(@StringRes resId: Int, vararg args: Any?) = context?.getString(resId, args) + fun getString(@StringRes resId: Int, vararg args: Any?) = context?.getString(resId, args[0]) fun getColor(@ColorRes resId: Int) = context?.resources?.getColor(resId) } diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt index 36cffe6818..cdf89cc26c 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt @@ -147,6 +147,7 @@ class EventDetailsFragment : Fragment() { eventViewModel.popMessage .nonNull() .observe(viewLifecycleOwner, Observer { + Timber.d(it + "hereeeee") rootView.snackbar(it) showEventErrorScreen(it == getString(R.string.error_fetching_event_message)) }) @@ -400,7 +401,7 @@ class EventDetailsFragment : Fragment() { .nonNull() .observe(viewLifecycleOwner, Observer { similarEvents -> similarEventsAdapter.submitList(similarEvents) - }) + }) } private fun loadEvent(event: Event) { @@ -462,10 +463,10 @@ class EventDetailsFragment : Fragment() { rootView.eventLocationLinearLayout.setOnClickListener(mapClickListener) Picasso.get() - .load(eventViewModel.loadMap(event)) - .placeholder(R.drawable.ic_map_black) - .error(R.drawable.ic_map_black) - .into(rootView.imageMap) + .load(eventViewModel.loadMap(event)) + .placeholder(R.drawable.ic_map_black) + .error(R.drawable.ic_map_black) + .into(rootView.imageMap) } else { rootView.imageMap.isVisible = false } @@ -529,7 +530,9 @@ class EventDetailsFragment : Fragment() { val currentSocialLinks = eventViewModel.socialLinks.value if (currentSocialLinks == null) { - currentEvent?.let { eventViewModel.fetchSocialLink(it.id) } + currentEvent?.let { + eventViewModel.fetchSocialLink(it.id) + } } else { socialLinkAdapter.addAll(currentSocialLinks) rootView.socialLinkContainer.isVisible = currentSocialLinks.isNotEmpty() @@ -602,7 +605,10 @@ class EventDetailsFragment : Fragment() { currentEvent = it } else { EventUtils.showLoginToLikeDialog(requireContext(), layoutInflater, object : RedirectToLogin { - override fun goBackToLogin() { redirectToLogin() } }, it.originalImageUrl, it.name) + override fun goBackToLogin() { + redirectToLogin() + } + }, it.originalImageUrl, it.name) } } true @@ -620,8 +626,8 @@ class EventDetailsFragment : Fragment() { } R.id.code_of_conduct -> { currentEvent?.let { event -> - findNavController(rootView) - .navigate(EventDetailsFragmentDirections.actionEventDetailsToConductCode(event.id)) + findNavController(rootView) + .navigate(EventDetailsFragmentDirections.actionEventDetailsToConductCode(event.id)) } return true } @@ -758,21 +764,23 @@ class EventDetailsFragment : Fragment() { .show() alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = false layout.feedback.addTextChangedListener(object : TextWatcher { - override fun afterTextChanged(p0: Editable?) { + override fun afterTextChanged(p0: Editable?) { - if (layout.feedback.text.toString().isNotEmpty()) { - layout.feedbackTextInputLayout.error = null - alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = true - layout.feedbackTextInputLayout.isErrorEnabled = false - } else { - layout.feedbackTextInputLayout.error = getString(R.string.cant_be_empty) - } + if (layout.feedback.text.toString().isNotEmpty()) { + layout.feedbackTextInputLayout.error = null + alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = true + layout.feedbackTextInputLayout.isErrorEnabled = false + } else { + layout.feedbackTextInputLayout.error = getString(R.string.cant_be_empty) } + } - override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { /*Implement here*/ } + override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { /*Implement here*/ + } - override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { /*Implement here*/ } - }) + override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { /*Implement here*/ + } + }) } private fun moveToSponsorSection() { diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsViewModel.kt index b39ce31dfa..4f29f7e514 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsViewModel.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsViewModel.kt @@ -122,6 +122,7 @@ class EventDetailsViewModel( mutablePopMessage.value = resource.getString(R.string.error_submitting_feedback) }) } + fun fetchEventSpeakers(id: Long) { if (id == -1L) return diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventsFragment.kt index b5c55abf54..b92eddb186 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/EventsFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/EventsFragment.kt @@ -122,8 +122,7 @@ class EventsFragment : Fragment(), BottomIconDoubleClick { showEmptyMessage(eventsListAdapter.currentList?.isEmpty() ?: true) }) - eventsViewModel.progress - .nonNull() + eventsViewModel.progress.nonNull() .observe(viewLifecycleOwner, Observer { if (it) { rootView.shimmerEvents.startShimmer() @@ -132,6 +131,7 @@ class EventsFragment : Fragment(), BottomIconDoubleClick { } else { rootView.shimmerEvents.stopShimmer() rootView.swiperefresh.isRefreshing = false + showEmptyMessage(eventsListAdapter.currentList?.isEmpty() ?: true) } rootView.shimmerEvents.isVisible = it }) @@ -237,7 +237,7 @@ class EventsFragment : Fragment(), BottomIconDoubleClick { val eventClickListener: EventClickListener = object : EventClickListener { override fun onClick(eventID: Long, imageView: ImageView) { findNavController(rootView).navigate(EventsFragmentDirections.actionEventsToEventsDetail(eventID), - FragmentNavigatorExtras(imageView to "eventDetailImage")) + FragmentNavigatorExtras(imageView to "eventDetailImage")) } } @@ -297,11 +297,11 @@ class EventsFragment : Fragment(), BottomIconDoubleClick { } private fun openSearch(hashTag: String) { - findNavController(rootView).navigate(EventsFragmentDirections.actionEventsToSearchResults( - query = "", - location = Preference().getString(SAVED_LOCATION).toString(), - date = getString(R.string.anytime), - type = hashTag)) + findNavController(rootView).navigate(EventsFragmentDirections.actionEventsToSearchResults( + query = "", + location = Preference().getString(SAVED_LOCATION).toString(), + date = getString(R.string.anytime), + type = hashTag)) } private fun showNoInternetScreen(show: Boolean) { @@ -363,9 +363,11 @@ class EventsFragment : Fragment(), BottomIconDoubleClick { } } - override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { /*Implement here*/ } + override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { /*Implement here*/ + } - override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { /*Implement here*/ } + override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { /*Implement here*/ + } }) layout.confirmNewPassword.addTextChangedListener(object : TextWatcher { @@ -392,9 +394,11 @@ class EventsFragment : Fragment(), BottomIconDoubleClick { } } - override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { /*Implement here*/ } + override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { /*Implement here*/ + } - override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { /*Implement here*/ } + override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { /*Implement here*/ + } }) } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1e7f8d6262..b0d0b3bc36 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -343,7 +343,7 @@ Please provide first name and last name! Error updating user! User updated successfully! - "Error fetching %1$s for the event + Error fetching %1$s for the event Fail on submitting the feedback Error getting feedback for this event There are no feedback for this event. From c366d22affecb8471dd99814a72bd052ceedf72c Mon Sep 17 00:00:00 2001 From: Vamsi Krishna Date: Wed, 20 Jan 2021 23:41:20 +0530 Subject: [PATCH 19/19] fix snackbar message --- .../org/fossasia/openevent/general/event/EventDetailsFragment.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt index cdf89cc26c..384052984d 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt @@ -147,7 +147,6 @@ class EventDetailsFragment : Fragment() { eventViewModel.popMessage .nonNull() .observe(viewLifecycleOwner, Observer { - Timber.d(it + "hereeeee") rootView.snackbar(it) showEventErrorScreen(it == getString(R.string.error_fetching_event_message)) })