refactor the code

eslamfaisal · Sep 8, 2021 · 6f8b255 · 6f8b255
1 parent d8899be
commit 6f8b255
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 29 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.EfficientAlarm">
         <activity
-            android:name=".MainActivity"
+            android:name=".ui.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -27,17 +27,17 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".AlarmActivity">
+        <activity android:name=".ui.AlarmActivity">
 
         </activity>
 
         <service
-            android:name=".AlarmsForegroundService"
+            android:name=".services.AlarmsForegroundService"
             android:enabled="true"
             android:exported="false" />
 
         <receiver
-            android:name=".AlarmsReceiver"
+            android:name=".services.AlarmsReceiver"
             android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />

diff --git a/...ava/com/eslam/efficientalarm/OnDateSet.kt → ...lam/efficientalarm/listeners/OnDateSet.kt b/...ava/com/eslam/efficientalarm/OnDateSet.kt → ...lam/efficientalarm/listeners/OnDateSet.kt
@@ -1,4 +1,4 @@
-package com.eslam.efficientalarm
+package com.eslam.efficientalarm.listeners
 
 interface OnDateSet {
     fun pickedDate(year: Int, month: Int, day: Int)

diff --git a/...ava/com/eslam/efficientalarm/OnTimeSet.kt → ...lam/efficientalarm/listeners/OnTimeSet.kt b/...ava/com/eslam/efficientalarm/OnTimeSet.kt → ...lam/efficientalarm/listeners/OnTimeSet.kt
@@ -1,4 +1,4 @@
-package com.eslam.efficientalarm
+package com.eslam.efficientalarm.listeners
 
 interface OnTimeSet {
     fun pickedTime(hoursOfDay: Int, minutes: Int)

diff --git a/...ava/com/eslam/efficientalarm/AlarmData.kt → ...m/eslam/efficientalarm/model/AlarmData.kt b/...ava/com/eslam/efficientalarm/AlarmData.kt → ...m/eslam/efficientalarm/model/AlarmData.kt
@@ -1,4 +1,4 @@
-package com.eslam.efficientalarm
+package com.eslam.efficientalarm.model
 
 import android.os.Parcelable
 import androidx.annotation.Keep

diff --git a/...efficientalarm/AlarmsForegroundService.kt → ...alarm/services/AlarmsForegroundService.kt b/...efficientalarm/AlarmsForegroundService.kt → ...alarm/services/AlarmsForegroundService.kt
@@ -1,4 +1,4 @@
-package com.eslam.efficientalarm
+package com.eslam.efficientalarm.services
 
 import android.app.Notification
 import android.app.NotificationChannel
@@ -12,9 +12,13 @@ import android.os.IBinder
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.PRIORITY_MIN
-import com.eslam.efficientalarm.Constants.ALARM_DATA
-import com.eslam.efficientalarm.Constants.OPEN_TYPE
-import com.eslam.efficientalarm.Constants.REFRESH
+import com.eslam.efficientalarm.model.AlarmData
+import com.eslam.efficientalarm.R
+import com.eslam.efficientalarm.ui.AlarmActivity
+import com.eslam.efficientalarm.utils.Constants.ALARM_DATA
+import com.eslam.efficientalarm.utils.Constants.OPEN_TYPE
+import com.eslam.efficientalarm.utils.Constants.REFRESH
+import com.eslam.efficientalarm.utils.scheduleAlarm
 import com.google.gson.Gson
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers.IO

diff --git a/...om/eslam/efficientalarm/AlarmsReceiver.kt → ...efficientalarm/services/AlarmsReceiver.kt b/...om/eslam/efficientalarm/AlarmsReceiver.kt → ...efficientalarm/services/AlarmsReceiver.kt
@@ -1,13 +1,13 @@
-package com.eslam.efficientalarm
+package com.eslam.efficientalarm.services
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.eslam.efficientalarm.Constants.BOOT_COMPLETED
-import com.eslam.efficientalarm.Constants.FIRE_ALARM
-import com.eslam.efficientalarm.Constants.OPEN_TYPE
-import com.eslam.efficientalarm.Constants.REFRESH
-import com.eslam.efficientalarm.Constants.alarm_id
+import com.eslam.efficientalarm.utils.Constants.BOOT_COMPLETED
+import com.eslam.efficientalarm.utils.Constants.FIRE_ALARM
+import com.eslam.efficientalarm.utils.Constants.OPEN_TYPE
+import com.eslam.efficientalarm.utils.Constants.REFRESH
+import com.eslam.efficientalarm.utils.Constants.alarm_id
 
 class AlarmsReceiver : BroadcastReceiver() {
 

diff --git a/...com/eslam/efficientalarm/AlarmActivity.kt → .../eslam/efficientalarm/ui/AlarmActivity.kt b/...com/eslam/efficientalarm/AlarmActivity.kt → .../eslam/efficientalarm/ui/AlarmActivity.kt
@@ -1,14 +1,14 @@
-package com.eslam.efficientalarm
+package com.eslam.efficientalarm.ui
 
 import android.content.Context
 import android.os.Bundle
 import android.os.PowerManager
 import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
-import com.eslam.efficientalarm.AlarmData
-import com.eslam.efficientalarm.Constants
-import com.eslam.efficientalarm.NotificationHelper.cancelNotification
-import com.eslam.efficientalarm.NotificationHelper.runNotification
+import com.eslam.efficientalarm.model.AlarmData
+import com.eslam.efficientalarm.utils.Constants
+import com.eslam.efficientalarm.utils.NotificationHelper.cancelNotification
+import com.eslam.efficientalarm.utils.NotificationHelper.runNotification
 import com.eslam.efficientalarm.R
 import kotlinx.android.synthetic.main.activity_alarm.*
 import java.util.*

diff --git a/...slam/efficientalarm/DatePickerFragment.kt → ...m/efficientalarm/ui/DatePickerFragment.kt b/...slam/efficientalarm/DatePickerFragment.kt → ...m/efficientalarm/ui/DatePickerFragment.kt
@@ -1,10 +1,11 @@
-package com.eslam.efficientalarm
+package com.eslam.efficientalarm.ui
 
 import android.app.DatePickerDialog
 import android.app.Dialog
 import android.os.Bundle
 import android.widget.DatePicker
 import androidx.fragment.app.DialogFragment
+import com.eslam.efficientalarm.listeners.OnDateSet
 import java.util.*
 
 class DatePickerFragment constructor(val dateListener: OnDateSet) : DialogFragment(),

diff --git a/.../com/eslam/efficientalarm/MainActivity.kt → ...m/eslam/efficientalarm/ui/MainActivity.kt b/.../com/eslam/efficientalarm/MainActivity.kt → ...m/eslam/efficientalarm/ui/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.eslam.efficientalarm
+package com.eslam.efficientalarm.ui
 
 import android.Manifest
 import android.content.Context
@@ -17,6 +17,11 @@ import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
+import com.eslam.efficientalarm.model.AlarmData
+import com.eslam.efficientalarm.R
+import com.eslam.efficientalarm.listeners.OnDateSet
+import com.eslam.efficientalarm.listeners.OnTimeSet
+import com.eslam.efficientalarm.utils.scheduleAlarm
 import com.google.gson.Gson
 import kotlinx.android.synthetic.main.activity_main.*
 import java.util.*

diff --git a/...slam/efficientalarm/TimePickerFragment.kt → ...m/efficientalarm/ui/TimePickerFragment.kt b/...slam/efficientalarm/TimePickerFragment.kt → ...m/efficientalarm/ui/TimePickerFragment.kt
@@ -1,10 +1,11 @@
-package com.eslam.efficientalarm
+package com.eslam.efficientalarm.ui
 
 import android.app.Dialog
 import android.app.TimePickerDialog
 import android.os.Bundle
 import android.widget.TimePicker
 import androidx.fragment.app.DialogFragment
+import com.eslam.efficientalarm.listeners.OnTimeSet
 import java.util.*
 
 class TimePickerFragment constructor(val timeListener: OnTimeSet? = null) : DialogFragment(),

diff --git a/.../com/eslam/efficientalarm/AlarmManager.kt → ...slam/efficientalarm/utils/AlarmManager.kt b/.../com/eslam/efficientalarm/AlarmManager.kt → ...slam/efficientalarm/utils/AlarmManager.kt
@@ -1,4 +1,4 @@
-package com.eslam.efficientalarm
+package com.eslam.efficientalarm.utils
 
 import android.app.AlarmManager
 import android.app.PendingIntent
@@ -9,7 +9,9 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Build
 import android.util.Log
-import com.eslam.efficientalarm.Constants.alarm_id
+import com.eslam.efficientalarm.model.AlarmData
+import com.eslam.efficientalarm.services.AlarmsReceiver
+import com.eslam.efficientalarm.utils.Constants.alarm_id
 import java.util.*
 import java.util.concurrent.TimeUnit
 

diff --git a/...ava/com/eslam/efficientalarm/Constants.kt → ...m/eslam/efficientalarm/utils/Constants.kt b/...ava/com/eslam/efficientalarm/Constants.kt → ...m/eslam/efficientalarm/utils/Constants.kt
@@ -1,4 +1,4 @@
-package com.eslam.efficientalarm
+package com.eslam.efficientalarm.utils
 
 object Constants {
     const val alarm_id = "alarm_id"

diff --git a/...slam/efficientalarm/NotificationHelper.kt → ...fficientalarm/utils/NotificationHelper.kt b/...slam/efficientalarm/NotificationHelper.kt → ...fficientalarm/utils/NotificationHelper.kt
@@ -1,4 +1,4 @@
-package com.eslam.efficientalarm
+package com.eslam.efficientalarm.utils
 
 import android.app.Notification
 import android.app.NotificationChannel
@@ -9,6 +9,8 @@ import android.content.Intent
 import android.media.RingtoneManager
 import android.os.Build
 import androidx.core.app.NotificationCompat
+import com.eslam.efficientalarm.R
+import com.eslam.efficientalarm.ui.MainActivity
 
 object NotificationHelper {
     private var NotificationID = 1005