From 39f6cd3aa11f04ec840b844eb8fb7602dc0ecfc3 Mon Sep 17 00:00:00 2001
From: mandharet <tejasm@skiller.com>
Date: Fri, 4 Mar 2022 13:40:20 +0530
Subject: [PATCH 1/3] create Detail page 1.0

---
 .idea/misc.xml                                |   2 +-
 .../main/res/layout/activity_gri_detail.xml   | 335 +++++++++++++-----
 app/src/main/res/values/strings.xml           |   1 +
 3 files changed, 249 insertions(+), 89 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index c30cae9..754d345 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,7 +7,7 @@
         <entry key="..\:/Android Studio/Project_Clean_Android_Application/app/src/main/res/layout-w936dp/content_scrolling.xml" value="0.10211748633879782" />
         <entry key="..\:/Android Studio/Project_Clean_Android_Application/app/src/main/res/layout/activity_create_post.xml" value="0.25" />
         <entry key="..\:/Android Studio/Project_Clean_Android_Application/app/src/main/res/layout/activity_display_grievance.xml" value="0.1609375" />
-        <entry key="..\:/Android Studio/Project_Clean_Android_Application/app/src/main/res/layout/activity_gri_detail.xml" value="0.3411458333333333" />
+        <entry key="..\:/Android Studio/Project_Clean_Android_Application/app/src/main/res/layout/activity_gri_detail.xml" value="0.25" />
         <entry key="..\:/Android Studio/Project_Clean_Android_Application/app/src/main/res/layout/activity_grievance_detail.xml" value="0.22" />
         <entry key="..\:/Android Studio/Project_Clean_Android_Application/app/src/main/res/layout/activity_login.xml" value="0.33" />
         <entry key="..\:/Android Studio/Project_Clean_Android_Application/app/src/main/res/layout/activity_main.xml" value="0.33" />
diff --git a/app/src/main/res/layout/activity_gri_detail.xml b/app/src/main/res/layout/activity_gri_detail.xml
index e7c0f2d..d9dc512 100644
--- a/app/src/main/res/layout/activity_gri_detail.xml
+++ b/app/src/main/res/layout/activity_gri_detail.xml
@@ -1,113 +1,272 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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=".GriDetail">
+    android:layout_marginVertical="20dp"
+    android:background="#FFFFFF"
+    android:elevation="20dp"
+    android:paddingBottom="10dp">
 
-
-    <ImageView
-        android:id="@+id/iv_gri_img"
-        android:layout_width="match_parent"
-        android:layout_height="200dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:srcCompat="@tools:sample/avatars"
-        android:contentDescription="Grievance Image" />
-
-    <ScrollView
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:fillViewport="true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/iv_gri_img">
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:elevation="@dimen/cardview_default_elevation"
+        android:orientation="vertical">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="50dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="15dp"
+            android:layout_marginBottom="4dp"
+            android:orientation="horizontal">
 
-            <Button
-                android:id="@+id/btn_griLike"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="30dp"
-                android:text="Like"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <Button
-                android:id="@+id/btn_griComment"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="30dp"
-                android:text="Comment"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/btn_griLike" />
+            <de.hdodenhof.circleimageview.CircleImageView
+                android:id="@+id/textVuser_img"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_vertical"
+                app:civ_border_color="@color/purple_500"
+                app:civ_border_width="0.5dp" />
 
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginStart="10dp"
+                android:layout_weight="1"
+                android:orientation="vertical">
 
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideline3"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                app:layout_constraintGuide_percent="0.5" />
+                <TextView
+                    android:id="@+id/textVUsername"
+                    android:layout_width="wrap_content"
+                    android:layout_height="0dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="1"
+                    android:text="Username"
+                    android:textColor="@color/black"
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
 
-            <TextView
-                android:id="@+id/tv_gri_title"
-                style="@style/TextAppearance.AppCompat.Headline"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="30dp"
-                android:text="Title"
-                android:textSize="18sp"
-                android:textStyle="bold"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:id="@+id/tv_gri_location"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="30dp"
-                android:layout_marginVertical="10dp"
-                android:text="location"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tv_gri_title" />
 
+                    <ImageView
+                        android:id="@+id/iconHome"
+                        android:layout_width="18dp"
+                        android:layout_height="24dp"
+                        android:layout_gravity="center_vertical"
+                        android:contentDescription="@string/icon"
+                        android:visibility="visible"
+                        app:srcCompat="@drawable/location" />
 
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@id/tvDesc"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                    <TextView
+                        android:id="@+id/textVlocation"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_weight="1"
+                        android:text="Location"
+                        android:textColor="@android:color/secondary_text_light" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+
+            <ImageView
+                android:id="@+id/iconOption"
+                android:layout_width="20dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_vertical"
+                android:contentDescription="@string/icon"
+                app:srcCompat="@drawable/menu"
+                app:tint="@color/black" />
+        </LinearLayout>
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="30dp"
-                android:layout_marginVertical="10dp"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tv_gri_location">
+                android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/edDesc"
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <com.theophrast.ui.widget.SquareImageView
+                        android:id="@+id/post_image"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:scaleType="centerCrop"
+                        android:src="@color/purple_200"
+                        app:hwRatio="1.2"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <TextView
+                        android:id="@+id/textVCat"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="20dp"
+                        android:text="Category"
+                        android:textColor="@color/purple_700"
+                        android:textSize="24sp"
+                        app:layout_constraintStart_toStartOf="@id/post_image"
+                        app:layout_constraintTop_toTopOf="@id/post_image"/>
+
+                    <TextView
+                        android:id="@+id/textVRank"
+                        style="bold"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="20dp"
+                        android:text="#2"
+                        android:textSize="40sp"
+                        app:layout_constraintBottom_toBottomOf="@id/post_image"
+                        app:layout_constraintEnd_toEndOf="@id/post_image"/>
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:lines="5"
-                    android:text="Description"
-                    android:textSize="16sp"></TextView>
+                    android:layout_marginVertical="20dp"
+                    android:layout_marginStart="10dp"
+                    android:baselineAligned="false"
+                    android:orientation="vertical">
 
-            </com.google.android.material.textfield.TextInputLayout>
 
-            <com.google.android.gms.maps.MapView
-                android:id="@+id/mapView"
-                android:layout_width="match_parent"
-                android:layout_height="200dp"
-                android:layout_margin="30dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tvDesc" />
+                    <TextView
+                        android:id="@+id/textVtitle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="10dp"
+                        android:layout_weight="1"
+                        android:fontFamily="monospace"
+                        android:text="Title"
+                        android:textColor="@color/black"
+                        android:textSize="18sp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/textVStatus"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="10dp"
+                        android:layout_weight="1"
+                        android:text="In Progress"
+                        android:textColor="@android:color/holo_blue_dark"
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:id="@+id/textRead"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginHorizontal="10dp"
+                        android:text="Read More"
+                        android:textColor="@color/purple_700"
+                        android:textSize="14sp"/>
+
+
+                    <TextView
+                        android:id="@+id/textVDesc"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginHorizontal="10dp"
+                        android:layout_marginTop="10dp"
+                        android:text="@string/lorem_ipsum"
+                        android:textColor="@color/purple_700"
+                        android:textSize="14sp"
+                        android:visibility="visible"/>
+
+                    <TextView
+                        android:id="@+id/textVTimePosted"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="15dp"
+                        android:layout_marginEnd="15dp"
+                        android:text="0 days ago"
+                        android:textColor="@color/black"
+                        android:textSize="14sp" />
+                </LinearLayout>
+
 
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:orientation="horizontal"
+                    android:padding="10dp">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:orientation="horizontal">
+
+                        <RelativeLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content">
+
+                            <ImageView
+                                android:id="@+id/icon_up"
+                                android:layout_width="30dp"
+                                android:layout_height="wrap_content"
+                                android:layout_centerInParent="true"
+                                android:contentDescription="@string/icon"
+                                android:src="@drawable/up"
+                                android:visibility="visible" />
+
+                            <ImageView
+                                android:id="@+id/icon_upfill"
+                                android:layout_width="30dp"
+                                android:layout_height="wrap_content"
+                                android:layout_centerInParent="true"
+                                android:contentDescription="@string/icon"
+                                android:src="@drawable/up_fill"
+                                android:visibility="invisible" />
+                        </RelativeLayout>
+
+                        <TextView
+                            android:id="@+id/textVUpvote"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_marginStart="5dp"
+                            android:text="45"
+                            android:textSize="24sp">
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </ScrollView>
+                        </TextView>
+                    </LinearLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+
+                    <ImageView
+                        android:id="@+id/iconComments"
+                        android:layout_width="30dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="20dp"
+                        android:contentDescription="@string/icon"
+                        android:src="@drawable/comments" />
+
+
+                </LinearLayout>
+
+                <com.google.android.gms.maps.MapView
+                    android:id="@+id/mapView"
+                    android:layout_width="match_parent"
+                    android:layout_height="240dp"
+                    android:layout_weight="1" />
+            </LinearLayout>
+        </ScrollView>
+    </LinearLayout>
+</RelativeLayout>
\ 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 a675cff..743192a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -108,4 +108,5 @@
     </string>
     <string name="action_settings">Settings</string>
     <string name="icon">Icon</string>
+    <string name="lorem_ipsum">Lorem ipsum dolor sit amet consectetur adipisicing elit.Maxime mollitia, molestiae quas vel sint commodi repudiandae consequuntur.\n\n voluptatum laborum numquam blanditiis harum quisquam eius sed odit fugiat iusto fuga praesentium optio, eaque rerum! Provident similique accusantium nemo autem. Veritatis obcaecati tenetur iure eius earum ut molestias architecto voluptate aliquam nihil, eveniet aliquid culpa officia aut! Impedit sit sunt quaerat, odit, tenetur error, harum nesciunt ipsum debitis quas aliquid.</string>
 </resources>
\ No newline at end of file

From 270c323797c04c37fc92f0523ed8506f91e9a02f Mon Sep 17 00:00:00 2001
From: mandharet <tejasm@skiller.com>
Date: Fri, 4 Mar 2022 13:44:02 +0530
Subject: [PATCH 2/3] create Detail page 1.0

---
 .../main/res/layout/activity_gri_detail.xml   | 19 ++++++-------------
 app/src/main/res/values/colors.xml            |  2 +-
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/layout/activity_gri_detail.xml b/app/src/main/res/layout/activity_gri_detail.xml
index d9dc512..271016c 100644
--- a/app/src/main/res/layout/activity_gri_detail.xml
+++ b/app/src/main/res/layout/activity_gri_detail.xml
@@ -1,20 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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"
     android:layout_marginVertical="20dp"
-    android:background="#FFFFFF"
-    android:elevation="20dp"
-    android:paddingBottom="10dp">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
-        android:elevation="@dimen/cardview_default_elevation"
-        android:orientation="vertical">
+    android:background="@color/lightgray"
+    android:paddingBottom="10dp"
+    android:layout_marginTop="20dp"
+    android:orientation="vertical">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -268,5 +262,4 @@
                     android:layout_weight="1" />
             </LinearLayout>
         </ScrollView>
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
+    </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d0ca4ad..c8d6e63 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -15,7 +15,7 @@
     <color name="colorPrimaryDark">#CECECE</color>
     <color name="colorAccent">#03DAC5</color>
 
-    <color name="lightgray">#52000000</color>
+    <color name="lightgray">#EDE7F6</color>
 
     <color name="instafirstclor">#3c43e5</color>
     <color name="instacenterclord">#d34267</color>

From 63795604ebc3a1505502475c6f9873858c6a3a1c Mon Sep 17 00:00:00 2001
From: mandharet <tejasm@skiller.com>
Date: Fri, 4 Mar 2022 13:49:05 +0530
Subject: [PATCH 3/3] merge from harshad #6

---
 .../res/layout/single_grievance_item_view.xml | 28 +++++++------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/app/src/main/res/layout/single_grievance_item_view.xml b/app/src/main/res/layout/single_grievance_item_view.xml
index 31762ca..5a31f8c 100644
--- a/app/src/main/res/layout/single_grievance_item_view.xml
+++ b/app/src/main/res/layout/single_grievance_item_view.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    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"
@@ -7,13 +8,9 @@
     android:paddingBottom="10dp"
     android:layout_marginVertical="20dp"
     android:background="#FFFFFF"
-    android:layout_height="wrap_content">
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
-        android:elevation="@dimen/cardview_default_elevation"
-        android:orientation="vertical">
+    android:layout_height="wrap_content"
+    android:layout_marginTop="20dp"
+    android:orientation="vertical">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -41,10 +38,9 @@
 
                 <TextView
                     android:id="@+id/textVUsername"
-                    android:layout_width="wrap_content"
-                    android:layout_height="0dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:layout_weight="1"
                     android:text="Username"
                     android:textColor="@color/black"
                     android:textSize="18sp"
@@ -73,9 +69,8 @@
                         android:layout_weight="1"
                         android:text="Location"
                         android:textColor="@android:color/secondary_text_light"
-                        android:textSize="16sp">
+                        android:textSize="16sp"/>
 
-                    </TextView>
 
                 </LinearLayout>
 
@@ -123,7 +118,6 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:layout_marginStart="10dp"
-                    android:layout_weight="1"
                     android:text="Title"
                     android:textColor="@color/black"
                     android:fontFamily="monospace"
@@ -132,11 +126,10 @@
 
                 <TextView
                     android:id="@+id/textVStatus"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:layout_marginStart="10dp"
-                    android:layout_weight="1"
                     android:text="In Progress"
                     android:textColor="@android:color/holo_blue_dark"
                     android:textSize="16sp" />
@@ -321,5 +314,4 @@
             android:text="0 days ago"
             android:textColor="@color/black"
             android:textSize="14sp" />
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
+    </LinearLayout>
\ No newline at end of file