Skip to content

Commit c29aff1

Browse files
devout-coderdevout-coder
authored
Merge pull request #16 from devout-coder/rest
merging rest's changes
2 parents 4e120ee + 769aad6 commit c29aff1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1152
-567
lines changed

‎android/app/google-services.json

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"project_info": {
3+
"project_number": "52294703459",
4+
"project_id": "doneify",
5+
"storage_bucket": "doneify.appspot.com"
6+
},
7+
"client": [
8+
{
9+
"client_info": {
10+
"mobilesdk_app_id": "1:52294703459:android:b1d8369cbcbe072a38db56",
11+
"android_client_info": {
12+
"package_name": "com.example.doneify"
13+
}
14+
},
15+
"oauth_client": [
16+
{
17+
"client_id": "52294703459-388f732f6cvv4c1aqtpdr3tl7b7ejb9p.apps.googleusercontent.com",
18+
"client_type": 1,
19+
"android_info": {
20+
"package_name": "com.example.doneify",
21+
"certificate_hash": "908d2f1e2baae43b4c9add557aefefd8ca542186"
22+
}
23+
},
24+
{
25+
"client_id": "52294703459-ev3mkullv0fchdrsso7pgjtliimheav8.apps.googleusercontent.com",
26+
"client_type": 3
27+
}
28+
],
29+
"api_key": [
30+
{
31+
"current_key": "AIzaSyAtbZ9kd54IGKiJbB-0AmhXRtggo7SQ9ZI"
32+
}
33+
],
34+
"services": {
35+
"appinvite_service": {
36+
"other_platform_oauth_client": [
37+
{
38+
"client_id": "52294703459-0ir40ukcrn990dsj4fucr6qhho9uk9fq.apps.googleusercontent.com",
39+
"client_type": 3
40+
}
41+
]
42+
}
43+
}
44+
}
45+
],
46+
"configuration_version": "1"
47+
}

‎android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
55
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
66
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
7+
<uses-permission android:name="android.permission.INTERNET" />
78

89
<application
910
android:name="${applicationName}"

‎android/app/src/main/kotlin/com/example/doneify/KotlinMethodCalls.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import android.content.SharedPreferences
88
import android.provider.Settings
99
import android.text.TextUtils
1010
import android.util.Log
11+
import androidx.room.OnConflictStrategy
1112
import com.google.gson.Gson
1213
import io.flutter.plugin.common.MethodCall
1314
import io.flutter.plugin.common.MethodChannel
@@ -241,7 +242,11 @@ fun handleMethodCalls(context: Context, call: MethodCall?, result: MethodChannel
241242
Thread {
242243
if (call.method == "createTodo") {
243244
Log.d("debugging", "the id used is $id")
244-
todoDAO!!.insert(todo)
245+
try {
246+
todoDAO!!.insert(todo)
247+
} catch (e: Exception) {
248+
Log.d("debugging", "the caught exception is ${e.toString()}")
249+
}
245250
} else {
246251
todoDAO!!.update(todo)
247252
}

‎android/app/src/main/kotlin/com/example/doneify/MainActivity.kt

Lines changed: 96 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,16 @@ import android.content.*
55
import android.content.pm.PackageManager
66
import android.media.AudioAttributes
77
import android.net.Uri
8-
import android.provider.Settings
9-
import android.text.TextUtils
108
import android.util.Log
119
import androidx.annotation.NonNull
1210
import androidx.annotation.Nullable
13-
import com.google.gson.Gson
1411
import io.flutter.embedding.android.FlutterActivity
1512
import io.flutter.embedding.engine.FlutterEngine
1613
import io.flutter.plugin.common.MethodCall
1714
import io.flutter.plugin.common.MethodChannel
1815
import io.flutter.plugins.GeneratedPluginRegistrant
1916
import java.util.*
2017

21-
2218
val CHANNEL = "alarm_method_channel"
2319

2420
const val REQUEST_CODE_FOR_ACCESSIBILITY = 167
@@ -29,49 +25,53 @@ var methodChannel: MethodChannel? = null
2925

3026
class MainActivity : FlutterActivity() {
3127

32-
// lateinit var newFlutterEngine: FlutterEngine
28+
// lateinit var newFlutterEngine: FlutterEngine
3329

3430
override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
3531
super.configureFlutterEngine(flutterEngine)
36-
GeneratedPluginRegistrant.registerWith(flutterEngine);
32+
GeneratedPluginRegistrant.registerWith(flutterEngine)
3733

3834
val receiver = ComponentName(context, BootReceiver::class.java)
3935
context.packageManager.setComponentEnabledSetting(
40-
receiver,
41-
PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
42-
PackageManager.DONT_KILL_APP
36+
receiver,
37+
PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
38+
PackageManager.DONT_KILL_APP
4339
)
4440

45-
4641
val sound: Uri =
47-
Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE.toString() + "://" + context.packageName + "/" + R.raw.rooster)
48-
val attributes: AudioAttributes = AudioAttributes.Builder()
49-
.setUsage(AudioAttributes.USAGE_NOTIFICATION)
50-
.build()
42+
Uri.parse(
43+
ContentResolver.SCHEME_ANDROID_RESOURCE.toString() +
44+
"://" +
45+
context.packageName +
46+
"/" +
47+
R.raw.rooster
48+
)
49+
val attributes: AudioAttributes =
50+
AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_NOTIFICATION).build()
5151
val mChannel = NotificationChannel("alarms", "Alarms", NotificationManager.IMPORTANCE_HIGH)
5252
mChannel.description = "This pertains to all the alarms set by the user"
5353
mChannel.setSound(sound, attributes)
5454
val notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
5555
notificationManager.createNotificationChannel(mChannel)
5656

57-
// isPresent("24/1/2023", "day")
58-
// isPresent("23/1/2023-29/1/2023", "week")
59-
// isPresent("Jan 2023", "month")
60-
// isPresent("2023", "year")
61-
// isPresent("longTerm", "longTerm")
57+
// isPresent("24/1/2023", "day")
58+
// isPresent("23/1/2023-29/1/2023", "week")
59+
// isPresent("Jan 2023", "month")
60+
// isPresent("2023", "year")
61+
// isPresent("longTerm", "longTerm")
6262

63-
methodChannel = MethodChannel(
64-
flutterEngine.dartExecutor.binaryMessenger,
65-
CHANNEL
66-
)
63+
methodChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL)
6764
methodChannel!!.setMethodCallHandler { call: MethodCall?, result: MethodChannel.Result? ->
6865
handleMethodCalls(context, call, result)
6966
handleNudgerCall(this, context, call, result)
7067
}
7168
}
7269

7370
override fun onActivityResult(requestCode: Int, resultCode: Int, @Nullable data: Intent?) {
74-
//this func checks whether accessibility has been enabled after returning from settings
71+
// this func checks whether accessibility has been enabled after returning from settings
72+
super.onActivityResult(requestCode, resultCode, data)
73+
74+
Log.d("debugging", "received activity result")
7575
if (requestCode == REQUEST_CODE_FOR_ACCESSIBILITY) {
7676
if (resultCode == RESULT_OK) {
7777
pendingResult?.success(true)
@@ -89,37 +89,35 @@ fun padDate(date: String): String {
8989
components[0] = components[0].padStart(2, '0')
9090
components[1] = components[1].padStart(2, '0')
9191
return components.joinToString("/")
92-
9392
}
9493

9594
fun setAlarm(
96-
context: Context,
97-
alarmId: String,
98-
time: String,
99-
repeatStatus: String,
100-
repeatEnd: String,
101-
taskId: String,
102-
taskName: String,
103-
taskDesc: String,
104-
label: String,
105-
finished: Boolean
95+
context: Context,
96+
alarmId: String,
97+
time: String,
98+
repeatStatus: String,
99+
repeatEnd: String,
100+
taskId: String,
101+
taskName: String,
102+
taskDesc: String,
103+
label: String,
104+
finished: Boolean
106105
) {
107106
Log.d(
108-
"debugging",
109-
"alarm set from dart: $alarmId, $time, $repeatStatus, $repeatEnd, $taskId, $taskName, $taskDesc, $label, $finished"
107+
"debugging",
108+
"alarm set from dart: $alarmId, $time, $repeatStatus, $repeatEnd, $taskId, $taskName, $taskDesc, $label, $finished"
110109
)
111110

112-
val alarmIntent = Intent(context, AlarmReceiver::class.java).apply {
113-
putExtra("alarmId", alarmId)
114-
}
111+
val alarmIntent =
112+
Intent(context, AlarmReceiver::class.java).apply { putExtra("alarmId", alarmId) }
115113
val pendingAlarmIntent =
116-
PendingIntent.getBroadcast(
117-
context,
118-
alarmId.toInt(),
119-
alarmIntent,
120-
PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
121-
)
122-
var interval: Long = 0;
114+
PendingIntent.getBroadcast(
115+
context,
116+
alarmId.toInt(),
117+
alarmIntent,
118+
PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
119+
)
120+
var interval: Long = 0
123121
when (repeatStatus) {
124122
"everyDay" -> {
125123
interval = AlarmManager.INTERVAL_DAY
@@ -142,65 +140,68 @@ fun setAlarm(
142140
val year: Int = date.split("/")[2].toInt()
143141
val hour: Int = realTime.split(":")[0].toInt()
144142
val minute: Int = realTime.split(":")[1].toInt()
145-
val calendar: Calendar = Calendar.getInstance().apply {
146-
timeInMillis = System.currentTimeMillis()
147-
clear()
148-
set(Calendar.YEAR, year)
149-
set(Calendar.MONTH, month)
150-
set(Calendar.DAY_OF_MONTH, day)
151-
set(Calendar.HOUR_OF_DAY, hour)
152-
set(Calendar.MINUTE, minute)
153-
}
154-
val alarmManager =
155-
context.getSystemService(Context.ALARM_SERVICE) as? AlarmManager
143+
val calendar: Calendar =
144+
Calendar.getInstance().apply {
145+
timeInMillis = System.currentTimeMillis()
146+
clear()
147+
set(Calendar.YEAR, year)
148+
set(Calendar.MONTH, month)
149+
set(Calendar.DAY_OF_MONTH, day)
150+
set(Calendar.HOUR_OF_DAY, hour)
151+
set(Calendar.MINUTE, minute)
152+
}
153+
val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as? AlarmManager
156154
if (repeatStatus == "once") {
157155
alarmManager!!.setExactAndAllowWhileIdle(
158-
AlarmManager.RTC_WAKEUP,
159-
calendar.timeInMillis,
160-
pendingAlarmIntent
156+
AlarmManager.RTC_WAKEUP,
157+
calendar.timeInMillis,
158+
pendingAlarmIntent
161159
)
162160
} else {
163161
alarmManager!!.setRepeating(
164-
AlarmManager.RTC_WAKEUP,
165-
calendar.timeInMillis,
166-
interval,
167-
pendingAlarmIntent
162+
AlarmManager.RTC_WAKEUP,
163+
calendar.timeInMillis,
164+
interval,
165+
pendingAlarmIntent
168166
)
169167
}
170168
Log.d("debugging", "alarm set successfully")
171169
}
172170

173171
fun deleteAlarm(context: Context, alarmId: String) {
174172
Thread {
175-
var reqAlarm: ActiveAlarm?
176-
val db: AppDB = AppDB.getDatabase(context)
177-
val activeAlarmDao = db.activeAlarmDAO()
178-
val fetchedAlarms: List<ActiveAlarm> = activeAlarmDao!!.getById(alarmId)
179-
if (fetchedAlarms.isNotEmpty()) {
180-
reqAlarm = fetchedAlarms[0]
181-
activeAlarmDao.delete(reqAlarm)
182-
183-
val activeAlarms: List<ActiveAlarm> = activeAlarmDao.getAll()
184-
// Log.d("debugging", "in deleteAlarm method kotlin, all active alarms: $activeAlarms")
185-
186-
Log.d(
187-
"debugging",
188-
"alarm deleted: $alarmId, ${reqAlarm.time}, ${reqAlarm.repeatStatus}, ${reqAlarm.repeatEnd}, ${reqAlarm.taskId}, ${reqAlarm.taskName}, ${reqAlarm.taskDesc}, ${reqAlarm.label}, ${reqAlarm.finished}"
189-
)
190-
val alarmIntent = Intent(context, AlarmReceiver::class.java).apply {
191-
putExtra("alarmId", alarmId)
173+
var reqAlarm: ActiveAlarm?
174+
val db: AppDB = AppDB.getDatabase(context)
175+
val activeAlarmDao = db.activeAlarmDAO()
176+
val fetchedAlarms: List<ActiveAlarm> = activeAlarmDao!!.getById(alarmId)
177+
if (fetchedAlarms.isNotEmpty()) {
178+
reqAlarm = fetchedAlarms[0]
179+
activeAlarmDao.delete(reqAlarm)
180+
181+
val activeAlarms: List<ActiveAlarm> = activeAlarmDao.getAll()
182+
// Log.d("debugging", "in deleteAlarm method kotlin, all active alarms:
183+
// $activeAlarms")
184+
185+
Log.d(
186+
"debugging",
187+
"alarm deleted: $alarmId, ${reqAlarm.time}, ${reqAlarm.repeatStatus}, ${reqAlarm.repeatEnd}, ${reqAlarm.taskId}, ${reqAlarm.taskName}, ${reqAlarm.taskDesc}, ${reqAlarm.label}, ${reqAlarm.finished}"
188+
)
189+
val alarmIntent =
190+
Intent(context, AlarmReceiver::class.java).apply {
191+
putExtra("alarmId", alarmId)
192+
}
193+
val pendingAlarmIntent =
194+
PendingIntent.getBroadcast(
195+
context,
196+
alarmId.toInt(),
197+
alarmIntent,
198+
PendingIntent.FLAG_IMMUTABLE or
199+
PendingIntent.FLAG_UPDATE_CURRENT
200+
)
201+
val alarmManager =
202+
context.getSystemService(Context.ALARM_SERVICE) as? AlarmManager
203+
alarmManager!!.cancel(pendingAlarmIntent)
204+
}
192205
}
193-
val pendingAlarmIntent =
194-
PendingIntent.getBroadcast(
195-
context,
196-
alarmId.toInt(),
197-
alarmIntent,
198-
PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
199-
)
200-
val alarmManager =
201-
context.getSystemService(Context.ALARM_SERVICE) as? AlarmManager
202-
alarmManager!!.cancel(pendingAlarmIntent)
203-
}
204-
}.start()
206+
.start()
205207
}
206-

‎ios/Runner/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>
16-
<string>conquer_flutter_app</string>
16+
<string>doneify</string>
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>

‎lib/components/AddOrEditLabelDialog.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import 'package:conquer_flutter_app/components/NewColorDialog.dart';
2-
import 'package:conquer_flutter_app/states/labelDAO.dart';
1+
import 'package:doneify/components/NewColorDialog.dart';
2+
import 'package:doneify/states/labelDAO.dart';
33
import 'package:flutter/material.dart';
44

55
import 'package:fluttertoast/fluttertoast.dart';

‎lib/components/BlacklistedAppsDialog.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:conquer_flutter_app/states/nudgerState.dart';
1+
import 'package:doneify/states/nudgerState.dart';
22
import 'package:flutter/cupertino.dart';
33
import 'package:flutter/foundation.dart';
44
import 'package:flutter/material.dart';

‎lib/components/BottomButtons.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:animations/animations.dart';
2-
import 'package:conquer_flutter_app/components/FiltersDialog.dart';
3-
import 'package:conquer_flutter_app/globalColors.dart';
4-
import 'package:conquer_flutter_app/pages/InputModal.dart';
2+
import 'package:doneify/components/FiltersDialog.dart';
3+
import 'package:doneify/globalColors.dart';
4+
import 'package:doneify/pages/InputModal.dart';
55
import 'package:flutter/material.dart';
66

77
class BottomButtons extends StatefulWidget {

‎lib/components/EachDayCell.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import 'package:conquer_flutter_app/components/EachWeekCell.dart';
2-
import 'package:conquer_flutter_app/globalColors.dart';
3-
import 'package:conquer_flutter_app/pages/Day.dart';
4-
import 'package:conquer_flutter_app/pages/Week.dart';
1+
import 'package:doneify/components/EachWeekCell.dart';
2+
import 'package:doneify/globalColors.dart';
3+
import 'package:doneify/pages/Day.dart';
4+
import 'package:doneify/pages/Week.dart';
55
import 'package:flutter/material.dart';
66
import 'package:intl/intl.dart';
77
import 'package:syncfusion_flutter_datepicker/datepicker.dart';

0 commit comments

Comments
 (0)