Merge remote-tracking branch 'origin/simran'

wdlsvnit · Apr 8, 2018 · d0cf80a · d0cf80a
2 parents f3629d0 + 1778cb1
commit d0cf80a
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 11 deletions.
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/google-services.json b/app/google-services.json
@@ -14,6 +14,22 @@
         }
       },
       "oauth_client": [
+        {
+          "client_id": "450891800393-uha4bkmeli9q7tju6v4capucn3n5rnje.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "in.webdevlabs.campuscommerce",
+            "certificate_hash": "3ac1e7d126dbc6e159a6fa3d610021cc69287013"
+          }
+        },
+        {
+          "client_id": "450891800393-4vpcnosee880u13dm82khpba1jslshuk.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "in.webdevlabs.campuscommerce",
+            "certificate_hash": "06d190514baa3a32fb8cb69a27842c4b540d70ed"
+          }
+        },
         {
           "client_id": "450891800393-7dlsu81pfsimggfk6k9104kpspbjmgre.apps.googleusercontent.com",
           "client_type": 1,

diff --git a/app/src/main/java/in/webdevlabs/campuscommerce/activities/NewPostActivity.kt b/app/src/main/java/in/webdevlabs/campuscommerce/activities/NewPostActivity.kt
@@ -44,7 +44,7 @@ class NewPostActivity : AppCompatActivity() {
         }
 
         val currentLocalTime = Calendar.getInstance(TimeZone.getDefault()).time
-        val date = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX", Locale.getDefault())
+        val date = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.getDefault())
         val time = date.format(currentLocalTime)
         val tag = tag_text.text.toString()
 

diff --git a/app/src/main/java/in/webdevlabs/campuscommerce/adapters/PostViewHolder.kt b/app/src/main/java/in/webdevlabs/campuscommerce/adapters/PostViewHolder.kt
@@ -28,10 +28,10 @@ class PostViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
     fun bindPost(post: Post) {
         this.name.text = post.name
-        this.price.text = post.price.toString()
+        this.price.text = "RS "+post.price.toString()
 
         post.tag?.let {
-            tag.text = it
+            tag.text ="Category :"+it
         }
 
         this.type.text = when (post.type) {

diff --git a/app/src/main/res/drawable/chat.png b/app/src/main/res/drawable/chat.png
diff --git a/app/src/main/res/drawable/ic_chat_black_24dp.xml b/app/src/main/res/drawable/ic_chat_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM6,9h12v2L6,11L6,9zM14,14L6,14v-2h8v2zM18,8L6,8L6,6h12v2z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_chat.xml b/app/src/main/res/layout/activity_chat.xml
@@ -23,6 +23,7 @@
     <android.support.v7.widget.RecyclerView
         android:id="@+id/chatRecyclerView"
         android:layout_width="match_parent"
+        android:textSize="5sp"
         android:layout_height="match_parent"
         android:layout_above="@+id/linearLayout"
         android:layout_below="@id/appBarLayout" />

diff --git a/app/src/main/res/layout/fragment_mychats.xml b/app/src/main/res/layout/fragment_mychats.xml
@@ -9,7 +9,8 @@
         android:id="@+id/my_recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scrollbars="vertical" />
+        android:scrollbars="vertical"
+        android:layout_margin="5dp"/>
 
     <TextView
         android:id="@+id/get_started"

diff --git a/app/src/main/res/layout/item_mychats.xml b/app/src/main/res/layout/item_mychats.xml
@@ -2,15 +2,17 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:layout_marginTop="20dp">
 
     <TextView
         android:id="@+id/ctext"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="demo"
         android:padding="2dp"
-        android:textSize="30dp"
+        android:layout_margin="5dp"
+        android:textSize="20dp"
         android:layout_gravity="center_horizontal"
         />
     <View

diff --git a/app/src/main/res/layout/item_post.xml b/app/src/main/res/layout/item_post.xml
@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
+
     android:tag="cards main container">
 
     <android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
@@ -11,6 +12,7 @@
         android:layout_height="wrap_content"
         card_view:cardCornerRadius="10dp"
         card_view:cardElevation="5dp"
+        card_view:cardBackgroundColor="#DCDCDC"
         card_view:cardUseCompatPadding="true">
 
         <RelativeLayout
@@ -29,6 +31,7 @@
                     android:layout_alignParentLeft="true"
                     android:layout_margin="5dp"
                     android:text="Name"
+                    android:textSize="30dp"
                     android:textAppearance="?android:attr/textAppearanceLarge"
                     android:textStyle="bold" />
 
@@ -51,6 +54,7 @@
                 android:layout_below="@+id/name_time"
                 android:layout_margin="5dp"
                 android:text="Price"
+                android:textSize="15dp"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:textStyle="italic" />
 
@@ -60,12 +64,13 @@
                 android:layout_height="50dp"
                 android:layout_alignParentRight="true"
                 android:layout_below="@+id/price"
-                android:src="@drawable/chat" />
+                android:src="@drawable/ic_chat_black_24dp" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/price"
+                android:orientation="vertical"
                 android:layout_margin="5dp">
 
                 <TextView
@@ -74,6 +79,7 @@
                     android:layout_height="wrap_content"
                     android:layout_margin="5dp"
                     android:text="tag"
+                    android:textSize="15dp"
                     android:textAppearance="?android:attr/textAppearanceLarge" />
 
                 <TextView
@@ -82,6 +88,7 @@
                     android:layout_height="wrap_content"
                     android:layout_margin="5dp"
                     android:text="Sell"
+                    android:textSize="15dp"
                     android:textAppearance="?android:attr/textAppearanceLarge" />
 
             </LinearLayout>