Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

changes #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,48 +1,47 @@
apply plugin: 'com.android.application'

apply plugin: 'kotlin-android'

apply plugin: 'kotlin-android-extensions'

apply plugin: 'kotlin-kapt'

android {
compileSdkVersion 29
buildToolsVersion "29.0.3"

defaultConfig {
applicationId "com.example.todoapp"
minSdkVersion 23
minSdkVersion 22
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'
}
}

}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.core:core-ktx:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.0.0"

implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'com.google.android.material:material:1.1.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
def room_version = "2.2.5"

implementation "androidx.room:room-runtime:$room_version"
annotationProcessor "androidx.room:room-compiler:$room_version"
kapt "androidx.room:room-compiler:$room_version"
implementation "androidx.room:room-ktx:$room_version"

//database
implementation "androidx.room:room-runtime:2.2.3"
implementation "androidx.room:room-ktx:2.2.3"
kapt "androidx.room:room-compiler:2.2.3"
implementation 'com.google.android.material:material:1.1.0'
}
9 changes: 5 additions & 4 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.todoapp">

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".HistoryActivity"></activity>
<activity android:name=".TaskActivity" />
<activity android:name=".TaskActivity">

</activity>
<activity android:name=".HistoryActivity" />
<activity android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
94 changes: 94 additions & 0 deletions app/src/main/java/com/example/todoapp/HistoryActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,105 @@ package com.example.todoapp

import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
import androidx.appcompat.widget.SearchView
import androidx.lifecycle.Observer
import androidx.recyclerview.widget.LinearLayoutManager
import kotlinx.android.synthetic.main.activity_history.*
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch

class HistoryActivity : AppCompatActivity() {

val db by lazy {
AppDatabase.getDatabase(this)
}


val list = arrayListOf<TodoModel>()
var com_adapter = TodoAdapter(list)

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_history)
setSupportActionBar(toolbar)
completedRv.apply {
layoutManager = LinearLayoutManager(this@HistoryActivity)
adapter = [email protected]_adapter
}


db.todoDao().getFinishedTask().observe(this, Observer {
if (!it.isNullOrEmpty()) {
list.clear()
list.addAll(it)
com_adapter.notifyDataSetChanged()
}else{
list.clear()
com_adapter.notifyDataSetChanged()
}
})
}

override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.history, menu)
val item = menu.findItem(R.id.search)
val searchView = item.actionView as SearchView
item.setOnActionExpandListener(object :MenuItem.OnActionExpandListener{
override fun onMenuItemActionExpand(item: MenuItem?): Boolean {
displayTodo()
return true
}

override fun onMenuItemActionCollapse(item: MenuItem?): Boolean {
displayTodo()
return true
}

})
searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener{
override fun onQueryTextSubmit(query: String?): Boolean {
return false
}

override fun onQueryTextChange(newText: String?): Boolean {
if(!newText.isNullOrEmpty()){
displayTodo(newText)
}
return true
}

})

return super.onCreateOptionsMenu(menu)
}

fun displayTodo(newText: String = "") {
db.todoDao().getFinishedTask().observe(this, Observer {
if(it.isNotEmpty()){
list.clear()
list.addAll(
it.filter { todo ->
todo.title.contains(newText,true)
}
)
com_adapter.notifyDataSetChanged()
}
})
}

override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) {
R.id.delete -> {

GlobalScope.launch(Dispatchers.IO) {
db.todoDao().delete_finished_task()
}

}
}
return super.onOptionsItemSelected(item)
}
}
11 changes: 10 additions & 1 deletion app/src/main/java/com/example/todoapp/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
package com.example.todoapp

import android.app.AlarmManager
import android.app.Notification
import android.app.PendingIntent
import android.content.Context
import android.content.Context.ALARM_SERVICE
import android.content.Intent
import android.graphics.*
import android.os.Bundle
import android.os.SystemClock
import android.view.Menu
import android.view.MenuItem
import android.view.View
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.SearchView
import androidx.core.app.NotificationCompat
import androidx.core.content.ContextCompat.getSystemService
import androidx.lifecycle.Observer
import androidx.recyclerview.widget.ItemTouchHelper
import androidx.recyclerview.widget.LinearLayoutManager
Expand All @@ -21,7 +29,6 @@ class MainActivity : AppCompatActivity() {

val list = arrayListOf<TodoModel>()
var adapter = TodoAdapter(list)

val db by lazy {
AppDatabase.getDatabase(this)
}
Expand Down Expand Up @@ -49,6 +56,7 @@ class MainActivity : AppCompatActivity() {
})



}

fun initSwipe() {
Expand Down Expand Up @@ -209,4 +217,5 @@ class MainActivity : AppCompatActivity() {
fun openNewTask(view: View) {
startActivity(Intent(this, TaskActivity::class.java))
}

}
53 changes: 34 additions & 19 deletions app/src/main/java/com/example/todoapp/TaskActivity.kt
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
package com.example.todoapp

import android.app.DatePickerDialog
import android.app.TimePickerDialog
import android.app.*
import android.content.Context
import android.content.DialogInterface
import android.content.Intent
import android.os.Bundle
import android.view.View
import android.widget.ArrayAdapter
import android.widget.DatePicker
import android.widget.TimePicker
import androidx.appcompat.app.AppCompatActivity
import androidx.room.Room
import androidx.core.content.ContextCompat.getSystemService
import androidx.core.content.getSystemService
import kotlinx.android.synthetic.main.activity_task.*
import kotlinx.android.synthetic.main.alert.view.*
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
Expand All @@ -18,7 +22,6 @@ import java.text.SimpleDateFormat
import java.util.*

const val DB_NAME = "todo.db"

class TaskActivity : AppCompatActivity(), View.OnClickListener {

lateinit var myCalendar: Calendar
Expand All @@ -29,10 +32,8 @@ class TaskActivity : AppCompatActivity(), View.OnClickListener {
var finalDate = 0L
var finalTime = 0L


private val labels = arrayListOf("Personal", "Business", "Insurance", "Shopping", "Banking")


val db by lazy {
AppDatabase.getDatabase(this)
}
Expand All @@ -46,18 +47,30 @@ class TaskActivity : AppCompatActivity(), View.OnClickListener {
saveBtn.setOnClickListener(this)


setUpSpinner()
}

private fun setUpSpinner() {
val adapter =
ArrayAdapter<String>(this, android.R.layout.simple_spinner_dropdown_item, labels)

labels.sort()

spinnerCategory.adapter = adapter
imgAddCategory.setOnClickListener {

val alertDialog = AlertDialog.Builder(this)
val custom_layout = layoutInflater.inflate(R.layout.alert,null)
alertDialog.setView(custom_layout)
alertDialog.setPositiveButton("Submit",DialogInterface.OnClickListener { dialog, which ->

labels.add(custom_layout.spin.text.toString())
labels.sort()
adapter.notifyDataSetChanged()
})
val dial : AlertDialog = alertDialog.create();
dial.setCanceledOnTouchOutside(true)
dial.show()
}
}


override fun onClick(v: View) {
when (v.id) {
R.id.dateEdt -> {
Expand All @@ -77,19 +90,22 @@ class TaskActivity : AppCompatActivity(), View.OnClickListener {
val category = spinnerCategory.selectedItem.toString()
val title = titleInpLay.editText?.text.toString()
val description = taskInpLay.editText?.text.toString()
val model = TodoModel(
title,
description,
category,
finalDate,
finalTime
)

GlobalScope.launch(Dispatchers.Main) {
val id = withContext(Dispatchers.IO) {
return@withContext db.todoDao().insertTask(
TodoModel(
title,
description,
category,
finalDate,
finalTime
)
model
)
}


finish()
}

Expand Down Expand Up @@ -148,8 +164,7 @@ class TaskActivity : AppCompatActivity(), View.OnClickListener {
finalDate = myCalendar.time.time
dateEdt.setText(sdf.format(myCalendar.time))

timeInptLay.visibility = View.VISIBLE

}

}
}
32 changes: 32 additions & 0 deletions app/src/main/java/com/example/todoapp/TaskReceiver.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package com.example.todoapp

import android.app.Notification
import android.app.NotificationManager
import android.app.PendingIntent
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import androidx.core.app.NotificationCompat


class TaskReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {

val nm =
context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
val pendingIntent = PendingIntent.getActivity(
context, 123, Intent(
context,
MainActivity::class.java
),
PendingIntent.FLAG_UPDATE_CURRENT
)
val notification = NotificationCompat.Builder(context,"one")
.setContentTitle(intent.getStringExtra("TASK"))
.setContentText(intent.getStringExtra("Des"))
.setSmallIcon(R.mipmap.ic_launcher)
.setContentIntent(pendingIntent)
.build()
nm.notify(System.currentTimeMillis().toInt(), notification)
}
}
7 changes: 7 additions & 0 deletions app/src/main/java/com/example/todoapp/TodoDao.kt
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,11 @@ interface TodoDao {

@Query("Delete from TodoModel where id=:uid")
fun deleteTask(uid:Long)

@Query("Select * from TodoModel where isFinished == 1")
fun getFinishedTask():LiveData<List<TodoModel>>

@Query("Delete from TodoModel where isFinished == 1")
fun delete_finished_task()

}
Loading