Skip to content
Open
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
8 changes: 7 additions & 1 deletion .idea/compiler.xml

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

15 changes: 6 additions & 9 deletions .idea/misc.xml

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

23 changes: 15 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,24 +39,24 @@ android {
}
}
def lifecycle_version = "2.2.0"
def room_version ="2.3.0"
def room_version = "2.3.0"
dependencies {

implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.2'

//added deps for hilt.
implementation "com.google.dagger:hilt-android:2.38.1"

implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
kapt "com.google.dagger:hilt-compiler:2.38.1"

testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
//added deps for hilt.
implementation "com.google.dagger:hilt-android:$hilt_version"
implementation "androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03"
kapt "com.google.dagger:hilt-compiler:$hilt_version"
kapt "com.google.dagger:hilt-android-compiler:$hilt_version"

//Slider View
implementation 'com.github.smarteist:autoimageslider:1.4.0'
Expand Down Expand Up @@ -106,4 +106,11 @@ dependencies {
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.6'

implementation 'com.android.support:multidex:1.0.3'
}

implementation project(path: ':data')
implementation project(path: ':model')

testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
}
77 changes: 0 additions & 77 deletions app/src/main/java/com/iiitlucknow/android/festify/ClickFragment.kt

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ package com.iiitlucknow.android.festify.application

import android.app.Application
import dagger.hilt.android.HiltAndroidApp
import javax.inject.Inject

@HiltAndroidApp
class FestifyApplication
@Inject constructor() : Application()
class FestifyApplication : Application()
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.iiitlucknow.android.festify
package com.iiitlucknow.android.festify.authentication.login

import android.content.Intent
import android.os.Bundle
Expand All @@ -11,16 +11,17 @@ import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider
import androidx.navigation.fragment.findNavController
import com.google.gson.Gson
import com.iiitlucknow.android.festify.ViewModels.Login_view_model
import com.iiitlucknow.android.festify.data_classes.login_data
import com.iiitlucknow.android.data.backends.model.LoginData
import com.iiitlucknow.android.festify.MainActivity
import com.iiitlucknow.android.festify.R
import com.iiitlucknow.android.festify.databinding.FragmentLoginBinding
import org.json.JSONException
import org.json.JSONObject

class LoginFragment : Fragment() {
private var _binding: FragmentLoginBinding? = null
private val binding get() = _binding!!
lateinit var vm: Login_view_model
lateinit var vm: LoginViewModel
lateinit var log_msg: String
lateinit var log_er_msg: String
override fun onCreateView(
Expand All @@ -31,7 +32,7 @@ class LoginFragment : Fragment() {
// Inflate the layout for this fragment
_binding = FragmentLoginBinding.inflate(inflater, container, false)
vm = ViewModelProvider.AndroidViewModelFactory(requireActivity().application)
.create(Login_view_model::class.java)
.create(LoginViewModel::class.java)
vm.log_Response.observe(
viewLifecycleOwner,
{
Expand Down Expand Up @@ -88,7 +89,7 @@ class LoginFragment : Fragment() {
.isNotEmpty() && binding.logPassword!!.text.toString().trim().isNotEmpty()
) {
vm.checkLogin(
login_data(
LoginData(
binding.logUser!!.text.toString().trim(),
binding.logPassword!!.text.toString().trim()
)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package com.iiitlucknow.android.festify.authentication.login

import android.app.Application
import android.widget.Toast
import androidx.lifecycle.AndroidViewModel
import androidx.lifecycle.MutableLiveData
import com.iiitlucknow.android.data.backends.RetrofitModule
import com.iiitlucknow.android.data.backends.model.DefaultResponse
import com.iiitlucknow.android.data.backends.model.LoginData
import retrofit2.Call
import retrofit2.Callback
import retrofit2.Response

class LoginViewModel(application: Application) : AndroidViewModel(application) {

var log_Response: MutableLiveData<Response<DefaultResponse>> = MutableLiveData()
fun checkLogin(loginData: LoginData) {
RetrofitModule.api.loginUser(
loginData.usernameOrEmail,
loginData.password
).enqueue(object : Callback<DefaultResponse> {
override fun onResponse(
call: Call<DefaultResponse>,
response: Response<DefaultResponse>
) {
log_Response.value = response
}

override fun onFailure(call: Call<DefaultResponse>, t: Throwable) {
Toast.makeText(getApplication(), t.message, Toast.LENGTH_LONG).show()
}
})
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.iiitlucknow.android.festify
package com.iiitlucknow.android.festify.authentication.signup

import android.app.Activity
import android.content.Intent
Expand All @@ -17,8 +17,9 @@ import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider
import androidx.navigation.fragment.findNavController
import com.google.gson.Gson
import com.iiitlucknow.android.festify.ViewModels.Signup_view_model
import com.iiitlucknow.android.festify.data_classes.my_post
import com.iiitlucknow.android.data.backends.model.SignUpRequestBody
import com.iiitlucknow.android.festify.MainActivity
import com.iiitlucknow.android.festify.R
import com.iiitlucknow.android.festify.databinding.FragmentSignUpBinding
import com.theartofdev.edmodo.cropper.CropImage
import com.theartofdev.edmodo.cropper.CropImageView
Expand All @@ -31,7 +32,7 @@ class SignUpFragment : Fragment() {
private val IMAGE_PICK_CODE = 1000
private var _binding: FragmentSignUpBinding? = null
private val binding get() = _binding!!
private lateinit var viewModel: Signup_view_model
private lateinit var viewModel: SignUpViewModel
lateinit var bitmap: Bitmap
lateinit var encodedImage: String
lateinit var s_msg: String
Expand All @@ -43,7 +44,7 @@ class SignUpFragment : Fragment() {
): View? {
_binding = FragmentSignUpBinding.inflate(inflater, container, false)
viewModel = ViewModelProvider.AndroidViewModelFactory(requireActivity().application)
.create(Signup_view_model::class.java)
.create(SignUpViewModel::class.java)
viewModel.sign_Response.observe(
viewLifecycleOwner,
{
Expand Down Expand Up @@ -135,13 +136,13 @@ class SignUpFragment : Fragment() {

if (checks()) {
uploadImage()
val my_post = my_post(
val SignUpRequestBody = SignUpRequestBody(
binding.setUsername.text.toString().trim(),
binding.setPassword.text.toString().trim(),
binding.setEmail.text.toString().trim(),
encodedImage
)
viewModel.pushPost(my_post)
viewModel.pushPost(SignUpRequestBody)
} else {

Toast.makeText(
Expand Down
Loading