From 0f47089d1914d29df2b1bcd8372cae3ce64f06da Mon Sep 17 00:00:00 2001 From: mandharet Date: Thu, 3 Mar 2022 02:42:42 +0530 Subject: [PATCH] Correction in Forms and layout, scrollview, Detail page inprogress --- .idea/misc.xml | 17 +- app/build.gradle | 1 + app/src/main/AndroidManifest.xml | 13 +- .../com/harshad/projectclean/CreatePost.kt | 14 +- .../com/harshad/projectclean/LoginActivity.kt | 12 +- .../com/harshad/projectclean/MainActivity.kt | 16 +- .../com/harshad/projectclean/ProfileSetup.kt | 3 +- .../harshad/projectclean/RegisterActivity.kt | 5 +- .../GrievanceRecycleViewAdapter.kt | 2 +- .../main/res/layout/activity_create_post.xml | 173 +++++---- app/src/main/res/layout/activity_login.xml | 14 +- .../res/layout/activity_profile_setup.xml | 339 +++++++++++------- app/src/main/res/layout/activity_register.xml | 5 +- .../res/layout/single_grievance_item_view.xml | 162 +++++---- app/src/main/res/values/strings.xml | 91 +++++ app/src/main/res/values/themes.xml | 6 + 16 files changed, 565 insertions(+), 308 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index d6e772b..963f9c3 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,13 +3,16 @@ diff --git a/app/build.gradle b/app/build.gradle index 12eb30d..08990ab 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -41,6 +41,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.4.1' 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' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 321a7af..cda26f4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,9 +1,10 @@ + package="com.harshad.projectclean" > - + android:theme="@style/Theme.ProjectClean" > @@ -27,16 +28,16 @@ android:exported="false" /> + android:exported="true" > + - + android:exported="false" > diff --git a/app/src/main/java/com/harshad/projectclean/CreatePost.kt b/app/src/main/java/com/harshad/projectclean/CreatePost.kt index ef24aed..5507c9e 100644 --- a/app/src/main/java/com/harshad/projectclean/CreatePost.kt +++ b/app/src/main/java/com/harshad/projectclean/CreatePost.kt @@ -41,6 +41,16 @@ class CreatePost : AppCompatActivity() { binding = ActivityCreatePostBinding.inflate(layoutInflater) val view = binding.root setContentView(view) + + ImagePicker.with(this).cameraOnly() + .compress(512) + .saveDir(getExternalFilesDir(Environment.DIRECTORY_PICTURES)!!).start() + + binding.fabImg.setOnClickListener { + ImagePicker.with(this).cameraOnly() + .compress(512) + .saveDir(getExternalFilesDir(Environment.DIRECTORY_PICTURES)!!).start() + } sharedPref = getSharedPreferences("SP", Context.MODE_PRIVATE) actv = binding.dropMenu @@ -51,9 +61,7 @@ class CreatePost : AppCompatActivity() { Toast.makeText(applicationContext, "Item: $item", Toast.LENGTH_SHORT).show() }) - ImagePicker.with(this).cameraOnly() - .compress(512) - .saveDir(getExternalFilesDir(Environment.DIRECTORY_PICTURES)!!).start() + binding.btnSave.setOnClickListener { val griTitle = binding.edDesc.text.trim().toString() diff --git a/app/src/main/java/com/harshad/projectclean/LoginActivity.kt b/app/src/main/java/com/harshad/projectclean/LoginActivity.kt index 51daa3e..d7c4fb8 100644 --- a/app/src/main/java/com/harshad/projectclean/LoginActivity.kt +++ b/app/src/main/java/com/harshad/projectclean/LoginActivity.kt @@ -6,9 +6,6 @@ import android.content.SharedPreferences import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import android.util.Log -import android.widget.Button -import android.widget.CheckBox -import android.widget.TextView import android.widget.Toast import com.harshad.projectclean.APIRequests.ApiClient import com.harshad.projectclean.APIRequests.authentication_data_class.CurrentLoggedUserResponse @@ -18,7 +15,6 @@ import com.harshad.projectclean.databinding.ActivityLoginBinding import retrofit2.Call import retrofit2.Callback import retrofit2.Response -import kotlin.math.log class LoginActivity : AppCompatActivity() { lateinit var sharedPref: SharedPreferences @@ -48,13 +44,13 @@ class LoginActivity : AppCompatActivity() { binding.btnLogin.setOnClickListener { - if (binding.edUsername.text.trim().isNotEmpty() || binding.edPassword.text.trim() + if (binding.edEmail.text.trim().isNotEmpty() || binding.edPassword.text.trim() .isNotEmpty() ) { - val username: String = binding.edUsername.text.trim().toString() + val email: String = binding.edEmail.text.trim().toString() val password: String = binding.edPassword.text.trim().toString() validate() - login(this, username, password) + login(this, email, password) //Toast.makeText(this,"Remember",Toast.LENGTH_LONG).show() } else { @@ -127,7 +123,7 @@ class LoginActivity : AppCompatActivity() { }) } private fun validate(): Boolean { - if (binding.edUsername.text.trim().isNotEmpty() || binding.edPassword.text.trim() + if (binding.edEmail.text.trim().isNotEmpty() || binding.edPassword.text.trim() .isNotEmpty() ) { return true diff --git a/app/src/main/java/com/harshad/projectclean/MainActivity.kt b/app/src/main/java/com/harshad/projectclean/MainActivity.kt index c3fdb26..940ddef 100644 --- a/app/src/main/java/com/harshad/projectclean/MainActivity.kt +++ b/app/src/main/java/com/harshad/projectclean/MainActivity.kt @@ -10,14 +10,14 @@ import android.view.View import com.harshad.projectclean.APIRequests.ApiClient import com.harshad.projectclean.APIRequests.grievance_data_class.* import com.harshad.projectclean.databinding.ActivityMainBinding -import okhttp3.MediaType.Companion.toMediaType -import okhttp3.MultipartBody -import okhttp3.RequestBody.Companion.asRequestBody -import okhttp3.RequestBody.Companion.toRequestBody -import retrofit2.Call -import retrofit2.Callback -import retrofit2.Response -import java.io.File +//import okhttp3.MediaType.Companion.toMediaType +//import okhttp3.MultipartBody +//import okhttp3.RequestBody.Companion.asRequestBody +//import okhttp3.RequestBody.Companion.toRequestBody +//import retrofit2.Call +//import retrofit2.Callback +//import retrofit2.Response +//import java.io.File class MainActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/harshad/projectclean/ProfileSetup.kt b/app/src/main/java/com/harshad/projectclean/ProfileSetup.kt index 686abeb..0c0fbb9 100644 --- a/app/src/main/java/com/harshad/projectclean/ProfileSetup.kt +++ b/app/src/main/java/com/harshad/projectclean/ProfileSetup.kt @@ -25,7 +25,8 @@ class ProfileSetup : AppCompatActivity() { setContentView(view) sharedPref = getSharedPreferences("SP", Context.MODE_PRIVATE) binding.edUsername.setText(sharedPref.getString("username","none")) - binding.edPhoneno.setText(sharedPref.getString("phoneno","none")) + binding.edEmail.setText(sharedPref.getString("email","none")) + binding.edPassword.setText(sharedPref.getString("password","none")) binding.edFirstname.requestFocus() binding.btnSave.setOnClickListener { val intent = Intent(this, DisplayGrievance::class.java) diff --git a/app/src/main/java/com/harshad/projectclean/RegisterActivity.kt b/app/src/main/java/com/harshad/projectclean/RegisterActivity.kt index f54d6e8..25a9c04 100644 --- a/app/src/main/java/com/harshad/projectclean/RegisterActivity.kt +++ b/app/src/main/java/com/harshad/projectclean/RegisterActivity.kt @@ -32,12 +32,13 @@ class RegisterActivity : AppCompatActivity() { binding.btnSignup.setOnClickListener{ if(validate()){ - //val phoneno:String = binding.edPhoneno.text.toString() + val email:String = binding.edEmail.text.toString() val username:String = binding.edUsername.text.toString() val password:String = binding.edPassword.text.toString() val editor : SharedPreferences.Editor =sharedPref.edit() editor.putString("username", username) - //editor.putString("phoneno", phoneno) + editor.putString("email", email) + editor.putString("password", password) editor.apply() Toast.makeText(this,"Profile", Toast.LENGTH_LONG).show() diff --git a/app/src/main/java/com/harshad/projectclean/grievance_recycler_view_classes/GrievanceRecycleViewAdapter.kt b/app/src/main/java/com/harshad/projectclean/grievance_recycler_view_classes/GrievanceRecycleViewAdapter.kt index 4e5435c..4916184 100644 --- a/app/src/main/java/com/harshad/projectclean/grievance_recycler_view_classes/GrievanceRecycleViewAdapter.kt +++ b/app/src/main/java/com/harshad/projectclean/grievance_recycler_view_classes/GrievanceRecycleViewAdapter.kt @@ -41,7 +41,7 @@ class GrievanceRecycleViewAdapter(private val context: Context, private val grie class GrievanceViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView){ var gri_title = itemView.findViewById(R.id.tv_gri_title) var gri_location = itemView.findViewById(R.id.tv_gri_location) - var gri_desc = itemView.findViewById(R.id.tv_gri_desc) + var gri_desc = itemView.findViewById(R.id.tvDesc) var gri_img = itemView.findViewById(R.id.iv_gri_img) var gri_like_btn = itemView.findViewById