Merge pull request #14 from airrobe/eli/demoUpdate

Eli/demo update

AirRobeWidget/build.gradle

@@ -36,6 +36,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'com.airrobe.widgetsdk.airrobewidget'
 }
 
 afterEvaluate {

AirRobeWidget/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.airrobe.widgetsdk.airrobewidget">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>

build.gradle

@@ -31,6 +31,8 @@ ext {
     junitVersion = '4.13.2'
     extjunitVersion = '1.1.3'
     espressoCoreVersion = '3.4.0'
+    gsonVersion = '2.9.0'
+    imageSupportVersion = '2.0.0'
 
     demoVersionCode = 1
     demoVersionName = '1.0.0'

demo/build.gradle

@@ -29,6 +29,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'com.airrobe.widgetsdk.airrobedemo'
 }
 
 dependencies {
@@ -39,6 +40,8 @@ dependencies {
     implementation "androidx.appcompat:appcompat:$rootProject.ext.appCompatLibVersion"
     implementation "com.google.android.material:material:$rootProject.ext.materialLibVersion"
     implementation "androidx.constraintlayout:constraintlayout:$rootProject.ext.constraintLayoutVersion"
+    implementation "com.google.code.gson:gson:$rootProject.ext.gsonVersion"
+    implementation "io.github.nikartm:image-support:$rootProject.ext.imageSupportVersion"
     testImplementation "junit:junit:$rootProject.ext.junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.extjunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.ext.espressoCoreVersion"

demo/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.airrobe.widgetsdk.airrobedemo">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:name=".ApplicationController"
@@ -12,26 +11,40 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.AirRobeDemo">
         <activity
-            android:name="com.airrobe.widgetsdk.airrobedemo.activities.MainActivity"
+            android:name="com.airrobe.widgetsdk.airrobedemo.activities.SplashActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
-        <activity android:name=".activities.MenuActivity"
+        <activity android:name=".activities.BrandActivity"
+            android:configChanges="locale"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateVisible|adjustPan"
+            tools:ignore="LockedOrientationActivity"/>
+        <activity android:name=".activities.CategoryActivity"
+            android:configChanges="locale"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateVisible|adjustPan"
+            tools:ignore="LockedOrientationActivity"/>
+        <activity android:name=".activities.SubCategoryActivity"
+            android:configChanges="locale"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateVisible|adjustPan"
+            tools:ignore="LockedOrientationActivity"/>
+        <activity android:name=".activities.ProductActivity"
             android:configChanges="locale"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateVisible|adjustPan"
             tools:ignore="LockedOrientationActivity"/>
-        <activity android:name=".activities.OptInActivity"
+        <activity android:name=".activities.ProductListActivity"
             android:configChanges="locale"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateVisible|adjustPan"
             tools:ignore="LockedOrientationActivity"/>
-        <activity android:name=".activities.MultiOptInActivity"
+        <activity android:name=".activities.CartActivity"
             android:configChanges="locale"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateVisible|adjustPan"

demo/src/main/java/com/airrobe/widgetsdk/airrobedemo/activities/BrandActivity.kt

@@ -0,0 +1,27 @@
+package com.airrobe.widgetsdk.airrobedemo.activities
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.airrobe.widgetsdk.airrobedemo.R
+import com.airrobe.widgetsdk.airrobedemo.adapters.BrandsRVAdapter
+import com.airrobe.widgetsdk.airrobedemo.configs.Consts
+import com.airrobe.widgetsdk.airrobedemo.ui.VerticalSpaceItemDecoration
+import com.airrobe.widgetsdk.airrobedemo.utils.StatusBarTranslucent
+
+class BrandActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_brand)
+        StatusBarTranslucent.setStatusBarTranslucent(this, false)
+        StatusBarTranslucent.setStatusBarColor(this)
+
+        val rvBrand = findViewById<RecyclerView>(R.id.rv_brands)
+        rvBrand.layoutManager = LinearLayoutManager(this)
+        rvBrand.addItemDecoration(VerticalSpaceItemDecoration(20))
+
+        val rvBrandAdapter = BrandsRVAdapter(this, Consts.brands)
+        rvBrand.adapter = rvBrandAdapter
+    }
+}

demo/src/main/java/com/airrobe/widgetsdk/airrobedemo/activities/CartActivity.kt

@@ -0,0 +1,64 @@
+package com.airrobe.widgetsdk.airrobedemo.activities
+
+import android.annotation.SuppressLint
+import android.content.Intent
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import android.widget.EditText
+import android.widget.ImageView
+import android.widget.RelativeLayout
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.airrobe.widgetsdk.airrobedemo.R
+import com.airrobe.widgetsdk.airrobedemo.adapters.CartItemRVAdapter
+import com.airrobe.widgetsdk.airrobedemo.ui.VerticalSpaceItemDecoration
+import com.airrobe.widgetsdk.airrobedemo.utils.SharedPreferenceManager
+import com.airrobe.widgetsdk.airrobedemo.utils.StatusBarTranslucent
+import com.airrobe.widgetsdk.airrobedemo.utils.Utils
+import com.airrobe.widgetsdk.airrobewidget.widgets.AirRobeMultiOptIn
+
+class CartActivity : AppCompatActivity() {
+    lateinit var multiOptInWidget: AirRobeMultiOptIn
+
+    @SuppressLint("ClickableViewAccessibility")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_cart)
+        StatusBarTranslucent.setStatusBarTranslucent(this, false)
+        StatusBarTranslucent.setStatusBarColor(this)
+
+        val categories = arrayListOf<String>()
+        for (item in SharedPreferenceManager.getCartItems(this)) {
+            categories.add(item.category)
+        }
+
+        multiOptInWidget = findViewById(R.id.multi_opt_in_widget)
+        multiOptInWidget.initialize(categories)
+
+        val rvCartItems = findViewById<RecyclerView>(R.id.rv_cart_items)
+        rvCartItems.layoutManager = LinearLayoutManager(this)
+        rvCartItems.addItemDecoration(VerticalSpaceItemDecoration(20))
+
+        val rvCartItemAdapter = CartItemRVAdapter(this, SharedPreferenceManager.getCartItems(this))
+        rvCartItems.adapter = rvCartItemAdapter
+
+        val etEmail = findViewById<EditText>(R.id.et_email)
+        val rlPlaceOrder = findViewById<RelativeLayout>(R.id.rl_place_order)
+        rlPlaceOrder.setOnTouchListener { view, motionEvent ->
+            if (Utils.touchAnimator(this, view, motionEvent)) {
+                val intent = Intent(this, ConfirmationActivity::class.java)
+                intent.putExtra("email", etEmail.text.toString())
+                startActivity(intent)
+            }
+            true
+        }
+
+        val ivBack = findViewById<ImageView>(R.id.iv_back)
+        ivBack.setOnTouchListener { view, motionEvent ->
+            if (Utils.touchAnimator(this, view, motionEvent)) {
+                finish()
+            }
+            true
+        }
+    }
+}

demo/src/main/java/com/airrobe/widgetsdk/airrobedemo/activities/CategoryActivity.kt

@@ -0,0 +1,45 @@
+package com.airrobe.widgetsdk.airrobedemo.activities
+
+import android.annotation.SuppressLint
+import android.content.Intent
+import android.os.Bundle
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.airrobe.widgetsdk.airrobedemo.R
+import com.airrobe.widgetsdk.airrobedemo.adapters.CategoriesRVAdapter
+import com.airrobe.widgetsdk.airrobedemo.configs.Consts
+import com.airrobe.widgetsdk.airrobedemo.ui.VerticalSpaceItemDecoration
+import com.airrobe.widgetsdk.airrobedemo.utils.StatusBarTranslucent
+import com.airrobe.widgetsdk.airrobedemo.utils.Utils
+
+class CategoryActivity : AppCompatActivity() {
+    @SuppressLint("ClickableViewAccessibility")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_category)
+        StatusBarTranslucent.setStatusBarTranslucent(this, false)
+        StatusBarTranslucent.setStatusBarColor(this)
+
+        val brandId = intent.getIntExtra("brandId", 0)
+        val tvTitle = findViewById<TextView>(R.id.tv_title)
+        tvTitle.text = Consts.brands[brandId].brand
+
+        val rvCategory = findViewById<RecyclerView>(R.id.rv_categories)
+        rvCategory.layoutManager = LinearLayoutManager(this)
+        rvCategory.addItemDecoration(VerticalSpaceItemDecoration(20))
+
+        val rvCategoryAdapter = CategoriesRVAdapter(this, Consts.categories)
+        rvCategory.adapter = rvCategoryAdapter
+
+        val ivBack = findViewById<ImageView>(R.id.iv_back)
+        ivBack.setOnTouchListener { view, motionEvent ->
+            if (Utils.touchAnimator(this, view, motionEvent)) {
+                finish()
+            }
+            true
+        }
+    }
+}

demo/src/main/java/com/airrobe/widgetsdk/airrobedemo/activities/ConfirmationActivity.kt

@@ -1,24 +1,35 @@
 package com.airrobe.widgetsdk.airrobedemo.activities
 
-import android.graphics.Color
+import android.annotation.SuppressLint
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.widget.ImageView
 import com.airrobe.widgetsdk.airrobedemo.R
+import com.airrobe.widgetsdk.airrobedemo.utils.StatusBarTranslucent
+import com.airrobe.widgetsdk.airrobedemo.utils.Utils
 import com.airrobe.widgetsdk.airrobewidget.widgets.AirRobeConfirmation
 
 class ConfirmationActivity : AppCompatActivity() {
+    @SuppressLint("ClickableViewAccessibility")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_confirmation)
+        StatusBarTranslucent.setStatusBarTranslucent(this, false)
+        StatusBarTranslucent.setStatusBarColor(this)
+
         val confirmationWidget = findViewById<AirRobeConfirmation>(R.id.confirmation_widget)
+        val email: String = intent.getStringExtra("email") ?: ""
         confirmationWidget.initialize(
             orderId = "123456",
-            email = "[email protected]"
+            email = email
         )
-        // Way to set widget colors
-//        confirmationWidget.borderColor = Color.BLUE
-//        confirmationWidget.textColor = Color.YELLOW
-//        confirmationWidget.buttonBorderColor = Color.GREEN
-//        confirmationWidget.buttonTextColor = Color.GRAY
+
+        val ivBack = findViewById<ImageView>(R.id.iv_back)
+        ivBack.setOnTouchListener { view, motionEvent ->
+            if (Utils.touchAnimator(this, view, motionEvent)) {
+                finish()
+            }
+            true
+        }
     }
 }