merchant list added

shashankmohabia · May 13, 2019 · 00dd1f1 · 00dd1f1
1 parent cd10a32
commit 00dd1f1
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -39,6 +39,7 @@ dependencies {
     implementation 'com.android.support:support-media-compat:28.0.0'
     implementation 'com.android.support:cardview-v7:28.0.0'
     implementation 'com.android.support:design:28.0.0'
+    implementation 'com.android.support:exifinterface:28.0.0'
     implementation 'com.android.support:customtabs:28.0.0'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,5 +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.example.shashankmohabia.ciba">
 
     <application
@@ -8,7 +9,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"        >
 
         <activity android:name=".Core.MainActivity" />
         <activity android:name=".UI.SplashScreen">
@@ -22,6 +23,7 @@
         <activity android:name=".UserType.UserTypeSelectionActivity" />
         <activity android:name=".Auth.LoginActivity" />
         <activity android:name=".Core.MenuActivity" />
+        <activity android:name=".Auth.SelectMerchant"/>
         <activity android:name=".Core.MenuExpanded" />
         <activity android:name=".Core.Cart" />
         <activity android:name=".Core.MerchantActivity" />

diff --git a/app/src/main/java/com/example/shashankmohabia/ciba/Auth/SelectMerchant.kt b/app/src/main/java/com/example/shashankmohabia/ciba/Auth/SelectMerchant.kt
@@ -0,0 +1,16 @@
+package com.example.shashankmohabia.ciba.Auth
+
+import android.os.Bundle
+import android.os.PersistableBundle
+import android.support.v7.app.AppCompatActivity
+import com.example.shashankmohabia.ciba.R
+import kotlinx.android.synthetic.main.merchant_options_layout.*
+
+class SelectMerchant:AppCompatActivity(){
+    override fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
+        super.onCreate(savedInstanceState, persistentState)
+        setContentView(R.layout.merchant_options_layout)
+        setSupportActionBar(toolbar_select_merchant)
+    }
+
+}
diff --git a/app/src/main/java/com/example/shashankmohabia/ciba/Utils/Extensions/SelectMerchantAdapter.kt b/app/src/main/java/com/example/shashankmohabia/ciba/Utils/Extensions/SelectMerchantAdapter.kt
@@ -0,0 +1,2 @@
+package com.example.shashankmohabia.ciba.Utils.Extensions
+
diff --git a/app/src/main/res/layout/content_2.xml b/app/src/main/res/layout/content_2.xml
@@ -10,7 +10,7 @@
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/recycler_view_merchant"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"

diff --git a/app/src/main/res/layout/merchant_item.xml b/app/src/main/res/layout/merchant_item.xml
@@ -5,8 +5,8 @@
     android:layout_height="wrap_content"
     android:layout_margin="10dp"
     android:elevation="21dp"
-    app:cardCornerRadius="18dp"
-    app:cardElevation="10dp">
+    app:cardCornerRadius="4dp"
+    app:cardElevation="4dp">
 
     <RelativeLayout
         android:id="@+id/relative_layout_item_merchant"

diff --git a/app/src/main/res/layout/merchant_options_layout.xml b/app/src/main/res/layout/merchant_options_layout.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:app="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/toolbar_select_merchant"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/colorPrimary"
+            android:elevation="20dp"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+            app:title="Select A merchant">
+        </android.support.v7.widget.Toolbar>
+    </android.support.design.widget.AppBarLayout>
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/select_merchant_recyclerview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="60dp" />
+
+</android.support.design.widget.CoordinatorLayout>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		package com.example.shashankmohabia.ciba.Utils.Extensions