diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ef62e98..5599d14 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,6 +13,11 @@ android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> + + : BaseActivity() { override fun onResume() { super.onResume() + if(FirebaseAuth.getInstance().currentUser == null){ + startActivity(Intent(baseContext, SignInActivity::class.java)) + finish() + } + cart() } diff --git a/app/src/main/java/me/gilo/wc/ui/order/OrderActivity.kt b/app/src/main/java/me/gilo/wc/ui/order/OrderActivity.kt new file mode 100644 index 0000000..01ea7f2 --- /dev/null +++ b/app/src/main/java/me/gilo/wc/ui/order/OrderActivity.kt @@ -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() { + + + override lateinit var viewModel: OrderViewModel + var orders: ArrayList = 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() + + + } + } + + }) + + } + +} diff --git a/app/src/main/res/layout/activity_order.xml b/app/src/main/res/layout/activity_order.xml new file mode 100644 index 0000000..3249dd7 --- /dev/null +++ b/app/src/main/res/layout/activity_order.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/content_order.xml b/app/src/main/res/layout/content_order.xml new file mode 100644 index 0000000..9e60092 --- /dev/null +++ b/app/src/main/res/layout/content_order.xml @@ -0,0 +1,12 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6967612..3aa6a32 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -46,5 +46,6 @@ CartActivity CheckoutActivity AnonymousSignInActivity + OrderActivity