diff --git a/.idea/misc.xml b/.idea/misc.xml
index 754d345..7d7d1e5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,18 +3,43 @@
diff --git a/app/build.gradle b/app/build.gradle
index fceac48..5250fd8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,6 +42,7 @@ dependencies {
implementation 'com.google.android.material:material:1.5.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
implementation 'com.google.android.gms:play-services-maps:18.0.2'
+ implementation 'androidx.legacy:legacy-support-v4:1.0.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
@@ -54,8 +55,17 @@ dependencies {
implementation 'com.github.bumptech.glide:glide:4.12.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
+
+ //imagepicker and imageviews
implementation 'de.hdodenhof:circleimageview:3.1.0'
implementation 'com.github.dhaval2404:imagepicker:2.1'
implementation 'com.github.Theophrast:SquareImageView:1.0.1'
+ //shimmer effect
+ implementation 'com.facebook.shimmer:shimmer:0.5.0'
+ //icon in textview
+ implementation 'androidx.appcompat:appcompat:1.4.1'
+ //for fragment
+ implementation 'com.google.android.material:material:1.5.0'
+
}
\ No newline at end of file
diff --git a/app/src/main/java/com/harshad/projectclean/DisplayGrievance.kt b/app/src/main/java/com/harshad/projectclean/DisplayGrievance.kt
index 118d4de..5fb0cab 100644
--- a/app/src/main/java/com/harshad/projectclean/DisplayGrievance.kt
+++ b/app/src/main/java/com/harshad/projectclean/DisplayGrievance.kt
@@ -1,21 +1,24 @@
package com.harshad.projectclean
import android.content.Context
-import android.location.LocationRequest
-import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.util.Log
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
+import com.facebook.shimmer.ShimmerFrameLayout
import com.harshad.projectclean.APIRequests.ApiClient
-import com.harshad.projectclean.APIRequests.grievance_data_class.*
-import com.harshad.projectclean.grievance_recycler_view_classes.GrievanceRecycleViewAdapter
+import com.harshad.projectclean.APIRequests.grievance_data_class.GrievancesListResponse
import com.harshad.projectclean.databinding.ActivityDisplayGrievanceBinding
+import com.harshad.projectclean.grievance_recycler_view_classes.GrievanceRecycleViewAdapter
import retrofit2.Call
import retrofit2.Callback
import retrofit2.Response
+
class DisplayGrievance : AppCompatActivity() {
+ private lateinit var mShimmerViewContainer: ShimmerFrameLayout
private lateinit var binding: ActivityDisplayGrievanceBinding
lateinit var adapter: GrievanceRecycleViewAdapter
override fun onCreate(savedInstanceState: Bundle?) {
@@ -23,6 +26,8 @@ class DisplayGrievance : AppCompatActivity() {
binding = ActivityDisplayGrievanceBinding.inflate(layoutInflater)
val view = binding.root
setContentView(view)
+
+ mShimmerViewContainer =binding.shimmerLayout
getGriData(this)
}
@@ -36,12 +41,21 @@ class DisplayGrievance : AppCompatActivity() {
call: Call,
response: Response
) {
+ if (response.isSuccessful()) {
+ if (response.code() == 200) {
+
+ val gri_resposne = response.body()
+ var recy_grievance_list =
+ findViewById(R.id.recy_grievance_list)
+ recy_grievance_list.adapter =
+ GrievanceRecycleViewAdapter(context, gri_resposne!!.gri_data)
+ recy_grievance_list.layoutManager = LinearLayoutManager(context)
+ Log.d("Gri Data", "Response Success ${gri_resposne.gri_data}")
+ }
+ mShimmerViewContainer.stopShimmer()
+ mShimmerViewContainer.visibility = View.GONE
+ }
- val gri_resposne = response.body()
- var recy_grievance_list = findViewById(R.id.recy_grievance_list)
- recy_grievance_list.adapter = GrievanceRecycleViewAdapter(context,gri_resposne!!.gri_data)
- recy_grievance_list.layoutManager = LinearLayoutManager(context)
- Log.d("Gri Data","Response Success ${gri_resposne.gri_data}")
}
override fun onFailure(call: Call, t: Throwable) {
@@ -49,4 +63,13 @@ class DisplayGrievance : AppCompatActivity() {
}
})
}
+ override fun onResume() {
+ super.onResume()
+ mShimmerViewContainer.startShimmer()
+ }
+
+ override fun onPause() {
+ mShimmerViewContainer.stopShimmer()
+ super.onPause()
+ }
}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/blue_button.xml b/app/src/main/res/drawable/blue_button.xml
deleted file mode 100644
index bea24f1..0000000
--- a/app/src/main/res/drawable/blue_button.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_shape_1.xml b/app/src/main/res/drawable/btn_shape_1.xml
deleted file mode 100644
index 88c4171..0000000
--- a/app/src/main/res/drawable/btn_shape_1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/camera.png b/app/src/main/res/drawable/camera.png
deleted file mode 100644
index 9d80079..0000000
Binary files a/app/src/main/res/drawable/camera.png and /dev/null differ
diff --git a/app/src/main/res/drawable/comments.png b/app/src/main/res/drawable/comments.png
deleted file mode 100644
index 15f4181..0000000
Binary files a/app/src/main/res/drawable/comments.png and /dev/null differ
diff --git a/app/src/main/res/drawable/coverimg.jpg b/app/src/main/res/drawable/coverimg.jpg
deleted file mode 100644
index 34e0c40..0000000
Binary files a/app/src/main/res/drawable/coverimg.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable/defualt_insta_pic.png b/app/src/main/res/drawable/defualt_insta_pic.png
deleted file mode 100644
index 3ea5847..0000000
Binary files a/app/src/main/res/drawable/defualt_insta_pic.png and /dev/null differ
diff --git a/app/src/main/res/drawable/facebook24px.png b/app/src/main/res/drawable/facebook24px.png
deleted file mode 100644
index 8897ecd..0000000
Binary files a/app/src/main/res/drawable/facebook24px.png and /dev/null differ
diff --git a/app/src/main/res/drawable/facebook32px.png b/app/src/main/res/drawable/facebook32px.png
deleted file mode 100644
index d5d0dde..0000000
Binary files a/app/src/main/res/drawable/facebook32px.png and /dev/null differ
diff --git a/app/src/main/res/drawable/facebook64px.png b/app/src/main/res/drawable/facebook64px.png
deleted file mode 100644
index eb398ae..0000000
Binary files a/app/src/main/res/drawable/facebook64px.png and /dev/null differ
diff --git a/app/src/main/res/drawable/gender.png b/app/src/main/res/drawable/gender.png
deleted file mode 100644
index 3c6cf99..0000000
Binary files a/app/src/main/res/drawable/gender.png and /dev/null differ
diff --git a/app/src/main/res/drawable/heart.png b/app/src/main/res/drawable/heart.png
deleted file mode 100644
index bad8f41..0000000
Binary files a/app/src/main/res/drawable/heart.png and /dev/null differ
diff --git a/app/src/main/res/drawable/home.png b/app/src/main/res/drawable/home.png
deleted file mode 100644
index 7feb344..0000000
Binary files a/app/src/main/res/drawable/home.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_add_story.xml b/app/src/main/res/drawable/ic_add.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_add_story.xml
rename to app/src/main/res/drawable/ic_add.xml
diff --git a/app/src/main/res/drawable/ic_birth.xml b/app/src/main/res/drawable/ic_comment.xml
similarity index 61%
rename from app/src/main/res/drawable/ic_birth.xml
rename to app/src/main/res/drawable/ic_comment.xml
index 1cf969c..4ff6d94 100644
--- a/app/src/main/res/drawable/ic_birth.xml
+++ b/app/src/main/res/drawable/ic_comment.xml
@@ -6,5 +6,5 @@
android:tint="?attr/colorControlNormal">
+ android:pathData="M22,4c0,-1.1 -0.9,-2 -2,-2L4,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4L22,4zM20,17.17L18.83,16L4,16L4,4h16v13.17zM13,5h-2v4L7,9v2h4v4h2v-4h4L17,9h-4z"/>
diff --git a/app/src/main/res/drawable/ic_feed.xml b/app/src/main/res/drawable/ic_feed.xml
new file mode 100644
index 0000000..f937840
--- /dev/null
+++ b/app/src/main/res/drawable/ic_feed.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_email.xml b/app/src/main/res/drawable/ic_location.xml
similarity index 59%
rename from app/src/main/res/drawable/ic_email.xml
rename to app/src/main/res/drawable/ic_location.xml
index 6943b4c..e6dfeb4 100644
--- a/app/src/main/res/drawable/ic_email.xml
+++ b/app/src/main/res/drawable/ic_location.xml
@@ -6,5 +6,5 @@
android:tint="?attr/colorControlNormal">
+ android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
diff --git a/app/src/main/res/drawable/ic_phone.xml b/app/src/main/res/drawable/ic_menu.xml
similarity index 57%
rename from app/src/main/res/drawable/ic_phone.xml
rename to app/src/main/res/drawable/ic_menu.xml
index 1791a85..34b93ec 100644
--- a/app/src/main/res/drawable/ic_phone.xml
+++ b/app/src/main/res/drawable/ic_menu.xml
@@ -6,5 +6,5 @@
android:tint="?attr/colorControlNormal">
+ android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
diff --git a/app/src/main/res/drawable/ic_story_delete.xml b/app/src/main/res/drawable/ic_story_delete.xml
deleted file mode 100644
index 1b78f89..0000000
--- a/app/src/main/res/drawable/ic_story_delete.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_story_view.xml b/app/src/main/res/drawable/ic_story_view.xml
deleted file mode 100644
index 4f5b695..0000000
--- a/app/src/main/res/drawable/ic_story_view.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_thumb_up.xml b/app/src/main/res/drawable/ic_thumb_up.xml
new file mode 100644
index 0000000..7b8adde
--- /dev/null
+++ b/app/src/main/res/drawable/ic_thumb_up.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_thumb_up_fill.xml b/app/src/main/res/drawable/ic_thumb_up_fill.xml
new file mode 100644
index 0000000..6a39a39
--- /dev/null
+++ b/app/src/main/res/drawable/ic_thumb_up_fill.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/instagram_logo.png b/app/src/main/res/drawable/instagram_logo.png
deleted file mode 100644
index 1b2db85..0000000
Binary files a/app/src/main/res/drawable/instagram_logo.png and /dev/null differ
diff --git a/app/src/main/res/drawable/location.png b/app/src/main/res/drawable/location.png
deleted file mode 100644
index 2c1ce18..0000000
Binary files a/app/src/main/res/drawable/location.png and /dev/null differ
diff --git a/app/src/main/res/drawable/menu.png b/app/src/main/res/drawable/menu.png
deleted file mode 100644
index babeb46..0000000
Binary files a/app/src/main/res/drawable/menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable/option.png b/app/src/main/res/drawable/option.png
deleted file mode 100644
index 755e3f3..0000000
Binary files a/app/src/main/res/drawable/option.png and /dev/null differ
diff --git a/app/src/main/res/drawable/plus.png b/app/src/main/res/drawable/plus.png
deleted file mode 100644
index c2d2fc9..0000000
Binary files a/app/src/main/res/drawable/plus.png and /dev/null differ
diff --git a/app/src/main/res/drawable/redheart.png b/app/src/main/res/drawable/redheart.png
deleted file mode 100644
index 3f88ba4..0000000
Binary files a/app/src/main/res/drawable/redheart.png and /dev/null differ
diff --git a/app/src/main/res/drawable/save.png b/app/src/main/res/drawable/save.png
deleted file mode 100644
index 5694f1a..0000000
Binary files a/app/src/main/res/drawable/save.png and /dev/null differ
diff --git a/app/src/main/res/drawable/search.png b/app/src/main/res/drawable/search.png
deleted file mode 100644
index f472819..0000000
Binary files a/app/src/main/res/drawable/search.png and /dev/null differ
diff --git a/app/src/main/res/drawable/send.png b/app/src/main/res/drawable/send.png
deleted file mode 100644
index a3736a3..0000000
Binary files a/app/src/main/res/drawable/send.png and /dev/null differ
diff --git a/app/src/main/res/drawable/up.png b/app/src/main/res/drawable/up.png
deleted file mode 100644
index 897cae0..0000000
Binary files a/app/src/main/res/drawable/up.png and /dev/null differ
diff --git a/app/src/main/res/drawable/up_fill.png b/app/src/main/res/drawable/up_fill.png
deleted file mode 100644
index 6f6ee00..0000000
Binary files a/app/src/main/res/drawable/up_fill.png and /dev/null differ
diff --git a/app/src/main/res/drawable/user.png b/app/src/main/res/drawable/user.png
deleted file mode 100644
index 0cc6c58..0000000
Binary files a/app/src/main/res/drawable/user.png and /dev/null differ
diff --git a/app/src/main/res/font/sf_ui_font.otf b/app/src/main/res/font/sf_ui_font.otf
new file mode 100644
index 0000000..c674aa2
Binary files /dev/null and b/app/src/main/res/font/sf_ui_font.otf differ
diff --git a/app/src/main/res/layout/activity_create_post.xml b/app/src/main/res/layout/activity_create_post.xml
index 38630c2..2622092 100644
--- a/app/src/main/res/layout/activity_create_post.xml
+++ b/app/src/main/res/layout/activity_create_post.xml
@@ -8,17 +8,16 @@
android:layout_height="match_parent"
tools:context=".CreatePost">
-
@@ -69,13 +68,14 @@
+ app:layout_constraintTop_toBottomOf="@id/tvTitle" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ app:srcCompat="@drawable/ic_location" />
@@ -219,7 +219,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:contentDescription="@string/icon"
- android:src="@drawable/up"
+ android:src="@drawable/ic_thumb_up"
android:visibility="visible" />
@@ -250,7 +250,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:contentDescription="@string/icon"
- android:src="@drawable/comments" />
+ android:src="@drawable/ic_comment" />
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c013e30..f5bd3a0 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -68,10 +68,11 @@
android:layout_marginBottom="28dp"
android:clickable="true"
android:focusable="true"
- android:foreground="@android:drawable/ic_menu_add"
- app:backgroundTint="#673AB7"
+ android:foreground="@drawable/ic_add"
+ app:backgroundTint="#00ffffff"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent" />
+ app:layout_constraintEnd_toEndOf="parent"
+ android:contentDescription="Add Icon" />
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/shimmer_gridetail.xml b/app/src/main/res/layout/shimmer_gridetail.xml
new file mode 100644
index 0000000..ec7bc01
--- /dev/null
+++ b/app/src/main/res/layout/shimmer_gridetail.xml
@@ -0,0 +1,210 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/shimmer_grievance.xml b/app/src/main/res/layout/shimmer_grievance.xml
new file mode 100644
index 0000000..39b3731
--- /dev/null
+++ b/app/src/main/res/layout/shimmer_grievance.xml
@@ -0,0 +1,253 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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 5a31f8c..3655e8e 100644
--- a/app/src/main/res/layout/single_grievance_item_view.xml
+++ b/app/src/main/res/layout/single_grievance_item_view.xml
@@ -54,12 +54,12 @@
+ app:srcCompat="@drawable/ic_location" />
@@ -120,7 +120,6 @@
android:layout_marginStart="10dp"
android:text="Title"
android:textColor="@color/black"
- android:fontFamily="monospace"
android:textSize="18sp"
android:textStyle="bold" />
@@ -160,7 +159,7 @@
@@ -239,24 +238,25 @@
@@ -276,10 +276,11 @@
+ android:src="@drawable/ic_comment" />
diff --git a/app/src/main/res/menu/nav_menu.xml b/app/src/main/res/menu/nav_menu.xml
new file mode 100644
index 0000000..b29c701
--- /dev/null
+++ b/app/src/main/res/menu/nav_menu.xml
@@ -0,0 +1,21 @@
+
+
\ 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 c8d6e63..fac67f6 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -15,6 +15,8 @@
#CECECE
#03DAC5
+ #C2C2C2
+ #dddddd
#EDE7F6
#3c43e5
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..7166b4c
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,7 @@
+
+
+ 16dp
+ 60dp
+ 8dp
+ 10dp
+
\ 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 743192a..ed8008d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -109,4 +109,11 @@
Settings
Icon
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.
+ Lorem ipsum dolor sit amet consectetur adipisicing elit.Maxime mollitia, harum nesciunt ipsum debitis quas aliquid.
+ 19.71280, 71.89764
+ Map
+ Home
+ Profile
+
+ Hello blank fragment
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index eaf4451..5edffed 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -12,6 +12,8 @@
- ?attr/colorPrimaryVariant
+ - @font/sf_ui_font
+ - @font/sf_ui_font
+
+
+
+
+
+
+
\ No newline at end of file