Added order detailed page
This commit is contained in:
parent
1ec0747e26
commit
31602df99e
@ -13,6 +13,11 @@
|
|||||||
android:supportsRtl="true"
|
android:supportsRtl="true"
|
||||||
android:theme="@style/AppTheme"
|
android:theme="@style/AppTheme"
|
||||||
android:usesCleartextTraffic="true">
|
android:usesCleartextTraffic="true">
|
||||||
|
<activity
|
||||||
|
android:name=".ui.order.OrderActivity"
|
||||||
|
android:label="@string/title_activity_order"
|
||||||
|
android:theme="@style/AppTheme.NoActionBar">
|
||||||
|
</activity>
|
||||||
<activity
|
<activity
|
||||||
android:name=".ui.onboarding.AnonymousSignInActivity"
|
android:name=".ui.onboarding.AnonymousSignInActivity"
|
||||||
android:label="@string/title_activity_anonymous_sign_in"
|
android:label="@string/title_activity_anonymous_sign_in"
|
||||||
|
|||||||
@ -11,6 +11,7 @@ import me.gilo.wc.ui.customer.BillingAddressActivity
|
|||||||
import me.gilo.wc.ui.customer.ShippingAddressActivity
|
import me.gilo.wc.ui.customer.ShippingAddressActivity
|
||||||
import me.gilo.wc.ui.home.HomeActivity
|
import me.gilo.wc.ui.home.HomeActivity
|
||||||
import me.gilo.wc.ui.onboarding.AnonymousSignInActivity
|
import me.gilo.wc.ui.onboarding.AnonymousSignInActivity
|
||||||
|
import me.gilo.wc.ui.order.MyOrdersActivity
|
||||||
import me.gilo.wc.ui.product.ProductActivity
|
import me.gilo.wc.ui.product.ProductActivity
|
||||||
|
|
||||||
class MainActivity : AppCompatActivity() {
|
class MainActivity : AppCompatActivity() {
|
||||||
@ -23,7 +24,7 @@ class MainActivity : AppCompatActivity() {
|
|||||||
|
|
||||||
|
|
||||||
if(FirebaseAuth.getInstance().currentUser != null) {
|
if(FirebaseAuth.getInstance().currentUser != null) {
|
||||||
startActivity(Intent(baseContext, HomeActivity::class.java))
|
startActivity(Intent(baseContext, MyOrdersActivity::class.java))
|
||||||
}else{
|
}else{
|
||||||
startActivity(Intent(baseContext, AnonymousSignInActivity::class.java))
|
startActivity(Intent(baseContext, AnonymousSignInActivity::class.java))
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,6 +8,7 @@ import android.text.SpannableString
|
|||||||
import android.view.View
|
import android.view.View
|
||||||
import android.widget.TextView
|
import android.widget.TextView
|
||||||
import me.gilo.wc.R
|
import me.gilo.wc.R
|
||||||
|
import me.gilo.wc.ui.order.OrderActivity
|
||||||
import me.gilo.wc.ui.product.ShopActivity
|
import me.gilo.wc.ui.product.ShopActivity
|
||||||
import me.gilo.wc.utils.DateUtils
|
import me.gilo.wc.utils.DateUtils
|
||||||
import me.gilo.wc.utils.StringFormatter
|
import me.gilo.wc.utils.StringFormatter
|
||||||
@ -42,6 +43,12 @@ class OrderViewHolder(val context: Context, itemView: View) :
|
|||||||
|
|
||||||
tvDescription.text = description
|
tvDescription.text = description
|
||||||
|
|
||||||
|
itemView.setOnClickListener{
|
||||||
|
var intent = Intent(context, OrderActivity::class.java);
|
||||||
|
intent.putExtra("orderId", order.id);
|
||||||
|
context.startActivity(intent);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -13,6 +13,7 @@ import me.gilo.wc.ui.customer.ShippingAddressActivity;
|
|||||||
import me.gilo.wc.ui.home.HomeActivity;
|
import me.gilo.wc.ui.home.HomeActivity;
|
||||||
import me.gilo.wc.ui.onboarding.AnonymousSignInActivity;
|
import me.gilo.wc.ui.onboarding.AnonymousSignInActivity;
|
||||||
import me.gilo.wc.ui.order.MyOrdersActivity;
|
import me.gilo.wc.ui.order.MyOrdersActivity;
|
||||||
|
import me.gilo.wc.ui.order.OrderActivity;
|
||||||
import me.gilo.wc.ui.product.CartActivity;
|
import me.gilo.wc.ui.product.CartActivity;
|
||||||
import me.gilo.wc.ui.product.ProductActivity;
|
import me.gilo.wc.ui.product.ProductActivity;
|
||||||
import me.gilo.wc.ui.product.ShopActivity;
|
import me.gilo.wc.ui.product.ShopActivity;
|
||||||
@ -59,4 +60,7 @@ abstract class ActivitiesModule {
|
|||||||
@ContributesAndroidInjector
|
@ContributesAndroidInjector
|
||||||
abstract MyOrdersActivity contributesMyOrdersActivity();
|
abstract MyOrdersActivity contributesMyOrdersActivity();
|
||||||
|
|
||||||
|
@ContributesAndroidInjector
|
||||||
|
abstract OrderActivity contributesOrderActivity();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -11,7 +11,9 @@ import android.view.View
|
|||||||
import android.widget.FrameLayout
|
import android.widget.FrameLayout
|
||||||
import android.widget.TextView
|
import android.widget.TextView
|
||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
|
import com.google.firebase.auth.FirebaseAuth
|
||||||
import io.github.inflationx.viewpump.ViewPumpContextWrapper
|
import io.github.inflationx.viewpump.ViewPumpContextWrapper
|
||||||
|
import me.gilo.raison.ui.user.onboarding.SignInActivity
|
||||||
import me.gilo.wc.R
|
import me.gilo.wc.R
|
||||||
import me.gilo.wc.common.BaseActivity
|
import me.gilo.wc.common.BaseActivity
|
||||||
import me.gilo.wc.common.Status
|
import me.gilo.wc.common.Status
|
||||||
@ -34,6 +36,11 @@ abstract class WooDroidActivity<T : ViewModel> : BaseActivity() {
|
|||||||
override fun onResume() {
|
override fun onResume() {
|
||||||
super.onResume()
|
super.onResume()
|
||||||
|
|
||||||
|
if(FirebaseAuth.getInstance().currentUser == null){
|
||||||
|
startActivity(Intent(baseContext, SignInActivity::class.java))
|
||||||
|
finish()
|
||||||
|
}
|
||||||
|
|
||||||
cart()
|
cart()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
59
app/src/main/java/me/gilo/wc/ui/order/OrderActivity.kt
Normal file
59
app/src/main/java/me/gilo/wc/ui/order/OrderActivity.kt
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
package me.gilo.wc.ui.order
|
||||||
|
|
||||||
|
import android.os.Bundle
|
||||||
|
import android.support.design.widget.Snackbar
|
||||||
|
import android.support.v7.app.AppCompatActivity
|
||||||
|
import me.gilo.wc.R
|
||||||
|
|
||||||
|
import kotlinx.android.synthetic.main.activity_order.*
|
||||||
|
import me.gilo.wc.adapter.OrderAdapter
|
||||||
|
import me.gilo.wc.common.Status
|
||||||
|
import me.gilo.wc.ui.WooDroidActivity
|
||||||
|
import me.gilo.wc.viewmodels.OrderViewModel
|
||||||
|
import me.gilo.woodroid.models.Order
|
||||||
|
|
||||||
|
class OrderActivity : WooDroidActivity<OrderViewModel>() {
|
||||||
|
|
||||||
|
|
||||||
|
override lateinit var viewModel: OrderViewModel
|
||||||
|
var orders: ArrayList<Order> = ArrayList()
|
||||||
|
|
||||||
|
lateinit var adapter: OrderAdapter
|
||||||
|
|
||||||
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
|
super.onCreate(savedInstanceState)
|
||||||
|
setContentView(R.layout.activity_order)
|
||||||
|
setSupportActionBar(toolbar)
|
||||||
|
|
||||||
|
viewModel = getViewModel(OrderViewModel::class.java)
|
||||||
|
title = "Orders"
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun order(orderId : Int) {
|
||||||
|
viewModel.order(orderId).observe(this, android.arch.lifecycle.Observer { response ->
|
||||||
|
when (response!!.status()) {
|
||||||
|
Status.LOADING -> {
|
||||||
|
showLoading()
|
||||||
|
}
|
||||||
|
|
||||||
|
Status.SUCCESS -> {
|
||||||
|
stopShowingLoading()
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
Status.ERROR -> {
|
||||||
|
stopShowingLoading()
|
||||||
|
}
|
||||||
|
|
||||||
|
Status.EMPTY -> {
|
||||||
|
stopShowingLoading()
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
})
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
28
app/src/main/res/layout/activity_order.xml
Normal file
28
app/src/main/res/layout/activity_order.xml
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<android.support.design.widget.CoordinatorLayout
|
||||||
|
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"
|
||||||
|
tools:context=".ui.order.OrderActivity">
|
||||||
|
|
||||||
|
<android.support.design.widget.AppBarLayout
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:theme="@style/AppTheme.AppBarOverlay">
|
||||||
|
|
||||||
|
<android.support.v7.widget.Toolbar
|
||||||
|
android:id="@+id/toolbar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="?attr/actionBarSize"
|
||||||
|
android:background="?attr/colorPrimary"
|
||||||
|
app:popupTheme="@style/AppTheme.PopupOverlay"/>
|
||||||
|
|
||||||
|
</android.support.design.widget.AppBarLayout>
|
||||||
|
|
||||||
|
<include layout="@layout/content_order"/>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
</android.support.design.widget.CoordinatorLayout>
|
||||||
12
app/src/main/res/layout/content_order.xml
Normal file
12
app/src/main/res/layout/content_order.xml
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<android.support.constraint.ConstraintLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
app:layout_behavior="@string/appbar_scrolling_view_behavior"
|
||||||
|
tools:showIn="@layout/activity_order"
|
||||||
|
tools:context=".ui.order.OrderActivity">
|
||||||
|
|
||||||
|
</android.support.constraint.ConstraintLayout>
|
||||||
@ -46,5 +46,6 @@
|
|||||||
<string name="title_activity_cart">CartActivity</string>
|
<string name="title_activity_cart">CartActivity</string>
|
||||||
<string name="title_activity_checkout">CheckoutActivity</string>
|
<string name="title_activity_checkout">CheckoutActivity</string>
|
||||||
<string name="title_activity_anonymous_sign_in">AnonymousSignInActivity</string>
|
<string name="title_activity_anonymous_sign_in">AnonymousSignInActivity</string>
|
||||||
|
<string name="title_activity_order">OrderActivity</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user