diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 1c5ab05..9a25428 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,12 @@ - + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 5d2c85f..3fa7095 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,23 +5,20 @@ - + - - - - - + + - - + + - + diff --git a/app/build.gradle b/app/build.gradle index 408f6a4..98afdf8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -39,7 +39,7 @@ 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' @@ -47,16 +47,16 @@ dependencies { 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' @@ -106,4 +106,11 @@ dependencies { implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.6' implementation 'com.android.support:multidex:1.0.3' -} \ No newline at end of file + + 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' +} diff --git a/app/src/main/java/com/iiitlucknow/android/festify/ClickFragment.kt b/app/src/main/java/com/iiitlucknow/android/festify/ClickFragment.kt deleted file mode 100644 index 3b2461d..0000000 --- a/app/src/main/java/com/iiitlucknow/android/festify/ClickFragment.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.iiitlucknow.android.festify - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment -import androidx.navigation.fragment.navArgs -import com.iiitlucknow.android.festify.Adapters.clickAdapter -import com.iiitlucknow.android.festify.data_classes.recyclerItemClick -import com.iiitlucknow.android.festify.databinding.FragmentClickBinding - -class ClickFragment : Fragment() { - private var _binding: FragmentClickBinding? = null - private val binding get() = _binding!! - val args: ClickFragmentArgs by navArgs() - lateinit var adapter: clickAdapter - private var m_android: MutableList = mutableListOf( - recyclerItemClick(R.drawable.android_img, R.string.android, R.string.date), - recyclerItemClick(R.drawable.android_img, R.string.android, R.string.date), - recyclerItemClick(R.drawable.android_img, R.string.android, R.string.date), - recyclerItemClick(R.drawable.android_img, R.string.android, R.string.date), - recyclerItemClick(R.drawable.android_img, R.string.android, R.string.date) - ) - private var m_web: MutableList = mutableListOf( - recyclerItemClick(R.drawable.web_development_img, R.string.web, R.string.date), - recyclerItemClick(R.drawable.web_development_img, R.string.web, R.string.date), - recyclerItemClick(R.drawable.web_development_img, R.string.web, R.string.date), - recyclerItemClick(R.drawable.web_development_img, R.string.web, R.string.date), - recyclerItemClick(R.drawable.web_development_img, R.string.web, R.string.date) - ) - private var m_cyber: MutableList = mutableListOf( - recyclerItemClick(R.drawable.cybersecurity_img, R.string.cyber_sec, R.string.date), - recyclerItemClick(R.drawable.cybersecurity_img, R.string.cyber_sec, R.string.date), - recyclerItemClick(R.drawable.cybersecurity_img, R.string.cyber_sec, R.string.date), - recyclerItemClick(R.drawable.cybersecurity_img, R.string.cyber_sec, R.string.date), - recyclerItemClick(R.drawable.cybersecurity_img, R.string.cyber_sec, R.string.date) - ) - private var m_ai: MutableList = mutableListOf( - recyclerItemClick(R.drawable.ai_img, R.string.ai, R.string.date), - recyclerItemClick(R.drawable.ai_img, R.string.ai, R.string.date), - recyclerItemClick(R.drawable.ai_img, R.string.ai, R.string.date), - recyclerItemClick(R.drawable.ai_img, R.string.ai, R.string.date), - recyclerItemClick(R.drawable.ai_img, R.string.ai, R.string.date) - ) - private var m_design: MutableList = mutableListOf( - recyclerItemClick(R.drawable.designing_img, R.string.design, R.string.date), - recyclerItemClick(R.drawable.designing_img, R.string.design, R.string.date), - recyclerItemClick(R.drawable.designing_img, R.string.design, R.string.date), - recyclerItemClick(R.drawable.designing_img, R.string.design, R.string.date), - recyclerItemClick(R.drawable.designing_img, R.string.design, R.string.date) - ) - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - _binding = FragmentClickBinding.inflate( - inflater, container, false - ) - if (args.event == resources.getString(R.string.android)) { - adapter = clickAdapter(m_android) - } else if (args.event == resources.getString(R.string.web)) { - adapter = clickAdapter(m_web) - } else if (args.event == resources.getString(R.string.design)) { - adapter = clickAdapter(m_design) - } else if (args.event == resources.getString(R.string.ai)) { - adapter = clickAdapter(m_ai) - } else if (args.event == resources.getString(R.string.cyber_sec)) { - adapter = clickAdapter(m_cyber) - } - binding.clickRecycler.adapter = adapter - binding.clickRecycler.setHasFixedSize(true) - return binding.root - } -} diff --git a/app/src/main/java/com/iiitlucknow/android/festify/Repositories/Repo.kt b/app/src/main/java/com/iiitlucknow/android/festify/Repositories/Repo.kt deleted file mode 100644 index ead8db5..0000000 --- a/app/src/main/java/com/iiitlucknow/android/festify/Repositories/Repo.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.iiitlucknow.android.festify.Repositories - -import androidx.lifecycle.LiveData -import com.iiitlucknow.android.festify.data.dao -import com.iiitlucknow.android.festify.data.my_events - -class Repo(private val dao: dao) { - suspend fun insertitem(myEvents: my_events) { - dao.addevent(myEvents) - } - - suspend fun deleteword(myEvents: my_events) { - dao.deleteevent(myEvents) - } - val getwords: LiveData> = dao.getevents() -} diff --git a/app/src/main/java/com/iiitlucknow/android/festify/ViewModels/Login_view_model.kt b/app/src/main/java/com/iiitlucknow/android/festify/ViewModels/Login_view_model.kt deleted file mode 100644 index 6634d2a..0000000 --- a/app/src/main/java/com/iiitlucknow/android/festify/ViewModels/Login_view_model.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.iiitlucknow.android.festify.ViewModels - -import android.app.Application -import android.widget.Toast -import androidx.lifecycle.AndroidViewModel -import androidx.lifecycle.MutableLiveData -import com.iiitlucknow.android.festify.API.retrofitInstance -import com.iiitlucknow.android.festify.data_classes.default_response -import com.iiitlucknow.android.festify.data_classes.login_data -import retrofit2.Call -import retrofit2.Callback -import retrofit2.Response - -class Login_view_model(application: Application) : AndroidViewModel(application) { - - var log_Response: MutableLiveData> = MutableLiveData() - fun checkLogin(loginData: login_data) { - retrofitInstance.api.loginuser( - loginData.usernameOrEmail, - loginData.password - ).enqueue(object : Callback { - override fun onResponse( - call: Call, - response: Response - ) { - log_Response.value = response - } - - override fun onFailure(call: Call, t: Throwable) { - Toast.makeText(getApplication(), t.message, Toast.LENGTH_LONG).show() - } - }) - } -} diff --git a/app/src/main/java/com/iiitlucknow/android/festify/ViewModels/Signup_view_model.kt b/app/src/main/java/com/iiitlucknow/android/festify/ViewModels/Signup_view_model.kt deleted file mode 100644 index d058ba4..0000000 --- a/app/src/main/java/com/iiitlucknow/android/festify/ViewModels/Signup_view_model.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.iiitlucknow.android.festify.ViewModels - -import android.app.Application -import android.widget.Toast -import androidx.lifecycle.AndroidViewModel -import androidx.lifecycle.MutableLiveData -import com.iiitlucknow.android.festify.API.retrofitInstance -import com.iiitlucknow.android.festify.data_classes.default_response -import com.iiitlucknow.android.festify.data_classes.my_post -import retrofit2.Call -import retrofit2.Callback -import retrofit2.Response - -class Signup_view_model(application: Application) : AndroidViewModel(application) { - var sign_Response: MutableLiveData> = MutableLiveData() - fun pushPost(post: my_post) { - retrofitInstance.api.createuser( - post.userName, - post.userPassword, - post.userEmail, - post.userPhoto - ).enqueue(object : Callback { - override fun onResponse( - call: Call, - response: Response - ) { - sign_Response.value = response - } - - override fun onFailure(call: Call, t: Throwable) { - Toast.makeText(getApplication(), t.message, Toast.LENGTH_LONG).show() - } - }) - } -} diff --git a/app/src/main/java/com/iiitlucknow/android/festify/application/FestifyApplication.kt b/app/src/main/java/com/iiitlucknow/android/festify/application/FestifyApplication.kt index 4a3a6ff..47b63bc 100644 --- a/app/src/main/java/com/iiitlucknow/android/festify/application/FestifyApplication.kt +++ b/app/src/main/java/com/iiitlucknow/android/festify/application/FestifyApplication.kt @@ -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() diff --git a/app/src/main/java/com/iiitlucknow/android/festify/LoginFragment.kt b/app/src/main/java/com/iiitlucknow/android/festify/authentication/login/LoginFragment.kt similarity index 92% rename from app/src/main/java/com/iiitlucknow/android/festify/LoginFragment.kt rename to app/src/main/java/com/iiitlucknow/android/festify/authentication/login/LoginFragment.kt index 8487ad6..a3f39bb 100644 --- a/app/src/main/java/com/iiitlucknow/android/festify/LoginFragment.kt +++ b/app/src/main/java/com/iiitlucknow/android/festify/authentication/login/LoginFragment.kt @@ -1,4 +1,4 @@ -package com.iiitlucknow.android.festify +package com.iiitlucknow.android.festify.authentication.login import android.content.Intent import android.os.Bundle @@ -11,8 +11,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.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 @@ -20,7 +21,7 @@ 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( @@ -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, { @@ -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() ) diff --git a/app/src/main/java/com/iiitlucknow/android/festify/authentication/login/LoginViewModel.kt b/app/src/main/java/com/iiitlucknow/android/festify/authentication/login/LoginViewModel.kt new file mode 100644 index 0000000..1d87adc --- /dev/null +++ b/app/src/main/java/com/iiitlucknow/android/festify/authentication/login/LoginViewModel.kt @@ -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> = MutableLiveData() + fun checkLogin(loginData: LoginData) { + RetrofitModule.api.loginUser( + loginData.usernameOrEmail, + loginData.password + ).enqueue(object : Callback { + override fun onResponse( + call: Call, + response: Response + ) { + log_Response.value = response + } + + override fun onFailure(call: Call, t: Throwable) { + Toast.makeText(getApplication(), t.message, Toast.LENGTH_LONG).show() + } + }) + } +} diff --git a/app/src/main/java/com/iiitlucknow/android/festify/SignUpFragment.kt b/app/src/main/java/com/iiitlucknow/android/festify/authentication/signup/SignUpFragment.kt similarity index 95% rename from app/src/main/java/com/iiitlucknow/android/festify/SignUpFragment.kt rename to app/src/main/java/com/iiitlucknow/android/festify/authentication/signup/SignUpFragment.kt index 35d0706..8ce54f2 100644 --- a/app/src/main/java/com/iiitlucknow/android/festify/SignUpFragment.kt +++ b/app/src/main/java/com/iiitlucknow/android/festify/authentication/signup/SignUpFragment.kt @@ -1,4 +1,4 @@ -package com.iiitlucknow.android.festify +package com.iiitlucknow.android.festify.authentication.signup import android.app.Activity import android.content.Intent @@ -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 @@ -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 @@ -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, { @@ -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( diff --git a/app/src/main/java/com/iiitlucknow/android/festify/authentication/signup/SignUpViewModel.kt b/app/src/main/java/com/iiitlucknow/android/festify/authentication/signup/SignUpViewModel.kt new file mode 100644 index 0000000..5635152 --- /dev/null +++ b/app/src/main/java/com/iiitlucknow/android/festify/authentication/signup/SignUpViewModel.kt @@ -0,0 +1,35 @@ +package com.iiitlucknow.android.festify.authentication.signup + +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.SignUpRequestBody +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class SignUpViewModel(application: Application) : AndroidViewModel(application) { + var sign_Response: MutableLiveData> = MutableLiveData() + fun pushPost(post: SignUpRequestBody) { + RetrofitModule.api.createUser( + post.userName, + post.userPassword, + post.userEmail, + post.userPhoto + ).enqueue(object : Callback { + override fun onResponse( + call: Call, + response: Response + ) { + sign_Response.value = response + } + + override fun onFailure(call: Call, t: Throwable) { + Toast.makeText(getApplication(), t.message, Toast.LENGTH_LONG).show() + } + }) + } +} diff --git a/app/src/main/java/com/iiitlucknow/android/festify/data/dao.kt b/app/src/main/java/com/iiitlucknow/android/festify/data/dao.kt deleted file mode 100644 index b85af42..0000000 --- a/app/src/main/java/com/iiitlucknow/android/festify/data/dao.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.iiitlucknow.android.festify.data - -import androidx.lifecycle.LiveData -import androidx.room.Dao -import androidx.room.Delete -import androidx.room.Insert -import androidx.room.Query - -@Dao -interface dao { - @Insert - suspend fun addevent(myEvents: my_events) - - @Delete - suspend fun deleteevent(myEvents: my_events) - - @Query("SELECT * FROM words_table ORDER BY id ASC") - fun getevents(): LiveData> -} diff --git a/app/src/main/java/com/iiitlucknow/android/festify/data/database.kt b/app/src/main/java/com/iiitlucknow/android/festify/data/database.kt deleted file mode 100644 index 457fcce..0000000 --- a/app/src/main/java/com/iiitlucknow/android/festify/data/database.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.iiitlucknow.android.festify.data - -import android.content.Context -import androidx.room.Database -import androidx.room.Room -import androidx.room.RoomDatabase - -@Database(entities = [my_events::class], version = 1, exportSchema = false) -abstract class database : RoomDatabase() { - abstract fun myDao(): dao - companion object { - @Volatile - private var INSTANCE: database? = null - fun getDatabase(context: Context): database { - return INSTANCE ?: synchronized(this) { - val instance = Room.databaseBuilder( - context.applicationContext, - database::class.java, - "item_database" - ) - .fallbackToDestructiveMigration() - .build() - INSTANCE = instance - instance - } - } - } -} diff --git a/app/src/main/java/com/iiitlucknow/android/festify/data/my_events.kt b/app/src/main/java/com/iiitlucknow/android/festify/data/my_events.kt deleted file mode 100644 index c381398..0000000 --- a/app/src/main/java/com/iiitlucknow/android/festify/data/my_events.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.iiitlucknow.android.festify.data - -import androidx.room.Entity -import androidx.room.PrimaryKey - -@Entity(tableName = "words_table") -data class my_events( - @PrimaryKey(autoGenerate = true) - val id: Int, - val my_img: Int, - val my_title: Int, - val date: Int -) diff --git a/app/src/main/java/com/iiitlucknow/android/festify/data_classes/default_response.kt b/app/src/main/java/com/iiitlucknow/android/festify/data_classes/default_response.kt deleted file mode 100644 index 14cb8c7..0000000 --- a/app/src/main/java/com/iiitlucknow/android/festify/data_classes/default_response.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.iiitlucknow.android.festify.data_classes - -data class default_response( - val status: Int, - val message: String, -) diff --git a/app/src/main/java/com/iiitlucknow/android/festify/data_classes/login_data.kt b/app/src/main/java/com/iiitlucknow/android/festify/data_classes/login_data.kt deleted file mode 100644 index 29995a5..0000000 --- a/app/src/main/java/com/iiitlucknow/android/festify/data_classes/login_data.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.iiitlucknow.android.festify.data_classes - -data class login_data( - val usernameOrEmail: String, - val password: String -) diff --git a/app/src/main/java/com/iiitlucknow/android/festify/data_classes/recyclerItem.kt b/app/src/main/java/com/iiitlucknow/android/festify/data_classes/recyclerItem.kt deleted file mode 100644 index f3d5972..0000000 --- a/app/src/main/java/com/iiitlucknow/android/festify/data_classes/recyclerItem.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.iiitlucknow.android.festify.data_classes - -data class recyclerItem( - val icon: Int, - val title: Int -) diff --git a/app/src/main/java/com/iiitlucknow/android/festify/data_classes/recyclerItemClick.kt b/app/src/main/java/com/iiitlucknow/android/festify/data_classes/recyclerItemClick.kt deleted file mode 100644 index 0228c44..0000000 --- a/app/src/main/java/com/iiitlucknow/android/festify/data_classes/recyclerItemClick.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.iiitlucknow.android.festify.data_classes - -data class recyclerItemClick( - val my_img: Int, - val my_title: Int, - val date: Int -) diff --git a/app/src/main/java/com/iiitlucknow/android/festify/EventsFragment.kt b/app/src/main/java/com/iiitlucknow/android/festify/event/EventFragment.kt similarity index 62% rename from app/src/main/java/com/iiitlucknow/android/festify/EventsFragment.kt rename to app/src/main/java/com/iiitlucknow/android/festify/event/EventFragment.kt index 3cbfbe0..ee03e28 100644 --- a/app/src/main/java/com/iiitlucknow/android/festify/EventsFragment.kt +++ b/app/src/main/java/com/iiitlucknow/android/festify/event/EventFragment.kt @@ -1,21 +1,20 @@ -package com.iiitlucknow.android.festify +package com.iiitlucknow.android.festify.event import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.iiitlucknow.android.festify.Adapters.recyclerAdapter -import com.iiitlucknow.android.festify.Adapters.sliderAdapter -import com.iiitlucknow.android.festify.data_classes.recyclerItem +import com.iiitlucknow.android.festify.R import com.iiitlucknow.android.festify.databinding.FragmentEventsBinding +import com.iiitlucknow.android.model.EventRecyclerItem import com.smarteist.autoimageslider.IndicatorView.animation.type.IndicatorAnimationType import com.smarteist.autoimageslider.SliderAnimations -class EventsFragment : Fragment() { +class EventFragment : Fragment() { private var _binding: FragmentEventsBinding? = null private val binding get() = _binding!! - private lateinit var sliderAdapter: sliderAdapter + private lateinit var sliderAdapter: EventImageSliderAdapter private var images: MutableList = mutableListOf( R.drawable.android_img, R.drawable.web_development_img, @@ -23,12 +22,15 @@ class EventsFragment : Fragment() { R.drawable.ai_img, R.drawable.designing_img ) - private var fields: MutableList = mutableListOf( - recyclerItem(R.drawable.android, R.string.android), - recyclerItem(R.drawable.web_development, R.string.web), - recyclerItem(R.drawable.cyber_security, R.string.cyber_sec), - recyclerItem(R.drawable.ai, R.string.ai), - recyclerItem(R.drawable.design, R.string.design) + private var fields: MutableList = mutableListOf( + EventRecyclerItem(R.drawable.android, R.string.android), + EventRecyclerItem(R.drawable.web_development, R.string.web), + EventRecyclerItem( + R.drawable.cyber_security, + R.string.cyber_sec + ), + EventRecyclerItem(R.drawable.ai, R.string.ai), + EventRecyclerItem(R.drawable.design, R.string.design) ) override fun onCreateView( @@ -39,13 +41,13 @@ class EventsFragment : Fragment() { _binding = FragmentEventsBinding.inflate( inflater, container, false ) - sliderAdapter = sliderAdapter(images) + sliderAdapter = EventImageSliderAdapter(images) binding.apply { slide.setSliderAdapter(sliderAdapter) slide.setIndicatorAnimation(IndicatorAnimationType.WORM) slide.setSliderTransformAnimation(SliderAnimations.DEPTHTRANSFORMATION) slide.startAutoCycle() - recycler.adapter = recyclerAdapter(fields) + recycler.adapter = EventRecyclerViewAdapter(fields) recycler.setHasFixedSize(true) } return (binding.root) diff --git a/app/src/main/java/com/iiitlucknow/android/festify/Adapters/sliderAdapter.kt b/app/src/main/java/com/iiitlucknow/android/festify/event/EventImageSliderAdapter.kt similarity index 81% rename from app/src/main/java/com/iiitlucknow/android/festify/Adapters/sliderAdapter.kt rename to app/src/main/java/com/iiitlucknow/android/festify/event/EventImageSliderAdapter.kt index 4ff4e07..392bcaf 100644 --- a/app/src/main/java/com/iiitlucknow/android/festify/Adapters/sliderAdapter.kt +++ b/app/src/main/java/com/iiitlucknow/android/festify/event/EventImageSliderAdapter.kt @@ -1,4 +1,4 @@ -package com.iiitlucknow.android.festify.Adapters +package com.iiitlucknow.android.festify.event import android.view.LayoutInflater import android.view.View @@ -7,8 +7,8 @@ import android.widget.ImageView import com.iiitlucknow.android.festify.R import com.smarteist.autoimageslider.SliderViewAdapter -class sliderAdapter(private var images: MutableList) : - SliderViewAdapter() { +class EventImageSliderAdapter(private var images: MutableList) : + SliderViewAdapter() { class Holder(itemView: View) : ViewHolder(itemView) { var slider_img: ImageView = itemView.findViewById(R.id.slider_img) } diff --git a/app/src/main/java/com/iiitlucknow/android/festify/Adapters/recyclerAdapter.kt b/app/src/main/java/com/iiitlucknow/android/festify/event/EventRecyclerViewAdapter.kt similarity index 77% rename from app/src/main/java/com/iiitlucknow/android/festify/Adapters/recyclerAdapter.kt rename to app/src/main/java/com/iiitlucknow/android/festify/event/EventRecyclerViewAdapter.kt index dc19e23..7ae9018 100644 --- a/app/src/main/java/com/iiitlucknow/android/festify/Adapters/recyclerAdapter.kt +++ b/app/src/main/java/com/iiitlucknow/android/festify/event/EventRecyclerViewAdapter.kt @@ -1,4 +1,4 @@ -package com.iiitlucknow.android.festify.Adapters +package com.iiitlucknow.android.festify.event import android.view.LayoutInflater import android.view.View @@ -7,12 +7,11 @@ import android.widget.ImageView import android.widget.TextView import androidx.navigation.Navigation import androidx.recyclerview.widget.RecyclerView -import com.iiitlucknow.android.festify.EventsFragmentDirections import com.iiitlucknow.android.festify.R -import com.iiitlucknow.android.festify.data_classes.recyclerItem +import com.iiitlucknow.android.model.EventRecyclerItem -class recyclerAdapter(private var list: MutableList) : - RecyclerView.Adapter() { +class EventRecyclerViewAdapter(private var list: MutableList) : + RecyclerView.Adapter() { class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { val recycler_text: TextView = view.findViewById(R.id.recycler_text) val recycler_icon: ImageView = view.findViewById(R.id.recycler_icon) @@ -30,7 +29,7 @@ class recyclerAdapter(private var list: MutableList) : holder.recycler_text.text = holder.context.resources.getString(list[position].title) holder.itemView.setOnClickListener { val action = - EventsFragmentDirections.actionEventsFragmentToClickFragment( + EventFragmentDirections.actionEventsFragmentToClickFragment( holder.recycler_text.text.toString() ) Navigation.findNavController(holder.itemView).navigate(action) diff --git a/app/src/main/java/com/iiitlucknow/android/festify/MyDialogFragment.kt b/app/src/main/java/com/iiitlucknow/android/festify/event/EventRegisterDialogFragment.kt similarity index 78% rename from app/src/main/java/com/iiitlucknow/android/festify/MyDialogFragment.kt rename to app/src/main/java/com/iiitlucknow/android/festify/event/EventRegisterDialogFragment.kt index 088e7db..025a68c 100644 --- a/app/src/main/java/com/iiitlucknow/android/festify/MyDialogFragment.kt +++ b/app/src/main/java/com/iiitlucknow/android/festify/event/EventRegisterDialogFragment.kt @@ -1,4 +1,4 @@ -package com.iiitlucknow.android.festify +package com.iiitlucknow.android.festify.event import android.graphics.Color import android.graphics.drawable.ColorDrawable @@ -8,17 +8,20 @@ import android.view.View import android.view.ViewGroup import android.widget.Toast import androidx.fragment.app.DialogFragment -import androidx.lifecycle.ViewModelProvider -import com.iiitlucknow.android.festify.data.my_events import com.iiitlucknow.android.festify.databinding.FragmentMydialogBinding import com.iiitlucknow.android.festify.home.HomeViewModel +import dagger.hilt.android.AndroidEntryPoint +import javax.inject.Inject -class MyDialogFragment(myEvents: my_events, flag: Int) : DialogFragment() { +@AndroidEntryPoint +class EventRegisterDialogFragment(eventsEntity: EventsEntity, flag: Int) : DialogFragment() { val myflag = flag - val new_event: my_events = myEvents + val new_event: EventsEntity = eventsEntity private var _binding: FragmentMydialogBinding? = null private val binding get() = _binding!! - lateinit var vm: HomeViewModel + + @Inject + lateinit var homeViewModel: HomeViewModel override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, @@ -27,7 +30,6 @@ class MyDialogFragment(myEvents: my_events, flag: Int) : DialogFragment() { _binding = FragmentMydialogBinding.inflate( inflater, container, false ) - vm = ViewModelProvider(this).get(HomeViewModel::class.java) if (myflag == 1) { binding.headText.text = "CONFIRM YOUR UNREGISTRATION" } @@ -37,14 +39,14 @@ class MyDialogFragment(myEvents: my_events, flag: Int) : DialogFragment() { } binding.confirm.setOnClickListener { if (myflag == 0) { - vm.addevent(new_event) + homeViewModel.addevent(new_event) Toast.makeText( activity, "You have successfully registered for the event", Toast.LENGTH_SHORT ).show() } else { - vm.deleteevent(new_event) + homeViewModel.deleteevent(new_event) Toast.makeText( activity, "You have successfully unregistered for the event", diff --git a/app/src/main/java/com/iiitlucknow/android/festify/Adapters/clickAdapter.kt b/app/src/main/java/com/iiitlucknow/android/festify/event/EventSubcategoryAdapter.kt similarity index 81% rename from app/src/main/java/com/iiitlucknow/android/festify/Adapters/clickAdapter.kt rename to app/src/main/java/com/iiitlucknow/android/festify/event/EventSubcategoryAdapter.kt index 7bc13d9..2ab6afd 100644 --- a/app/src/main/java/com/iiitlucknow/android/festify/Adapters/clickAdapter.kt +++ b/app/src/main/java/com/iiitlucknow/android/festify/event/EventSubcategoryAdapter.kt @@ -1,4 +1,4 @@ -package com.iiitlucknow.android.festify.Adapters +package com.iiitlucknow.android.festify.event import android.view.LayoutInflater import android.view.View @@ -9,13 +9,11 @@ import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.AppCompatButton import androidx.fragment.app.FragmentManager import androidx.recyclerview.widget.RecyclerView -import com.iiitlucknow.android.festify.MyDialogFragment import com.iiitlucknow.android.festify.R -import com.iiitlucknow.android.festify.data.my_events -import com.iiitlucknow.android.festify.data_classes.recyclerItemClick +import com.iiitlucknow.android.model.EventRecyclerItemClick -class clickAdapter(private var list: MutableList) : - RecyclerView.Adapter() { +class EventSubcategoryAdapter(private var list: MutableList) : + RecyclerView.Adapter() { class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { val recycler_clicker_text: TextView = view.findViewById(R.id.recycler_clicker_text) val recycler_clicker_img: ImageView = view.findViewById(R.id.my_img) @@ -38,7 +36,10 @@ class clickAdapter(private var list: MutableList) : holder.recycler_clicker_img.setImageResource(item.my_img) holder.date.text = holder.context.resources.getString(item.date) holder.recycler_clicker_button.setOnClickListener { - val mydialog = MyDialogFragment(my_events(0, item.my_img, item.my_title, item.date), 0) + val mydialog = EventRegisterDialogFragment( + EventsEntity(0, item.my_img, item.my_title, item.date), + 0 + ) mydialog.show(fm, "view") // Toast.makeText( // holder.context, diff --git a/app/src/main/java/com/iiitlucknow/android/festify/event/EventSubcategoryFragment.kt b/app/src/main/java/com/iiitlucknow/android/festify/event/EventSubcategoryFragment.kt new file mode 100644 index 0000000..7a38a89 --- /dev/null +++ b/app/src/main/java/com/iiitlucknow/android/festify/event/EventSubcategoryFragment.kt @@ -0,0 +1,177 @@ +package com.iiitlucknow.android.festify.event + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import androidx.navigation.fragment.navArgs +import com.iiitlucknow.android.festify.R +import com.iiitlucknow.android.festify.databinding.FragmentClickBinding +import com.iiitlucknow.android.model.EventRecyclerItemClick + +class EventSubcategoryFragment : Fragment() { + private var _binding: FragmentClickBinding? = null + private val binding get() = _binding!! + val args: EventSubcategoryFragmentArgs by navArgs() + lateinit var adapter: EventSubcategoryAdapter + private var m_android: MutableList = mutableListOf( + EventRecyclerItemClick( + R.drawable.android_img, + R.string.android, + R.string.date + ), + EventRecyclerItemClick( + R.drawable.android_img, + R.string.android, + R.string.date + ), + EventRecyclerItemClick( + R.drawable.android_img, + R.string.android, + R.string.date + ), + EventRecyclerItemClick( + R.drawable.android_img, + R.string.android, + R.string.date + ), + EventRecyclerItemClick( + R.drawable.android_img, + R.string.android, + R.string.date + ) + ) + private var m_web: MutableList = mutableListOf( + EventRecyclerItemClick( + R.drawable.web_development_img, + R.string.web, + R.string.date + ), + EventRecyclerItemClick( + R.drawable.web_development_img, + R.string.web, + R.string.date + ), + EventRecyclerItemClick( + R.drawable.web_development_img, + R.string.web, + R.string.date + ), + EventRecyclerItemClick( + R.drawable.web_development_img, + R.string.web, + R.string.date + ), + EventRecyclerItemClick( + R.drawable.web_development_img, + R.string.web, + R.string.date + ) + ) + private var m_cyber: MutableList = mutableListOf( + EventRecyclerItemClick( + R.drawable.cybersecurity_img, + R.string.cyber_sec, + R.string.date + ), + EventRecyclerItemClick( + R.drawable.cybersecurity_img, + R.string.cyber_sec, + R.string.date + ), + EventRecyclerItemClick( + R.drawable.cybersecurity_img, + R.string.cyber_sec, + R.string.date + ), + EventRecyclerItemClick( + R.drawable.cybersecurity_img, + R.string.cyber_sec, + R.string.date + ), + EventRecyclerItemClick( + R.drawable.cybersecurity_img, + R.string.cyber_sec, + R.string.date + ) + ) + private var m_ai: MutableList = mutableListOf( + EventRecyclerItemClick( + R.drawable.ai_img, + R.string.ai, + R.string.date + ), + EventRecyclerItemClick( + R.drawable.ai_img, + R.string.ai, + R.string.date + ), + EventRecyclerItemClick( + R.drawable.ai_img, + R.string.ai, + R.string.date + ), + EventRecyclerItemClick( + R.drawable.ai_img, + R.string.ai, + R.string.date + ), + EventRecyclerItemClick( + R.drawable.ai_img, + R.string.ai, + R.string.date + ) + ) + private var m_design: MutableList = mutableListOf( + EventRecyclerItemClick( + R.drawable.designing_img, + R.string.design, + R.string.date + ), + EventRecyclerItemClick( + R.drawable.designing_img, + R.string.design, + R.string.date + ), + EventRecyclerItemClick( + R.drawable.designing_img, + R.string.design, + R.string.date + ), + EventRecyclerItemClick( + R.drawable.designing_img, + R.string.design, + R.string.date + ), + EventRecyclerItemClick( + R.drawable.designing_img, + R.string.design, + R.string.date + ) + ) + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + _binding = FragmentClickBinding.inflate( + inflater, container, false + ) + if (args.event == resources.getString(R.string.android)) { + adapter = EventSubcategoryAdapter(m_android) + } else if (args.event == resources.getString(R.string.web)) { + adapter = EventSubcategoryAdapter(m_web) + } else if (args.event == resources.getString(R.string.design)) { + adapter = EventSubcategoryAdapter(m_design) + } else if (args.event == resources.getString(R.string.ai)) { + adapter = EventSubcategoryAdapter(m_ai) + } else if (args.event == resources.getString(R.string.cyber_sec)) { + adapter = EventSubcategoryAdapter(m_cyber) + } + binding.clickRecycler.adapter = adapter + binding.clickRecycler.setHasFixedSize(true) + return binding.root + } +} diff --git a/app/src/main/java/com/iiitlucknow/android/festify/Adapters/homeAdapter.kt b/app/src/main/java/com/iiitlucknow/android/festify/home/HomeAdapter.kt similarity index 82% rename from app/src/main/java/com/iiitlucknow/android/festify/Adapters/homeAdapter.kt rename to app/src/main/java/com/iiitlucknow/android/festify/home/HomeAdapter.kt index 19b0007..8c2486a 100644 --- a/app/src/main/java/com/iiitlucknow/android/festify/Adapters/homeAdapter.kt +++ b/app/src/main/java/com/iiitlucknow/android/festify/home/HomeAdapter.kt @@ -1,4 +1,4 @@ -package com.iiitlucknow.android.festify.Adapters +package com.iiitlucknow.android.festify.home import android.view.LayoutInflater import android.view.View @@ -10,13 +10,12 @@ import androidx.appcompat.widget.AppCompatButton import androidx.core.content.ContextCompat import androidx.fragment.app.FragmentManager import androidx.recyclerview.widget.RecyclerView -import com.iiitlucknow.android.festify.MyDialogFragment import com.iiitlucknow.android.festify.R -import com.iiitlucknow.android.festify.data.my_events +import com.iiitlucknow.android.festify.event.EventRegisterDialogFragment -class homeAdapter( - private val list: MutableList -) : RecyclerView.Adapter() { +class HomeAdapter( + private val list: MutableList +) : RecyclerView.Adapter() { class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { val recycler_clicker_text: TextView = view.findViewById(R.id.recycler_clicker_text) val recycler_clicker_img: ImageView = view.findViewById(R.id.my_img) @@ -43,7 +42,10 @@ class homeAdapter( ContextCompat.getDrawable(holder.context, R.drawable.unregister_background) holder.recycler_clicker_button.setOnClickListener { val mydialog = - MyDialogFragment(my_events(item.id, item.my_img, item.my_title, item.date), 1) + EventRegisterDialogFragment( + EventsEntity(item.id, item.my_img, item.my_title, item.date), + 1 + ) mydialog.show(fm, "my_view") } } diff --git a/app/src/main/java/com/iiitlucknow/android/festify/home/HomeFragment.kt b/app/src/main/java/com/iiitlucknow/android/festify/home/HomeFragment.kt index e057ccf..757e979 100644 --- a/app/src/main/java/com/iiitlucknow/android/festify/home/HomeFragment.kt +++ b/app/src/main/java/com/iiitlucknow/android/festify/home/HomeFragment.kt @@ -5,14 +5,14 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import androidx.fragment.app.viewModels -import com.iiitlucknow.android.festify.Adapters.homeAdapter import com.iiitlucknow.android.festify.databinding.FragmentHomeBinding -import dagger.hilt.android.scopes.FragmentScoped +import dagger.hilt.android.AndroidEntryPoint +import javax.inject.Inject -@FragmentScoped +@AndroidEntryPoint class HomeFragment : Fragment() { - private val homeViewModel: HomeViewModel by viewModels() + @Inject + lateinit var homeViewModel: HomeViewModel lateinit var binding: FragmentHomeBinding override fun onCreateView( @@ -24,7 +24,7 @@ class HomeFragment : Fragment() { homeViewModel.allwords.observe( viewLifecycleOwner ) { - binding.homeRecycler.adapter = homeAdapter(it) + binding.homeRecycler.adapter = HomeAdapter(it) } binding.homeRecycler.setHasFixedSize(true) diff --git a/app/src/main/java/com/iiitlucknow/android/festify/home/HomeViewModel.kt b/app/src/main/java/com/iiitlucknow/android/festify/home/HomeViewModel.kt index 9637969..0fdbd3d 100644 --- a/app/src/main/java/com/iiitlucknow/android/festify/home/HomeViewModel.kt +++ b/app/src/main/java/com/iiitlucknow/android/festify/home/HomeViewModel.kt @@ -1,37 +1,37 @@ package com.iiitlucknow.android.festify.home import android.app.Application +import android.provider.CalendarContract import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData import androidx.lifecycle.viewModelScope -import com.iiitlucknow.android.festify.Repositories.Repo -import com.iiitlucknow.android.festify.data.database -import com.iiitlucknow.android.festify.data.my_events import dagger.hilt.android.scopes.ViewModelScoped import javax.inject.Inject import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @ViewModelScoped -class HomeViewModel @Inject constructor(application: Application) : AndroidViewModel(application) { - private val myrepo: Repo - val allwords: LiveData> +class HomeViewModel @Inject constructor( + application: Application, + dao: EventsDao +) : AndroidViewModel(application) { + private val myrepo: EventsRepository + val allwords: LiveData> init { - val dao = database.getDatabase(application).myDao() - myrepo = Repo(dao) - allwords = myrepo.getwords + myrepo = EventsRepository(dao) + allwords = myrepo.getEventItems } - fun addevent(myEvents: my_events) { + fun addevent(eventsEntity: CalendarContract.EventsEntity) { viewModelScope.launch(Dispatchers.IO) { - myrepo.insertitem(myEvents) + myrepo.insertEventItem(eventsEntity) } } - fun deleteevent(myEvents: my_events) { + fun deleteevent(eventsEntity: CalendarContract.EventsEntity) { viewModelScope.launch(Dispatchers.IO) { - myrepo.deleteword(myEvents) + myrepo.deleteEventItem(eventsEntity) } } } diff --git a/app/src/main/res/layout-land/fragment_login.xml b/app/src/main/res/layout-land/fragment_login.xml index 6c85ce8..ef990fb 100644 --- a/app/src/main/res/layout-land/fragment_login.xml +++ b/app/src/main/res/layout-land/fragment_login.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".LoginFragment"> + tools:context=".authentication.login.LoginFragment"> + tools:context=".authentication.signup.SignUpFragment"> + tools:context=".event.EventSubcategoryFragment"> + tools:context=".authentication.login.LoginFragment"> + tools:context=".event.EventRegisterDialogFragment"> + tools:context=".authentication.signup.SignUpFragment"> + ): Call @FormUrlEncoded @POST("user/login") - fun loginuser( + fun loginUser( @Field("usernameOrEmail") userName: String, @Field("password") userPassword: String, - ): Call + ): Call } diff --git a/data/src/main/java/com/iiitlucknow/android/data/backends/model/DefaultResponse.kt b/data/src/main/java/com/iiitlucknow/android/data/backends/model/DefaultResponse.kt new file mode 100644 index 0000000..142087f --- /dev/null +++ b/data/src/main/java/com/iiitlucknow/android/data/backends/model/DefaultResponse.kt @@ -0,0 +1,6 @@ +package com.iiitlucknow.android.data.backends.model + +data class DefaultResponse( + val status: Int, + val message: String, +) diff --git a/data/src/main/java/com/iiitlucknow/android/data/backends/model/LoginData.kt b/data/src/main/java/com/iiitlucknow/android/data/backends/model/LoginData.kt new file mode 100644 index 0000000..8201ecd --- /dev/null +++ b/data/src/main/java/com/iiitlucknow/android/data/backends/model/LoginData.kt @@ -0,0 +1,6 @@ +package com.iiitlucknow.android.data.backends.model + +data class LoginData( + val usernameOrEmail: String, + val password: String +) diff --git a/app/src/main/java/com/iiitlucknow/android/festify/data_classes/my_post.kt b/data/src/main/java/com/iiitlucknow/android/data/backends/model/SignUpRequestBody.kt similarity index 57% rename from app/src/main/java/com/iiitlucknow/android/festify/data_classes/my_post.kt rename to data/src/main/java/com/iiitlucknow/android/data/backends/model/SignUpRequestBody.kt index 1cdb949..631b597 100644 --- a/app/src/main/java/com/iiitlucknow/android/festify/data_classes/my_post.kt +++ b/data/src/main/java/com/iiitlucknow/android/data/backends/model/SignUpRequestBody.kt @@ -1,6 +1,6 @@ -package com.iiitlucknow.android.festify.data_classes +package com.iiitlucknow.android.data.backends.model -data class my_post( +data class SignUpRequestBody( val userName: String, val userPassword: String, diff --git a/model/src/main/java/com/iiitlucknow/android/model/EventRecyclerItem.kt b/model/src/main/java/com/iiitlucknow/android/model/EventRecyclerItem.kt new file mode 100644 index 0000000..42fc194 --- /dev/null +++ b/model/src/main/java/com/iiitlucknow/android/model/EventRecyclerItem.kt @@ -0,0 +1,6 @@ +package com.iiitlucknow.android.model + +data class EventRecyclerItem( + val icon: Int, + val title: Int +) diff --git a/model/src/main/java/com/iiitlucknow/android/model/EventRecyclerItemClick.kt b/model/src/main/java/com/iiitlucknow/android/model/EventRecyclerItemClick.kt new file mode 100644 index 0000000..e660595 --- /dev/null +++ b/model/src/main/java/com/iiitlucknow/android/model/EventRecyclerItemClick.kt @@ -0,0 +1,7 @@ +package com.iiitlucknow.android.model + +data class EventRecyclerItemClick( + val my_img: Int, + val my_title: Int, + val date: Int +) diff --git a/model/src/main/java/com/iiitlucknow/android/model/MyClass.kt b/model/src/main/java/com/iiitlucknow/android/model/MyClass.kt deleted file mode 100644 index 0ba5896..0000000 --- a/model/src/main/java/com/iiitlucknow/android/model/MyClass.kt +++ /dev/null @@ -1,4 +0,0 @@ -package com.iiitlucknow.android.model - -class MyClass { -} \ No newline at end of file