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

fix: toast to snackbar for search result and order related fragments #886

Merged
merged 1 commit into from
Jan 13, 2019
Merged

fix: toast to snackbar for search result and order related fragments #886

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/src/main/java/org/fossasia/openevent/general/order/OrderCompletedFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ import android.view.MenuItem
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentManager
import androidx.lifecycle.Observer
import androidx.navigation.Navigation.findNavController
import com.google.android.material.snackbar.Snackbar
import kotlinx.android.synthetic.main.fragment_order.view.orderCoordinatorLayout
import kotlinx.android.synthetic.main.fragment_order.view.add
import kotlinx.android.synthetic.main.fragment_order.view.name
import kotlinx.android.synthetic.main.fragment_order.view.share
Expand Down Expand Up @@ -68,7 +69,7 @@ class OrderCompletedFragment : Fragment() {
orderCompletedViewModel.message
.nonNull()
.observe(this, Observer {
Toast.makeText(context, it, Toast.LENGTH_LONG).show()
Snackbar.make(rootView.orderCoordinatorLayout, it, Snackbar.LENGTH_LONG).show()
})

rootView.add.setOnClickListener {
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/java/org/fossasia/openevent/general/order/OrderDetailsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ import android.view.LayoutInflater
import android.view.MenuItem
import android.view.View
import android.view.ViewGroup
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import androidx.lifecycle.Observer
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.navigation.Navigation.findNavController
import com.google.android.material.snackbar.Snackbar
import kotlinx.android.synthetic.main.fragment_order_details.view.orderDetailCoordinatorLayout
import kotlinx.android.synthetic.main.fragment_order_details.view.orderDetailsRecycler
import kotlinx.android.synthetic.main.fragment_order_details.view.progressBar
import org.fossasia.openevent.general.MainActivity
Expand Down Expand Up @@ -98,7 +99,7 @@ class OrderDetailsFragment : Fragment() {
orderDetailsViewModel.message
.nonNull()
.observe(this, Observer {
Toast.makeText(context, it, Toast.LENGTH_LONG).show()
Snackbar.make(rootView.orderDetailCoordinatorLayout, it, Snackbar.LENGTH_LONG).show()
})

orderDetailsViewModel.loadEvent(id)
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/java/org/fossasia/openevent/general/search/SearchResultsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ import android.view.LayoutInflater
import android.view.MenuItem
import android.view.View
import android.view.ViewGroup
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import androidx.lifecycle.Observer
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.navigation.Navigation.findNavController
import com.google.android.material.snackbar.Snackbar
import kotlinx.android.synthetic.main.fragment_search_results.view.searchRootLayout
import kotlinx.android.synthetic.main.fragment_search_results.view.eventsRecycler
import kotlinx.android.synthetic.main.fragment_search_results.view.shimmerSearch
import kotlinx.android.synthetic.main.fragment_search_results.view.errorTextView
Expand Down Expand Up @@ -101,7 +102,7 @@ class SearchResultsFragment : Fragment() {
searchViewModel.error
.nonNull()
.observe(this, Observer {
Toast.makeText(context, it, Toast.LENGTH_LONG).show()
Snackbar.make(rootView.searchRootLayout, it, Snackbar.LENGTH_LONG).show()
})

rootView.errorTextView.setOnClickListener {
Expand Down
284 changes: 145 additions & 139 deletions app/src/main/res/layout/fragment_order.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,162 +8,168 @@
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior">

<LinearLayout 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"
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white"
android:orientation="vertical">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="@dimen/layout_margin_extra_large"
android:text="@string/order_completed"
android:textColor="@color/black" />

<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textColor="@color/black"
android:textStyle="bold"
tools:text="FOSSASIA summit" />

<View
android:layout_width="match_parent"
android:layout_height="@dimen/event_details_divider"
android:layout_marginLeft="@dimen/layout_margin_medium"
android:layout_marginRight="@dimen/layout_margin_medium"
android:layout_marginTop="@dimen/layout_margin_extra_large"
android:background="@color/grey" />
android:layout_height="wrap_content"
android:id="@+id/orderCoordinatorLayout">

<LinearLayout
<LinearLayout 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="wrap_content"
android:layout_marginLeft="@dimen/layout_margin_medium"
android:layout_marginRight="@dimen/layout_margin_medium"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="@dimen/padding_medium"
android:weightSum="1">

<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/layout_margin_medium"
android:layout_weight="0.1"
app:srcCompat="@drawable/ic_baseline_calendar_24dp" />

<TextView
android:id="@+id/time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.85"
android:textColor="@color/black"
android:textSize="13sp"
tools:text="15 Sep 2008 04:23 PM" />
android:layout_height="match_parent"
android:background="@android:color/white"
android:orientation="vertical">

<TextView
android:id="@+id/add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/layout_margin_large"
android:text="@string/add"
android:textColor="@color/colorAccent"
android:textStyle="bold" />

</LinearLayout>

<View
android:layout_width="match_parent"
android:layout_height="@dimen/event_details_divider"
android:layout_gravity="bottom"
android:layout_marginLeft="@dimen/layout_margin_medium"
android:layout_marginRight="@dimen/layout_margin_medium"
android:background="@color/grey" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/layout_margin_medium"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="@dimen/padding_medium"
android:weightSum="1">

<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.1"
app:srcCompat="@drawable/ic_baseline_ticket_24dp" />
android:layout_gravity="center"
android:layout_marginTop="@dimen/layout_margin_extra_large"
android:text="@string/order_completed"
android:textColor="@color/black" />

<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.87"
android:text="@string/tickets"
android:layout_gravity="center"
android:textColor="@color/black"
android:textSize="13sp"
tools:text="Tickets" />

<TextView
android:id="@+id/view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/layout_margin_large"
android:text="@string/view_ticket"
android:textColor="@color/colorAccent"
android:textStyle="bold"
tools:text="View" />

</LinearLayout>

<View
android:layout_width="match_parent"
android:layout_height="@dimen/event_details_divider"
android:layout_gravity="bottom"
android:layout_marginLeft="@dimen/layout_margin_medium"
android:layout_marginRight="@dimen/layout_margin_medium"
android:background="@color/grey" />
tools:text="FOSSASIA summit" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:weightSum="1">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/event_details_divider"
android:layout_marginLeft="@dimen/layout_margin_medium"
android:layout_marginRight="@dimen/layout_margin_medium"
android:layout_marginTop="@dimen/layout_margin_extra_large"
android:background="@color/grey" />

<TextView
android:layout_width="0dp"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/layout_margin_large"
android:paddingLeft="@dimen/layout_margin_medium"
android:layout_weight="0.95"
android:text="@string/invite"
android:textColor="@color/black" />
android:layout_marginLeft="@dimen/layout_margin_medium"
android:layout_marginRight="@dimen/layout_margin_medium"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="@dimen/padding_medium"
android:weightSum="1">

<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/layout_margin_medium"
android:layout_weight="0.1"
app:srcCompat="@drawable/ic_baseline_calendar_24dp" />

<TextView
android:id="@+id/time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.85"
android:textColor="@color/black"
android:textSize="13sp"
tools:text="15 Sep 2008 04:23 PM" />

<TextView
android:id="@+id/add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/layout_margin_large"
android:text="@string/add"
android:textColor="@color/colorAccent"
android:textStyle="bold" />

</LinearLayout>

<View
android:layout_width="match_parent"
android:layout_height="@dimen/event_details_divider"
android:layout_gravity="bottom"
android:layout_marginLeft="@dimen/layout_margin_medium"
android:layout_marginRight="@dimen/layout_margin_medium"
android:background="@color/grey" />

<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/share"
android:layout_width="@dimen/fab_width"
android:layout_height="@dimen/fab_height"
android:layout_margin="@dimen/layout_margin_medium"
android:background="@android:color/white"
android:scaleType="center"
app:backgroundTint="@android:color/white"
app:srcCompat="@drawable/ic_share_grey_24dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/layout_margin_medium"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="@dimen/padding_medium"
android:weightSum="1">

<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.1"
app:srcCompat="@drawable/ic_baseline_ticket_24dp" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.87"
android:text="@string/tickets"
android:textColor="@color/black"
android:textSize="13sp"
tools:text="Tickets" />

<TextView
android:id="@+id/view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/layout_margin_large"
android:text="@string/view_ticket"
android:textColor="@color/colorAccent"
android:textStyle="bold"
tools:text="View" />

</LinearLayout>

<View
android:layout_width="match_parent"
android:layout_height="@dimen/event_details_divider"
android:layout_gravity="bottom"
android:layout_marginLeft="@dimen/layout_margin_medium"
android:layout_marginRight="@dimen/layout_margin_medium"
android:background="@color/grey" />

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

<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/layout_margin_large"
android:paddingLeft="@dimen/layout_margin_medium"
android:layout_weight="0.95"
android:text="@string/invite"
android:textColor="@color/black" />

<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/share"
android:layout_width="@dimen/fab_width"
android:layout_height="@dimen/fab_height"
android:layout_margin="@dimen/layout_margin_medium"
android:background="@android:color/white"
android:scaleType="center"
app:backgroundTint="@android:color/white"
app:srcCompat="@drawable/ic_share_grey_24dp" />

</LinearLayout>

<View
android:layout_width="match_parent"
android:layout_height="@dimen/event_details_divider"
android:layout_marginBottom="@dimen/event_details_divider_margin"
android:layout_marginLeft="@dimen/layout_margin_medium"
android:layout_marginRight="@dimen/layout_margin_medium"
android:background="@color/grey" />
</LinearLayout>

<View
android:layout_width="match_parent"
android:layout_height="@dimen/event_details_divider"
android:layout_marginBottom="@dimen/event_details_divider_margin"
android:layout_marginLeft="@dimen/layout_margin_medium"
android:layout_marginRight="@dimen/layout_margin_medium"
android:background="@color/grey" />
</LinearLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</androidx.core.widget.NestedScrollView>
5 changes: 3 additions & 2 deletions app/src/main/res/layout/fragment_order_details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/orderDetailCoordinatorLayout"
android:background="@android:color/white"
android:orientation="vertical">

Expand All @@ -19,4 +20,4 @@
android:layout_height="match_parent"
android:layout_gravity="center_horizontal" />

</LinearLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>