commit 3d41d235d8333995942961e9e611a03bdf563953 Author: Stefan Date: Tue Jul 14 12:41:27 2020 +0200 Initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..603b140 --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..3240d5f --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +ToDo App \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..88ea3aa --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,122 @@ + + + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..ac6b0ae --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..a5f05cd --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..7bfef59 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..e61b642 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-kapt' +apply plugin: "androidx.navigation.safeargs.kotlin" + +android { + compileSdkVersion 29 + buildToolsVersion "30.0.0" + + defaultConfig { + applicationId "com.example.todoapp" + minSdkVersion 26 + targetSdkVersion 29 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + + buildFeatures{ + dataBinding = true + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8.toString() + } +} + +dependencies { + implementation fileTree(dir: "libs", include: ["*.jar"]) + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation 'androidx.core:core-ktx:1.3.0' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + testImplementation 'junit:junit:4.13' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + + // Navigation Component + implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0' + implementation 'androidx.navigation:navigation-ui-ktx:2.3.0' + + // Room components + implementation "androidx.room:room-runtime:2.2.5" + kapt "androidx.room:room-compiler:2.2.5" + implementation "androidx.room:room-ktx:2.2.5" + androidTestImplementation "androidx.room:room-testing:2.2.5" + + // Lifecycle components + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + implementation "androidx.lifecycle:lifecycle-common-java8:2.2.0" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0" + + // Kotlin components + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72" + api "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.5" + api "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.5" + + // DataBinding + kapt "com.android.databinding:compiler:3.2.0-alpha10" + kapt "androidx.databinding:databinding-common:4.0.0" + + // RecyclerView Animator + implementation 'jp.wasabeef:recyclerview-animators:3.0.0' + +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app/src/androidTest/java/com/example/todoapp/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/example/todoapp/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..76eea22 --- /dev/null +++ b/app/src/androidTest/java/com/example/todoapp/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.example.todoapp + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.example.todoapp", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..f0510ce --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/todoapp/MainActivity.kt b/app/src/main/java/com/example/todoapp/MainActivity.kt new file mode 100644 index 0000000..4bfb6be --- /dev/null +++ b/app/src/main/java/com/example/todoapp/MainActivity.kt @@ -0,0 +1,21 @@ +package com.example.todoapp + +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.navigation.findNavController +import androidx.navigation.ui.setupActionBarWithNavController + +class MainActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + + setupActionBarWithNavController(findNavController(R.id.navHostFragment)) + + } + + override fun onSupportNavigateUp(): Boolean { + val navController = findNavController(R.id.navHostFragment) + return navController.navigateUp() || super.onSupportNavigateUp() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/todoapp/data/Converter.kt b/app/src/main/java/com/example/todoapp/data/Converter.kt new file mode 100644 index 0000000..ebef029 --- /dev/null +++ b/app/src/main/java/com/example/todoapp/data/Converter.kt @@ -0,0 +1,18 @@ +package com.example.todoapp.data + +import androidx.room.TypeConverter +import com.example.todoapp.data.models.Priority + +class Converter { + + @TypeConverter + fun fromPriority(priority: Priority): String { + return priority.name + } + + @TypeConverter + fun toPriority(priority: String): Priority { + return Priority.valueOf(priority) + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/todoapp/data/ToDoDao.kt b/app/src/main/java/com/example/todoapp/data/ToDoDao.kt new file mode 100644 index 0000000..249df81 --- /dev/null +++ b/app/src/main/java/com/example/todoapp/data/ToDoDao.kt @@ -0,0 +1,34 @@ +package com.example.todoapp.data + +import androidx.lifecycle.LiveData +import androidx.room.* +import com.example.todoapp.data.models.ToDoData + +@Dao +interface ToDoDao { + + @Query("SELECT * FROM todo_table ORDER BY id ASC") + fun getAllData(): LiveData> + + @Insert(onConflict = OnConflictStrategy.IGNORE) + suspend fun insertData(toDoData: ToDoData) + + @Update + suspend fun updateData(toDoData: ToDoData) + + @Delete + suspend fun deleteItem(toDoData: ToDoData) + + @Query("DELETE FROM todo_table") + suspend fun deleteAll() + + @Query("SELECT * FROM todo_table WHERE title LIKE :searchQuery") + fun searchDatabase(searchQuery: String): LiveData> + + @Query("SELECT * FROM todo_table ORDER BY CASE WHEN priority LIKE 'H%' THEN 1 WHEN priority LIKE 'M%' THEN 2 WHEN priority LIKE 'L%' THEN 3 END") + fun sortByHighPriority(): LiveData> + + @Query("SELECT * FROM todo_table ORDER BY CASE WHEN priority LIKE 'L%' THEN 1 WHEN priority LIKE 'M%' THEN 2 WHEN priority LIKE 'H%' THEN 3 END") + fun sortByLowPriority(): LiveData> + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/todoapp/data/ToDoDatabase.kt b/app/src/main/java/com/example/todoapp/data/ToDoDatabase.kt new file mode 100644 index 0000000..0e6d5bd --- /dev/null +++ b/app/src/main/java/com/example/todoapp/data/ToDoDatabase.kt @@ -0,0 +1,37 @@ +package com.example.todoapp.data + +import android.content.Context +import androidx.room.Database +import androidx.room.Room +import androidx.room.RoomDatabase +import androidx.room.TypeConverters +import com.example.todoapp.data.models.ToDoData + +@Database(entities = [ToDoData::class], version = 1, exportSchema = false) +@TypeConverters(Converter::class) +abstract class ToDoDatabase: RoomDatabase() { + + abstract fun toDoDao(): ToDoDao + + companion object { + @Volatile + private var INSTANCE: ToDoDatabase? = null + + fun getDatabase(context: Context): ToDoDatabase { + val tempInstance = INSTANCE + if(tempInstance != null){ + return tempInstance + } + synchronized(this){ + val instance = Room.databaseBuilder( + context.applicationContext, + ToDoDatabase::class.java, + "todo_database" + ).build() + INSTANCE = instance + return instance + } + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/todoapp/data/models/Priority.kt b/app/src/main/java/com/example/todoapp/data/models/Priority.kt new file mode 100644 index 0000000..30190d7 --- /dev/null +++ b/app/src/main/java/com/example/todoapp/data/models/Priority.kt @@ -0,0 +1,7 @@ +package com.example.todoapp.data.models + +enum class Priority { + HIGH, + MEDIUM, + LOW +} \ No newline at end of file diff --git a/app/src/main/java/com/example/todoapp/data/models/ToDoData.kt b/app/src/main/java/com/example/todoapp/data/models/ToDoData.kt new file mode 100644 index 0000000..21f5c76 --- /dev/null +++ b/app/src/main/java/com/example/todoapp/data/models/ToDoData.kt @@ -0,0 +1,16 @@ +package com.example.todoapp.data.models + +import android.os.Parcelable +import androidx.room.Entity +import androidx.room.PrimaryKey +import kotlinx.android.parcel.Parcelize + +@Entity(tableName = "todo_table") +@Parcelize +data class ToDoData( + @PrimaryKey(autoGenerate = true) + var id: Int, + var title: String, + var priority: Priority, + var description: String +): Parcelable \ No newline at end of file diff --git a/app/src/main/java/com/example/todoapp/data/repository/ToDoRepository.kt b/app/src/main/java/com/example/todoapp/data/repository/ToDoRepository.kt new file mode 100644 index 0000000..e935924 --- /dev/null +++ b/app/src/main/java/com/example/todoapp/data/repository/ToDoRepository.kt @@ -0,0 +1,33 @@ +package com.example.todoapp.data.repository + +import androidx.lifecycle.LiveData +import com.example.todoapp.data.ToDoDao +import com.example.todoapp.data.models.ToDoData + +class ToDoRepository(private val toDoDao: ToDoDao) { + + val getAllData: LiveData> = toDoDao.getAllData() + val sortByHighPriority: LiveData> = toDoDao.sortByHighPriority() + val sortByLowPriority: LiveData> = toDoDao.sortByLowPriority() + + suspend fun insertData(toDoData: ToDoData){ + toDoDao.insertData(toDoData) + } + + suspend fun updateData(toDoData: ToDoData){ + toDoDao.updateData(toDoData) + } + + suspend fun deleteItem(toDoData: ToDoData){ + toDoDao.deleteItem(toDoData) + } + + suspend fun deleteAll(){ + toDoDao.deleteAll() + } + + fun searchDatabase(searchQuery: String): LiveData> { + return toDoDao.searchDatabase(searchQuery) + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/todoapp/data/viewmodel/ToDoViewModel.kt b/app/src/main/java/com/example/todoapp/data/viewmodel/ToDoViewModel.kt new file mode 100644 index 0000000..d5edece --- /dev/null +++ b/app/src/main/java/com/example/todoapp/data/viewmodel/ToDoViewModel.kt @@ -0,0 +1,59 @@ +package com.example.todoapp.data.viewmodel + +import android.app.Application +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.LiveData +import androidx.lifecycle.viewModelScope +import com.example.todoapp.data.ToDoDatabase +import com.example.todoapp.data.models.ToDoData +import com.example.todoapp.data.repository.ToDoRepository +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch + +class ToDoViewModel(application: Application) : AndroidViewModel(application) { + + private val toDoDao = ToDoDatabase.getDatabase( + application + ).toDoDao() + private val repository: ToDoRepository + + val getAllData: LiveData> + val sortByHighPriority: LiveData> + val sortByLowPriority: LiveData> + + init { + repository = ToDoRepository(toDoDao) + getAllData = repository.getAllData + sortByHighPriority = repository.sortByHighPriority + sortByLowPriority = repository.sortByLowPriority + } + + fun insertData(toDoData: ToDoData) { + viewModelScope.launch(Dispatchers.IO) { + repository.insertData(toDoData) + } + } + + fun updateData(toDoData: ToDoData) { + viewModelScope.launch(Dispatchers.IO) { + repository.updateData(toDoData) + } + } + + fun deleteItem(toDoData: ToDoData) { + viewModelScope.launch(Dispatchers.IO) { + repository.deleteItem(toDoData) + } + } + + fun deleteAll() { + viewModelScope.launch(Dispatchers.IO) { + repository.deleteAll() + } + } + + fun searchDatabase(searchQuery: String): LiveData>{ + return repository.searchDatabase(searchQuery) + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/todoapp/fragments/BindingAdapters.kt b/app/src/main/java/com/example/todoapp/fragments/BindingAdapters.kt new file mode 100644 index 0000000..4192420 --- /dev/null +++ b/app/src/main/java/com/example/todoapp/fragments/BindingAdapters.kt @@ -0,0 +1,66 @@ +package com.example.todoapp.fragments + +import android.view.View +import android.widget.Spinner +import androidx.cardview.widget.CardView +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.databinding.BindingAdapter +import androidx.lifecycle.MutableLiveData +import androidx.navigation.findNavController +import com.example.todoapp.R +import com.example.todoapp.data.models.Priority +import com.example.todoapp.data.models.ToDoData +import com.example.todoapp.fragments.list.ListFragmentDirections +import com.google.android.material.floatingactionbutton.FloatingActionButton + +class BindingAdapters { + + companion object{ + + @BindingAdapter("android:navigateToAddFragment") + @JvmStatic + fun navigateToAddFragment(view: FloatingActionButton, navigate: Boolean){ + view.setOnClickListener { + if(navigate){ + view.findNavController().navigate(R.id.action_listFragment_to_addFragment) + } + } + } + @BindingAdapter("android:emptyDatabase") + @JvmStatic + fun emptyDatabase(view: View, emptyDatabase: MutableLiveData){ + when(emptyDatabase.value){ + true -> view.visibility = View.VISIBLE + false -> view.visibility = View.INVISIBLE + } + } + @BindingAdapter("android:parsePriorityToInt") + @JvmStatic + fun parsePriorityToInt(view: Spinner, priority: Priority){ + when(priority){ + Priority.HIGH -> { view.setSelection(0) } + Priority.MEDIUM -> { view.setSelection(1) } + Priority.LOW -> { view.setSelection(2) } + } + } + @BindingAdapter("android:parsePriorityColor") + @JvmStatic + fun parsePriorityColor(cardView: CardView, priority: Priority){ + when(priority){ + Priority.HIGH -> { cardView.setCardBackgroundColor(cardView.context.getColor(R.color.red)) } + Priority.MEDIUM -> { cardView.setCardBackgroundColor(cardView.context.getColor(R.color.yellow)) } + Priority.LOW -> { cardView.setCardBackgroundColor(cardView.context.getColor(R.color.green)) } + } + } + @BindingAdapter("android:sendDataToUpdateFragment") + @JvmStatic + fun sendDataToUpdateFragment(view: ConstraintLayout, currentItem: ToDoData){ + view.setOnClickListener { + val action = ListFragmentDirections.actionListFragmentToUpdateFragment(currentItem) + view.findNavController().navigate(action) + } + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/todoapp/fragments/SharedViewModel.kt b/app/src/main/java/com/example/todoapp/fragments/SharedViewModel.kt new file mode 100644 index 0000000..af7d9dc --- /dev/null +++ b/app/src/main/java/com/example/todoapp/fragments/SharedViewModel.kt @@ -0,0 +1,59 @@ +package com.example.todoapp.fragments + +import android.app.Application +import android.text.TextUtils +import android.view.View +import android.widget.AdapterView +import android.widget.TextView +import androidx.core.content.ContextCompat +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.MutableLiveData +import com.example.todoapp.R +import com.example.todoapp.data.models.Priority +import com.example.todoapp.data.models.ToDoData + +class SharedViewModel(application: Application): AndroidViewModel(application) { + + /** ============================= List Fragment ============================= */ + + val emptyDatabase: MutableLiveData = MutableLiveData(false) + + fun checkIfDatabaseEmpty(toDoData: List){ + emptyDatabase.value = toDoData.isEmpty() + } + + /** ============================= Add/Update Fragment ============================= */ + + val listener: AdapterView.OnItemSelectedListener = object : + AdapterView.OnItemSelectedListener{ + override fun onNothingSelected(p0: AdapterView<*>?) {} + override fun onItemSelected( + parent: AdapterView<*>?, + view: View?, + position: Int, + id: Long + ) { + when(position){ + 0 -> { (parent?.getChildAt(0) as TextView).setTextColor(ContextCompat.getColor(application, R.color.red)) } + 1 -> { (parent?.getChildAt(0) as TextView).setTextColor(ContextCompat.getColor(application, R.color.yellow)) } + 2 -> { (parent?.getChildAt(0) as TextView).setTextColor(ContextCompat.getColor(application, R.color.green)) } + } + } + } + + fun verifyDataFromUser(title: String, description: String): Boolean { + return if(TextUtils.isEmpty(title) || TextUtils.isEmpty(description)){ + false + } else !(title.isEmpty() || description.isEmpty()) + } + + fun parsePriority(priority: String): Priority { + return when(priority){ + "High Priority" -> { Priority.HIGH } + "Medium Priority" -> { Priority.MEDIUM } + "Low Priority" -> { Priority.LOW } + else -> Priority.LOW + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/todoapp/fragments/add/AddFragment.kt b/app/src/main/java/com/example/todoapp/fragments/add/AddFragment.kt new file mode 100644 index 0000000..b8977f1 --- /dev/null +++ b/app/src/main/java/com/example/todoapp/fragments/add/AddFragment.kt @@ -0,0 +1,71 @@ +package com.example.todoapp.fragments.add + +import android.os.Bundle +import android.view.* +import android.widget.Toast +import androidx.fragment.app.Fragment +import androidx.fragment.app.viewModels +import androidx.navigation.fragment.findNavController +import com.example.todoapp.R +import com.example.todoapp.data.models.ToDoData +import com.example.todoapp.data.viewmodel.ToDoViewModel +import com.example.todoapp.fragments.SharedViewModel +import kotlinx.android.synthetic.main.fragment_add.* +import kotlinx.android.synthetic.main.fragment_add.view.* + +class AddFragment : Fragment() { + + private val mToDoViewModel: ToDoViewModel by viewModels() + private val mSharedViewModel: SharedViewModel by viewModels() + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Inflate the layout for this fragment + val view = inflater.inflate(R.layout.fragment_add, container, false) + + // Set Menu + setHasOptionsMenu(true) + + // Spinner Item Selected Listener + view.priorities_spinner.onItemSelectedListener = mSharedViewModel.listener + + return view + } + + override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { + inflater.inflate(R.menu.add_fragment_menu, menu) + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + if(item.itemId == R.id.menu_add){ + insertDataToDb() + } + return super.onOptionsItemSelected(item) + } + + private fun insertDataToDb() { + val mTitle = title_et.text.toString() + val mPriority = priorities_spinner.selectedItem.toString() + val mDescription = description_et.text.toString() + + val validation = mSharedViewModel.verifyDataFromUser(mTitle, mDescription) + if(validation){ + // Insert Data to Database + val newData = ToDoData( + 0, + mTitle, + mSharedViewModel.parsePriority(mPriority), + mDescription + ) + mToDoViewModel.insertData(newData) + Toast.makeText(requireContext(), "Successfully added!", Toast.LENGTH_SHORT).show() + // Navigate Back + findNavController().navigate(R.id.action_addFragment_to_listFragment) + }else{ + Toast.makeText(requireContext(), "Please fill out all fields.", Toast.LENGTH_SHORT).show() + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/todoapp/fragments/list/ListFragment.kt b/app/src/main/java/com/example/todoapp/fragments/list/ListFragment.kt new file mode 100644 index 0000000..6212ae7 --- /dev/null +++ b/app/src/main/java/com/example/todoapp/fragments/list/ListFragment.kt @@ -0,0 +1,158 @@ +package com.example.todoapp.fragments.list + +import android.app.AlertDialog +import android.os.Bundle +import android.view.* +import androidx.appcompat.widget.SearchView +import android.widget.Toast +import androidx.fragment.app.Fragment +import androidx.fragment.app.viewModels +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.* +import com.example.todoapp.R +import com.example.todoapp.data.models.ToDoData +import com.example.todoapp.data.viewmodel.ToDoViewModel +import com.example.todoapp.databinding.FragmentListBinding +import com.example.todoapp.fragments.SharedViewModel +import com.example.todoapp.fragments.list.adapter.ListAdapter +import com.google.android.material.snackbar.Snackbar +import jp.wasabeef.recyclerview.animators.SlideInUpAnimator + +class ListFragment : Fragment(), SearchView.OnQueryTextListener { + + private val mToDoViewModel: ToDoViewModel by viewModels() + private val mSharedViewModel: SharedViewModel by viewModels() + + private var _binding: FragmentListBinding? = null + private val binding get() = _binding!! + + private val adapter: ListAdapter by lazy { ListAdapter() } + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Data binding + _binding = FragmentListBinding.inflate(inflater, container, false) + binding.lifecycleOwner = this + binding.mSharedViewModel = mSharedViewModel + + // Setup RecyclerView + setupRecyclerview() + + // Observe LiveData + mToDoViewModel.getAllData.observe(viewLifecycleOwner, Observer { data -> + mSharedViewModel.checkIfDatabaseEmpty(data) + adapter.setData(data) + }) + + // Set Menu + setHasOptionsMenu(true) + + return binding.root + } + + private fun setupRecyclerview() { + val recyclerView = binding.recyclerView + recyclerView.adapter = adapter + recyclerView.layoutManager = StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL) + recyclerView.itemAnimator = SlideInUpAnimator().apply { + addDuration = 300 + } + + // Swipe to Delete + swipeToDelete(recyclerView) + } + + private fun swipeToDelete(recyclerView: RecyclerView) { + val swipeToDeleteCallback = object : SwipeToDelete() { + override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) { + val deletedItem = adapter.dataList[viewHolder.adapterPosition] + // Delete Item + mToDoViewModel.deleteItem(deletedItem) + adapter.notifyItemRemoved(viewHolder.adapterPosition) + // Restore Deleted Item + restoreDeletedData(viewHolder.itemView, deletedItem, viewHolder.adapterPosition) + } + } + val itemTouchHelper = ItemTouchHelper(swipeToDeleteCallback) + itemTouchHelper.attachToRecyclerView(recyclerView) + } + + private fun restoreDeletedData(view: View, deletedItem: ToDoData, position: Int) { + val snackBar = Snackbar.make( + view, "Deleted '${deletedItem.title}'", + Snackbar.LENGTH_LONG + ) + snackBar.setAction("Undo") { + mToDoViewModel.insertData(deletedItem) + adapter.notifyItemChanged(position) + } + snackBar.show() + } + + override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { + inflater.inflate(R.menu.list_fragment_menu, menu) + + val search = menu.findItem(R.id.menu_search) + val searchView = search.actionView as? SearchView + searchView?.isSubmitButtonEnabled = true + searchView?.setOnQueryTextListener(this) + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + when (item.itemId) { + R.id.menu_delete_all -> confirmRemoval() + R.id.menu_priority_high -> mToDoViewModel.sortByHighPriority.observe(this, Observer { adapter.setData(it) }) + R.id.menu_priority_low -> mToDoViewModel.sortByLowPriority.observe(this, Observer { adapter.setData(it) }) + } + return super.onOptionsItemSelected(item) + } + + override fun onQueryTextSubmit(query: String?): Boolean { + if (query != null) { + searchThroughDatabase(query) + } + return true + } + + override fun onQueryTextChange(query: String?): Boolean { + if (query != null) { + searchThroughDatabase(query) + } + return true + } + + private fun searchThroughDatabase(query: String) { + val searchQuery = "%$query%" + + mToDoViewModel.searchDatabase(searchQuery).observe(this, Observer { list -> + list?.let { + adapter.setData(it) + } + }) + } + + // Show AlertDialog to Confirm Removal of All Items from Database Table + private fun confirmRemoval() { + val builder = AlertDialog.Builder(requireContext()) + builder.setPositiveButton("Yes") { _, _ -> + mToDoViewModel.deleteAll() + Toast.makeText( + requireContext(), + "Successfully Removed Everything!", + Toast.LENGTH_SHORT + ).show() + } + builder.setNegativeButton("No") { _, _ -> } + builder.setTitle("Delete everything?") + builder.setMessage("Are you sure you want to remove everything?") + builder.create().show() + } + + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/todoapp/fragments/list/SwipeToDelete.kt b/app/src/main/java/com/example/todoapp/fragments/list/SwipeToDelete.kt new file mode 100644 index 0000000..9f0dd0b --- /dev/null +++ b/app/src/main/java/com/example/todoapp/fragments/list/SwipeToDelete.kt @@ -0,0 +1,14 @@ +package com.example.todoapp.fragments.list + +import androidx.recyclerview.widget.ItemTouchHelper +import androidx.recyclerview.widget.RecyclerView + +abstract class SwipeToDelete: ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT) { + override fun onMove( + recyclerView: RecyclerView, + viewHolder: RecyclerView.ViewHolder, + target: RecyclerView.ViewHolder + ): Boolean { + return false + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/todoapp/fragments/list/adapter/ListAdapter.kt b/app/src/main/java/com/example/todoapp/fragments/list/adapter/ListAdapter.kt new file mode 100644 index 0000000..bfe961e --- /dev/null +++ b/app/src/main/java/com/example/todoapp/fragments/list/adapter/ListAdapter.kt @@ -0,0 +1,53 @@ +package com.example.todoapp.fragments.list.adapter + +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.DiffUtil +import androidx.recyclerview.widget.RecyclerView +import com.example.todoapp.data.models.ToDoData +import com.example.todoapp.databinding.RowLayoutBinding + +class ListAdapter : RecyclerView.Adapter() { + + var dataList = emptyList() + + class MyViewHolder(private val binding: RowLayoutBinding) : RecyclerView.ViewHolder(binding.root){ + + fun bind(toDoData: ToDoData){ + binding.toDoData = toDoData + binding.executePendingBindings() + } + companion object{ + fun from(parent: ViewGroup): MyViewHolder { + val layoutInflater = LayoutInflater.from(parent.context) + val binding = RowLayoutBinding.inflate(layoutInflater, parent, false) + return MyViewHolder( + binding + ) + } + } + } + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyViewHolder { + return MyViewHolder.from( + parent + ) + } + + override fun getItemCount(): Int { + return dataList.size + } + + override fun onBindViewHolder(holder: MyViewHolder, position: Int) { + val currentItem = dataList[position] + holder.bind(currentItem) + } + + fun setData(toDoData: List){ + val toDoDiffUtil = ToDoDiffUtil(dataList, toDoData) + val toDoDiffResult = DiffUtil.calculateDiff(toDoDiffUtil) + this.dataList = toDoData + toDoDiffResult.dispatchUpdatesTo(this) + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/todoapp/fragments/list/adapter/ToDoDiffUtil.kt b/app/src/main/java/com/example/todoapp/fragments/list/adapter/ToDoDiffUtil.kt new file mode 100644 index 0000000..559a327 --- /dev/null +++ b/app/src/main/java/com/example/todoapp/fragments/list/adapter/ToDoDiffUtil.kt @@ -0,0 +1,29 @@ +package com.example.todoapp.fragments.list.adapter + +import androidx.recyclerview.widget.DiffUtil +import com.example.todoapp.data.models.ToDoData + +class ToDoDiffUtil( + private val oldList: List, + private val newList: List +): DiffUtil.Callback() { + + override fun getOldListSize(): Int { + return oldList.size + } + + override fun getNewListSize(): Int { + return newList.size + } + + override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean { + return oldList[oldItemPosition] === newList[newItemPosition] + } + + override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean { + return oldList[oldItemPosition].id == newList[newItemPosition].id + && oldList[oldItemPosition].title == newList[newItemPosition].title + && oldList[oldItemPosition].description == newList[newItemPosition].description + && oldList[oldItemPosition].priority == newList[newItemPosition].priority + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/todoapp/fragments/update/UpdateFragment.kt b/app/src/main/java/com/example/todoapp/fragments/update/UpdateFragment.kt new file mode 100644 index 0000000..6e1d523 --- /dev/null +++ b/app/src/main/java/com/example/todoapp/fragments/update/UpdateFragment.kt @@ -0,0 +1,104 @@ +package com.example.todoapp.fragments.update + +import android.app.AlertDialog +import android.os.Bundle +import android.view.* +import android.widget.Toast +import androidx.fragment.app.Fragment +import androidx.fragment.app.viewModels +import androidx.navigation.fragment.findNavController +import androidx.navigation.fragment.navArgs +import com.example.todoapp.R +import com.example.todoapp.data.models.ToDoData +import com.example.todoapp.data.viewmodel.ToDoViewModel +import com.example.todoapp.databinding.FragmentUpdateBinding +import com.example.todoapp.fragments.SharedViewModel +import kotlinx.android.synthetic.main.fragment_update.* +import kotlinx.android.synthetic.main.fragment_update.view.* + +class UpdateFragment : Fragment() { + + private val args by navArgs() + + private val mSharedViewModel: SharedViewModel by viewModels() + private val mToDoViewModel: ToDoViewModel by viewModels() + + private var _binding: FragmentUpdateBinding? = null + private val binding get() = _binding!! + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Data binding + _binding = FragmentUpdateBinding.inflate(inflater, container, false) + binding.args = args + + // Set Menu + setHasOptionsMenu(true) + + // Spinner Item Selected Listener + binding.currentPrioritiesSpinner.onItemSelectedListener = mSharedViewModel.listener + + return binding.root + } + + override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { + inflater.inflate(R.menu.update_fragment_menu, menu) + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + when (item.itemId) { + R.id.menu_save -> updateItem() + R.id.menu_delete -> confirmItemRemoval() + } + return super.onOptionsItemSelected(item) + } + + private fun updateItem() { + val title = current_title_et.text.toString() + val description = current_description_et.text.toString() + val getPriority = current_priorities_spinner.selectedItem.toString() + + val validation = mSharedViewModel.verifyDataFromUser(title, description) + if (validation) { + // Update Current Item + val updatedItem = ToDoData( + args.currentItem.id, + title, + mSharedViewModel.parsePriority(getPriority), + description + ) + mToDoViewModel.updateData(updatedItem) + Toast.makeText(requireContext(), "Successfully updated!", Toast.LENGTH_SHORT).show() + // Navigate back + findNavController().navigate(R.id.action_updateFragment_to_listFragment) + } else { + Toast.makeText(requireContext(), "Please fill out all fields.", Toast.LENGTH_SHORT) + .show() + } + } + + // Show AlertDialog to Confirm Item Removal + private fun confirmItemRemoval() { + val builder = AlertDialog.Builder(requireContext()) + builder.setPositiveButton("Yes") { _, _ -> + mToDoViewModel.deleteItem(args.currentItem) + Toast.makeText( + requireContext(), + "Successfully Removed: ${args.currentItem.title}", + Toast.LENGTH_SHORT + ).show() + findNavController().navigate(R.id.action_updateFragment_to_listFragment) + } + builder.setNegativeButton("No") { _, _ -> } + builder.setTitle("Delete '${args.currentItem.title}'?") + builder.setMessage("Are you sure you want to remove '${args.currentItem.title}'?") + builder.create().show() + } + + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } +} \ No newline at end of file diff --git a/app/src/main/res/anim/from_left.xml b/app/src/main/res/anim/from_left.xml new file mode 100644 index 0000000..73e051c --- /dev/null +++ b/app/src/main/res/anim/from_left.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/anim/from_right.xml b/app/src/main/res/anim/from_right.xml new file mode 100644 index 0000000..4454430 --- /dev/null +++ b/app/src/main/res/anim/from_right.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/anim/to_left.xml b/app/src/main/res/anim/to_left.xml new file mode 100644 index 0000000..2a683d8 --- /dev/null +++ b/app/src/main/res/anim/to_left.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/anim/to_right.xml b/app/src/main/res/anim/to_right.xml new file mode 100644 index 0000000..b520d05 --- /dev/null +++ b/app/src/main/res/anim/to_right.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/custom_input.xml b/app/src/main/res/drawable/custom_input.xml new file mode 100644 index 0000000..926a1bc --- /dev/null +++ b/app/src/main/res/drawable/custom_input.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml new file mode 100644 index 0000000..eb23254 --- /dev/null +++ b/app/src/main/res/drawable/ic_add.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_check.xml b/app/src/main/res/drawable/ic_check.xml new file mode 100644 index 0000000..0432fa6 --- /dev/null +++ b/app/src/main/res/drawable/ic_check.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_no_data.xml b/app/src/main/res/drawable/ic_no_data.xml new file mode 100644 index 0000000..8766fc5 --- /dev/null +++ b/app/src/main/res/drawable/ic_no_data.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_save.xml b/app/src/main/res/drawable/ic_save.xml new file mode 100644 index 0000000..1a8d86d --- /dev/null +++ b/app/src/main/res/drawable/ic_save.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml new file mode 100644 index 0000000..07b76d6 --- /dev/null +++ b/app/src/main/res/drawable/ic_search.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/item_background.xml b/app/src/main/res/drawable/item_background.xml new file mode 100644 index 0000000..5fe9528 --- /dev/null +++ b/app/src/main/res/drawable/item_background.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..6424a1e --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,21 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_add.xml b/app/src/main/res/layout/fragment_add.xml new file mode 100644 index 0000000..b65956f --- /dev/null +++ b/app/src/main/res/layout/fragment_add.xml @@ -0,0 +1,58 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_list.xml b/app/src/main/res/layout/fragment_list.xml new file mode 100644 index 0000000..6bf8f68 --- /dev/null +++ b/app/src/main/res/layout/fragment_list.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_update.xml b/app/src/main/res/layout/fragment_update.xml new file mode 100644 index 0000000..ced287b --- /dev/null +++ b/app/src/main/res/layout/fragment_update.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/row_layout.xml b/app/src/main/res/layout/row_layout.xml new file mode 100644 index 0000000..8f826e3 --- /dev/null +++ b/app/src/main/res/layout/row_layout.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/add_fragment_menu.xml b/app/src/main/res/menu/add_fragment_menu.xml new file mode 100644 index 0000000..09d1459 --- /dev/null +++ b/app/src/main/res/menu/add_fragment_menu.xml @@ -0,0 +1,13 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/list_fragment_menu.xml b/app/src/main/res/menu/list_fragment_menu.xml new file mode 100644 index 0000000..a979648 --- /dev/null +++ b/app/src/main/res/menu/list_fragment_menu.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/update_fragment_menu.xml b/app/src/main/res/menu/update_fragment_menu.xml new file mode 100644 index 0000000..d34a807 --- /dev/null +++ b/app/src/main/res/menu/update_fragment_menu.xml @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..a571e60 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..61da551 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..c41dd28 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..db5080a Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..6dba46d Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..da31a87 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..15ac681 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..b216f2d Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..f25a419 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..e96783c Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/navigation/my_nav.xml b/app/src/main/res/navigation/my_nav.xml new file mode 100644 index 0000000..e8b6a98 --- /dev/null +++ b/app/src/main/res/navigation/my_nav.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..680c2c3 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,13 @@ + + + #6200EA + #5502C8 + #9D46FF + + #FFFFFF + #E6E6E6 + #4B4B4B + #FF4646 + #FFC114 + #00C980 + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..cdb6013 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,22 @@ + + ToDo App + Hello blank fragment + No Data + + Title + Description + Search + Sort By + Priority High + Priority Low + Delete All + Add + Save + Delete + + + High Priority + Medium Priority + Low Priority + + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..fac9291 --- /dev/null +++ b/app/src/main/res/values/styles.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/app/src/test/java/com/example/todoapp/ExampleUnitTest.kt b/app/src/test/java/com/example/todoapp/ExampleUnitTest.kt new file mode 100644 index 0000000..49e780c --- /dev/null +++ b/app/src/test/java/com/example/todoapp/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.example.todoapp + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..2ee6591 --- /dev/null +++ b/build.gradle @@ -0,0 +1,32 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +buildscript { + + ext { + kotlin_version = '1.3.72' + nav_version = "2.3.0-beta01" + } + + repositories { + google() + jcenter() + } + dependencies { + classpath "com.android.tools.build:gradle:4.0.0" + + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version" + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..4d15d01 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,21 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx2048m +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app"s APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..f6b961f Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..04e4006 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Fri Jun 26 09:49:12 CEST 2020 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..cccdd3d --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..17c1ef7 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +include ':app' +rootProject.name = "ToDo App" \ No newline at end of file