Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'

}
41 changes: 32 additions & 9 deletions app/src/main/java/com/harshad/projectclean/DisplayGrievance.kt
Original file line number Diff line number Diff line change
@@ -1,28 +1,33 @@
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?) {
super.onCreate(savedInstanceState)
binding = ActivityDisplayGrievanceBinding.inflate(layoutInflater)
val view = binding.root
setContentView(view)

mShimmerViewContainer =binding.shimmerLayout
getGriData(this)

}
Expand All @@ -36,17 +41,35 @@ class DisplayGrievance : AppCompatActivity() {
call: Call<GrievancesListResponse>,
response: Response<GrievancesListResponse>
) {
if (response.isSuccessful()) {
if (response.code() == 200) {

val gri_resposne = response.body()
var recy_grievance_list =
findViewById<RecyclerView>(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<RecyclerView>(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<GrievancesListResponse>, t: Throwable) {
Log.d("Gri Data","Response ERROR ${t} ")
}
})
}
override fun onResume() {
super.onResume()
mShimmerViewContainer.startShimmer()
}

override fun onPause() {
mShimmerViewContainer.stopShimmer()
super.onPause()
}
}
6 changes: 0 additions & 6 deletions app/src/main/res/drawable/blue_button.xml

This file was deleted.

8 changes: 0 additions & 8 deletions app/src/main/res/drawable/btn_shape_1.xml

This file was deleted.

Binary file removed app/src/main/res/drawable/camera.png
Binary file not shown.
Binary file removed app/src/main/res/drawable/comments.png
Binary file not shown.
Binary file removed app/src/main/res/drawable/coverimg.jpg
Binary file not shown.
Binary file removed app/src/main/res/drawable/defualt_insta_pic.png
Binary file not shown.
Binary file removed app/src/main/res/drawable/facebook24px.png
Binary file not shown.
Binary file removed app/src/main/res/drawable/facebook32px.png
Binary file not shown.
Binary file removed app/src/main/res/drawable/facebook64px.png
Binary file not shown.
Binary file removed app/src/main/res/drawable/gender.png
Binary file not shown.
Binary file removed app/src/main/res/drawable/heart.png
Binary file not shown.
Binary file removed app/src/main/res/drawable/home.png
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M20,3h-1L19,1h-2v2L7,3L7,1L5,1v2L4,3c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,5c0,-1.1 -0.9,-2 -2,-2zM20,21L4,21L4,8h16v13z"/>
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"/>
</vector>
13 changes: 13 additions & 0 deletions app/src/main/res/drawable/ic_feed.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M20,6v14H6v2h14c1.1,0 2,-0.9 2,-2V6H20z"/>
<path
android:fillColor="@android:color/white"
android:pathData="M16,2H4C2.9,2 2,2.9 2,4v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C18,2.9 17.1,2 16,2zM9,16H4v-5h5V16zM16,16h-5v-5h5V16zM16,9H4V4h12V9z"/>
</vector>
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
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"/>
</vector>
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M16,1L8,1C6.34,1 5,2.34 5,4v16c0,1.66 1.34,3 3,3h8c1.66,0 3,-1.34 3,-3L19,4c0,-1.66 -1.34,-3 -3,-3zM14,21h-4v-1h4v1zM17.25,18L6.75,18L6.75,4h10.5v14z"/>
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"/>
</vector>
9 changes: 0 additions & 9 deletions app/src/main/res/drawable/ic_story_delete.xml

This file was deleted.

9 changes: 0 additions & 9 deletions app/src/main/res/drawable/ic_story_view.xml

This file was deleted.

10 changes: 10 additions & 0 deletions app/src/main/res/drawable/ic_thumb_up.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M21,8h-6.31l0.95,-4.57 0.03,-0.32c0,-0.41 -0.17,-0.79 -0.44,-1.06L14.17,1 7.59,7.59C7.22,7.95 7,8.45 7,9v10c0,1.1 0.9,2 2,2h9c0.83,0 1.54,-0.5 1.84,-1.22l3.02,-7.05c0.09,-0.23 0.14,-0.47 0.14,-0.73v-2c0,-1.1 -0.9,-2 -2,-2zM21,12l-3,7L9,19L9,9l4.34,-4.34L12.23,10L21,10v2zM1,9h4v12L1,21z"/>
</vector>
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/ic_thumb_up_fill.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M1,21h4L5,9L1,9v12zM23,10c0,-1.1 -0.9,-2 -2,-2h-6.31l0.95,-4.57 0.03,-0.32c0,-0.41 -0.17,-0.79 -0.44,-1.06L14.17,1 7.59,7.59C7.22,7.95 7,8.45 7,9v10c0,1.1 0.9,2 2,2h9c0.83,0 1.54,-0.5 1.84,-1.22l3.02,-7.05c0.09,-0.23 0.14,-0.47 0.14,-0.73v-2z"/>
</vector>
Binary file removed app/src/main/res/drawable/instagram_logo.png
Binary file not shown.
Binary file removed app/src/main/res/drawable/location.png
Binary file not shown.
Binary file removed app/src/main/res/drawable/menu.png
Binary file not shown.
Binary file removed app/src/main/res/drawable/option.png
Binary file not shown.
Binary file removed app/src/main/res/drawable/plus.png
Binary file not shown.
Binary file removed app/src/main/res/drawable/redheart.png
Binary file not shown.
Binary file removed app/src/main/res/drawable/save.png
Binary file not shown.
Binary file removed app/src/main/res/drawable/search.png
Binary file not shown.
Binary file removed app/src/main/res/drawable/send.png
Binary file not shown.
Binary file removed app/src/main/res/drawable/up.png
Binary file not shown.
Binary file removed app/src/main/res/drawable/up_fill.png
Binary file not shown.
Binary file removed app/src/main/res/drawable/user.png
Binary file not shown.
Binary file added app/src/main/res/font/sf_ui_font.otf
Binary file not shown.
24 changes: 12 additions & 12 deletions app/src/main/res/layout/activity_create_post.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,16 @@
android:layout_height="match_parent"
tools:context=".CreatePost">

<ImageView
<com.theophrast.ui.widget.SquareImageView
android:id="@+id/ivGriImg"
android:layout_width="419dp"
android:layout_height="300dp"
android:layout_marginBottom="35dp"
android:maxHeight="400dp"
android:minWidth="400dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="centerCrop"
android:src="@color/background"
app:hwRatio=".9"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:srcCompat="@tools:sample/backgrounds/scenic"
android:contentDescription="@string/grievance_image" />

<com.google.android.material.floatingactionbutton.FloatingActionButton
Expand All @@ -30,7 +29,7 @@
android:contentDescription="FAB"
android:focusable="true"
android:foregroundGravity="center"
app:backgroundTint="#FFFFFFFF"
app:backgroundTint="@color/lightgray"
app:layout_constraintBottom_toBottomOf="@+id/ivGriImg"
app:layout_constraintEnd_toEndOf="@+id/ivGriImg"
app:srcCompat="@android:drawable/ic_menu_camera" />
Expand Down Expand Up @@ -69,13 +68,14 @@

<TextView
android:id="@+id/tvLocation"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="19.71280, 71.89764"
android:layout_margin="30dp"
android:scaleX="1"
android:text="@string/demoLatlong"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="parent"
android:layout_margin="30dp"
app:layout_constraintTop_toBottomOf="@id/tvTitle"/>
app:layout_constraintTop_toBottomOf="@id/tvTitle" />

<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
Expand Down
31 changes: 31 additions & 0 deletions app/src/main/res/layout/activity_display_grievance.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,37 @@
android:layout_height="match_parent"
tools:context=".DisplayGrievance">


<com.facebook.shimmer.ShimmerFrameLayout
android:id="@+id/shimmer_layout"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="gone">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">

<include layout="@layout/shimmer_grievance" />

<include layout="@layout/shimmer_grievance" />

<include layout="@layout/shimmer_grievance" />

<include layout="@layout/shimmer_grievance" />

<include layout="@layout/shimmer_grievance" />


</LinearLayout>

</com.facebook.shimmer.ShimmerFrameLayout>

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recy_grievance_list"
android:layout_width="match_parent"
Expand Down
Loading