Skip to content

Commit

Permalink
refactor: cleanup project structure
Browse files Browse the repository at this point in the history
  • Loading branch information
@SuhasDissa
SuhasDissa committed Apr 26, 2024
1 parent 670595d commit 72ec0db
Show file tree
Hide file tree
Showing 136 changed files with 467 additions and 434 deletions.
0 .../com.bnyro.contacts.db.AppDatabase/2.json → ...contacts.data.database.AppDatabase/2.json
View file
File renamed without changes.
0 .../com.bnyro.contacts.db.AppDatabase/3.json → ...contacts.data.database.AppDatabase/3.json
View file
File renamed without changes.
0 .../com.bnyro.contacts.db.AppDatabase/4.json → ...contacts.data.database.AppDatabase/4.json
View file
File renamed without changes.
0 .../com.bnyro.contacts.db.AppDatabase/5.json → ...contacts.data.database.AppDatabase/5.json
View file
File renamed without changes.
16 changes: 8 additions & 8 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
</provider>

<receiver
android:name=".receivers.SmsReceiver"
android:name=".util.receivers.SmsReceiver"
android:exported="true"
android:permission="android.permission.BROADCAST_SMS">

Expand All @@ -235,24 +235,24 @@
</receiver>

<receiver
android:name=".receivers.ReplyReceiver"
android:name=".util.receivers.ReplyReceiver"
android:exported="false" />

<receiver
android:name=".receivers.DeleteSmsReceiver"
android:name=".util.receivers.DeleteSmsReceiver"
android:exported="false" />

<receiver
android:name=".receivers.CopyTextReceiver"
android:name=".util.receivers.CopyTextReceiver"
android:exported="false" />

<receiver
android:name=".receivers.CallActionReceiver"
android:name=".util.receivers.CallActionReceiver"
android:exported="false" />

<!-- BroadcastReceiver that listens for incoming MMS messages -->
<receiver
android:name=".receivers.MmsReceiver"
android:name=".util.receivers.MmsReceiver"
android:exported="true"
android:permission="android.permission.BROADCAST_WAP_PUSH">

Expand All @@ -264,7 +264,7 @@

<!-- Service that delivers messages from the phone "quick response" -->
<service
android:name=".services.HeadlessSmsSendService"
android:name=".util.services.HeadlessSmsSendService"
android:exported="true"
android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE">

Expand All @@ -280,7 +280,7 @@
</service>

<service
android:name=".services.CallService"
android:name=".util.services.CallService"
android:exported="true"
android:foregroundServiceType="phoneCall"
android:permission="android.permission.BIND_INCALL_SERVICE">
Expand Down
14 changes: 7 additions & 7 deletions app/src/main/java/com/bnyro/contacts/App.kt
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package com.bnyro.contacts

import android.app.Application
import com.bnyro.contacts.db.DatabaseHolder
import com.bnyro.contacts.repo.DeviceContactsRepository
import com.bnyro.contacts.repo.DeviceSmsRepo
import com.bnyro.contacts.repo.LocalContactsRepository
import com.bnyro.contacts.repo.LocalSmsRepo
import com.bnyro.contacts.repo.SmsRepository
import com.bnyro.contacts.data.database.DatabaseHolder
import com.bnyro.contacts.domain.repositories.DeviceContactsRepository
import com.bnyro.contacts.domain.repositories.DeviceSmsRepo
import com.bnyro.contacts.domain.repositories.LocalContactsRepository
import com.bnyro.contacts.domain.repositories.LocalSmsRepo
import com.bnyro.contacts.domain.repositories.SmsRepository
import com.bnyro.contacts.util.NotificationHelper
import com.bnyro.contacts.util.Preferences
import com.bnyro.contacts.util.ShortcutHelper
import com.bnyro.contacts.workers.BackupWorker
import com.bnyro.contacts.util.workers.BackupWorker

class App : Application() {
val deviceContactsRepository by lazy {
Expand Down
12 changes: 6 additions & 6 deletions ...java/com/bnyro/contacts/db/AppDatabase.kt → ...yro/contacts/data/database/AppDatabase.kt
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.bnyro.contacts.db
package com.bnyro.contacts.data.database

import androidx.room.AutoMigration
import androidx.room.Database
import androidx.room.RoomDatabase
import com.bnyro.contacts.db.dao.LocalContactsDao
import com.bnyro.contacts.db.dao.LocalSmsDao
import com.bnyro.contacts.db.obj.DbDataItem
import com.bnyro.contacts.db.obj.LocalContact
import com.bnyro.contacts.db.obj.SmsData
import com.bnyro.contacts.data.database.dao.LocalContactsDao
import com.bnyro.contacts.data.database.dao.LocalSmsDao
import com.bnyro.contacts.data.database.obj.DbDataItem
import com.bnyro.contacts.data.database.obj.LocalContact
import com.bnyro.contacts.data.database.obj.SmsData

@Database(
entities = [LocalContact::class, DbDataItem::class, SmsData::class],
Expand Down
2 changes: 1 addition & 1 deletion ...a/com/bnyro/contacts/db/DatabaseHolder.kt → .../contacts/data/database/DatabaseHolder.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bnyro.contacts.db
package com.bnyro.contacts.data.database

import android.content.Context
import androidx.room.Room
Expand Down
8 changes: 4 additions & 4 deletions ...bnyro/contacts/db/dao/LocalContactsDao.kt → ...cts/data/database/dao/LocalContactsDao.kt
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.bnyro.contacts.db.dao
package com.bnyro.contacts.data.database.dao

import androidx.room.Dao
import androidx.room.Insert
import androidx.room.Query
import androidx.room.Transaction
import com.bnyro.contacts.db.obj.ContactWithData
import com.bnyro.contacts.db.obj.DbDataItem
import com.bnyro.contacts.db.obj.LocalContact
import com.bnyro.contacts.data.database.obj.ContactWithData
import com.bnyro.contacts.data.database.obj.DbDataItem
import com.bnyro.contacts.data.database.obj.LocalContact

@Dao
interface LocalContactsDao {
Expand Down
4 changes: 2 additions & 2 deletions .../com/bnyro/contacts/db/dao/LocalSmsDao.kt → ...contacts/data/database/dao/LocalSmsDao.kt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.bnyro.contacts.db.dao
package com.bnyro.contacts.data.database.dao

import androidx.room.Dao
import androidx.room.Insert
import androidx.room.Query
import com.bnyro.contacts.db.obj.SmsData
import com.bnyro.contacts.data.database.obj.SmsData
import kotlinx.coroutines.flow.Flow

@Dao
Expand Down
2 changes: 1 addition & 1 deletion .../bnyro/contacts/db/obj/ContactWithData.kt → ...acts/data/database/obj/ContactWithData.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bnyro.contacts.db.obj
package com.bnyro.contacts.data.database.obj

import androidx.room.Embedded
import androidx.room.Relation
Expand Down
2 changes: 1 addition & 1 deletion ...a/com/bnyro/contacts/db/obj/DbDataItem.kt → .../contacts/data/database/obj/DbDataItem.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bnyro.contacts.db.obj
package com.bnyro.contacts.data.database.obj

import androidx.room.Entity
import androidx.room.PrimaryKey
Expand Down
2 changes: 1 addition & 1 deletion ...com/bnyro/contacts/db/obj/LocalContact.kt → ...ontacts/data/database/obj/LocalContact.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bnyro.contacts.db.obj
package com.bnyro.contacts.data.database.obj

import androidx.room.ColumnInfo
import androidx.room.Entity
Expand Down
2 changes: 1 addition & 1 deletion ...java/com/bnyro/contacts/db/obj/SmsData.kt → ...yro/contacts/data/database/obj/SmsData.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bnyro.contacts.db.obj
package com.bnyro.contacts.data.database.obj

import androidx.room.ColumnInfo
import androidx.room.Entity
Expand Down
2 changes: 1 addition & 1 deletion ...va/com/bnyro/contacts/enums/BackupType.kt → ...bnyro/contacts/domain/enums/BackupType.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bnyro.contacts.enums
package com.bnyro.contacts.domain.enums

enum class BackupType {
NONE,
Expand Down
8 changes: 4 additions & 4 deletions ...bnyro/contacts/enums/ContactAttributes.kt → ...ontacts/domain/enums/ContactAttributes.kt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.bnyro.contacts.enums
package com.bnyro.contacts.domain.enums

import android.provider.ContactsContract
import android.provider.ContactsContract.Intents
import com.bnyro.contacts.R
import com.bnyro.contacts.obj.ContactData
import com.bnyro.contacts.obj.TranslatedType
import com.bnyro.contacts.obj.ValueWithType
import com.bnyro.contacts.domain.model.ContactData
import com.bnyro.contacts.domain.model.TranslatedType
import com.bnyro.contacts.domain.model.ValueWithType
import com.bnyro.contacts.util.CalendarUtils
import com.bnyro.contacts.util.ContactsHelper

Expand Down
2 changes: 1 addition & 1 deletion ...om/bnyro/contacts/enums/ContactsSource.kt → ...o/contacts/domain/enums/ContactsSource.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bnyro.contacts.enums
package com.bnyro.contacts.domain.enums

import androidx.annotation.StringRes
import com.bnyro.contacts.R
Expand Down
2 changes: 1 addition & 1 deletion .../com/bnyro/contacts/enums/DataCategory.kt → ...yro/contacts/domain/enums/DataCategory.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bnyro.contacts.enums
package com.bnyro.contacts.domain.enums

enum class DataCategory {
NUMBER,
Expand Down
2 changes: 1 addition & 1 deletion .../bnyro/contacts/enums/IntentActionType.kt → ...contacts/domain/enums/IntentActionType.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bnyro.contacts.enums
package com.bnyro.contacts.domain.enums

enum class IntentActionType {
WEBSITE,
Expand Down
2 changes: 1 addition & 1 deletion ...ava/com/bnyro/contacts/enums/SortOrder.kt → .../bnyro/contacts/domain/enums/SortOrder.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bnyro.contacts.enums
package com.bnyro.contacts.domain.enums

enum class SortOrder {
FIRSTNAME,
Expand Down
2 changes: 1 addition & 1 deletion ...ava/com/bnyro/contacts/enums/ThemeMode.kt → .../bnyro/contacts/domain/enums/ThemeMode.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bnyro.contacts.enums
package com.bnyro.contacts.domain.enums

enum class ThemeMode {
SYSTEM,
Expand Down
2 changes: 1 addition & 1 deletion ...ava/com/bnyro/contacts/obj/AccountType.kt → ...nyro/contacts/domain/model/AccountType.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bnyro.contacts.obj
package com.bnyro.contacts.domain.model

data class AccountType(
val name: String,
Expand Down
2 changes: 1 addition & 1 deletion ...va/com/bnyro/contacts/obj/CallLogEntry.kt → ...yro/contacts/domain/model/CallLogEntry.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bnyro.contacts.obj
package com.bnyro.contacts.domain.model

data class CallLogEntry(
val phoneNumber: String,
Expand Down
4 changes: 2 additions & 2 deletions ...ava/com/bnyro/contacts/obj/ContactData.kt → ...nyro/contacts/domain/model/ContactData.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.bnyro.contacts.obj
package com.bnyro.contacts.domain.model

import android.graphics.Bitmap
import com.bnyro.contacts.enums.SortOrder
import com.bnyro.contacts.domain.enums.SortOrder

data class ContactData(
var dataId: Int = 0,
Expand Down
2 changes: 1 addition & 1 deletion ...a/com/bnyro/contacts/obj/ContactsGroup.kt → ...ro/contacts/domain/model/ContactsGroup.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bnyro.contacts.obj
package com.bnyro.contacts.domain.model

data class ContactsGroup(
val title: String,
Expand Down
4 changes: 2 additions & 2 deletions ...a/com/bnyro/contacts/obj/FilterOptions.kt → ...ro/contacts/domain/model/FilterOptions.kt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.bnyro.contacts.obj
package com.bnyro.contacts.domain.model

import com.bnyro.contacts.enums.SortOrder
import com.bnyro.contacts.domain.enums.SortOrder
import com.bnyro.contacts.util.Preferences

data class FilterOptions(
Expand Down
2 changes: 1 addition & 1 deletion ...java/com/bnyro/contacts/obj/NavBarItem.kt → ...bnyro/contacts/domain/model/NavBarItem.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bnyro.contacts.obj
package com.bnyro.contacts.domain.model

import androidx.compose.ui.graphics.vector.ImageVector

Expand Down
4 changes: 2 additions & 2 deletions .../java/com/bnyro/contacts/obj/SmsThread.kt → .../bnyro/contacts/domain/model/SmsThread.kt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.bnyro.contacts.obj
package com.bnyro.contacts.domain.model

import com.bnyro.contacts.db.obj.SmsData
import com.bnyro.contacts.data.database.obj.SmsData

data class SmsThread(
val threadId: Long,
Expand Down
2 changes: 1 addition & 1 deletion .../com/bnyro/contacts/obj/TranslatedType.kt → ...o/contacts/domain/model/TranslatedType.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bnyro.contacts.obj
package com.bnyro.contacts.domain.model

import androidx.annotation.StringRes
import ezvcard.parameter.VCardParameter
Expand Down
2 changes: 1 addition & 1 deletion ...a/com/bnyro/contacts/obj/ValueWithType.kt → ...ro/contacts/domain/model/ValueWithType.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bnyro.contacts.obj
package com.bnyro.contacts.domain.model

/**
* A data class that represents a value with its type.
Expand Down
6 changes: 3 additions & 3 deletions ...bnyro/contacts/repo/ContactsRepository.kt → ...domain/repositories/ContactsRepository.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.bnyro.contacts.repo
package com.bnyro.contacts.domain.repositories

import com.bnyro.contacts.obj.ContactData
import com.bnyro.contacts.obj.ContactsGroup
import com.bnyro.contacts.domain.model.ContactData
import com.bnyro.contacts.domain.model.ContactsGroup

interface ContactsRepository {
val label: String
Expand Down
26 changes: 12 additions & 14 deletions ...contacts/repo/DeviceContactsRepository.kt → .../repositories/DeviceContactsRepository.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bnyro.contacts.repo
package com.bnyro.contacts.domain.repositories

import android.Manifest
import android.accounts.AccountManager
Expand All @@ -14,8 +14,6 @@ import android.provider.ContactsContract
import android.provider.ContactsContract.AUTHORITY
import android.provider.ContactsContract.CALLER_IS_SYNCADAPTER
import android.provider.ContactsContract.CommonDataKinds.GroupMembership
import android.provider.ContactsContract.CommonDataKinds.Nickname
import android.provider.ContactsContract.CommonDataKinds.Organization
import android.provider.ContactsContract.CommonDataKinds.Phone
import android.provider.ContactsContract.CommonDataKinds.Photo
import android.provider.ContactsContract.CommonDataKinds.StructuredName
Expand All @@ -24,20 +22,20 @@ import android.provider.ContactsContract.Data
import android.provider.ContactsContract.RawContacts
import androidx.annotation.RequiresPermission
import com.bnyro.contacts.R
import com.bnyro.contacts.enums.BackupType
import com.bnyro.contacts.enums.ListAttribute
import com.bnyro.contacts.enums.StringAttribute
import com.bnyro.contacts.ext.intValue
import com.bnyro.contacts.ext.longValue
import com.bnyro.contacts.ext.notAName
import com.bnyro.contacts.ext.stringValue
import com.bnyro.contacts.obj.AccountType
import com.bnyro.contacts.obj.ContactData
import com.bnyro.contacts.obj.ContactsGroup
import com.bnyro.contacts.obj.ValueWithType
import com.bnyro.contacts.domain.enums.BackupType
import com.bnyro.contacts.domain.enums.ListAttribute
import com.bnyro.contacts.domain.enums.StringAttribute
import com.bnyro.contacts.domain.model.AccountType
import com.bnyro.contacts.domain.model.ContactData
import com.bnyro.contacts.domain.model.ContactsGroup
import com.bnyro.contacts.domain.model.ValueWithType
import com.bnyro.contacts.util.ContactsHelper
import com.bnyro.contacts.util.ImageHelper
import com.bnyro.contacts.util.Preferences
import com.bnyro.contacts.util.extension.intValue
import com.bnyro.contacts.util.extension.longValue
import com.bnyro.contacts.util.extension.notAName
import com.bnyro.contacts.util.extension.stringValue
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext

Expand Down
10 changes: 5 additions & 5 deletions .../com/bnyro/contacts/repo/DeviceSmsRepo.kt → ...acts/domain/repositories/DeviceSmsRepo.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bnyro.contacts.repo
package com.bnyro.contacts.domain.repositories

import android.Manifest
import android.annotation.SuppressLint
Expand All @@ -10,13 +10,13 @@ import android.net.Uri
import android.os.Build
import android.provider.Telephony
import androidx.annotation.RequiresPermission
import com.bnyro.contacts.db.obj.SmsData
import com.bnyro.contacts.ext.intValue
import com.bnyro.contacts.ext.longValue
import com.bnyro.contacts.ext.stringValue
import com.bnyro.contacts.data.database.obj.SmsData
import com.bnyro.contacts.util.ContactsHelper
import com.bnyro.contacts.util.PermissionHelper
import com.bnyro.contacts.util.SmsUtil
import com.bnyro.contacts.util.extension.intValue
import com.bnyro.contacts.util.extension.longValue
import com.bnyro.contacts.util.extension.stringValue
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.flow.Flow
Expand Down
22 changes: 11 additions & 11 deletions .../contacts/repo/LocalContactsRepository.kt → ...n/repositories/LocalContactsRepository.kt
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
package com.bnyro.contacts.repo
package com.bnyro.contacts.domain.repositories

import android.content.Context
import android.graphics.Bitmap
import android.graphics.BitmapFactory
import com.bnyro.contacts.R
import com.bnyro.contacts.db.DatabaseHolder
import com.bnyro.contacts.db.obj.DbDataItem
import com.bnyro.contacts.db.obj.LocalContact
import com.bnyro.contacts.enums.BackupType
import com.bnyro.contacts.enums.DataCategory
import com.bnyro.contacts.ext.pmap
import com.bnyro.contacts.obj.ContactData
import com.bnyro.contacts.obj.ContactsGroup
import com.bnyro.contacts.obj.ValueWithType
import com.bnyro.contacts.data.database.DatabaseHolder
import com.bnyro.contacts.data.database.obj.DbDataItem
import com.bnyro.contacts.data.database.obj.LocalContact
import com.bnyro.contacts.domain.enums.BackupType
import com.bnyro.contacts.domain.enums.DataCategory
import com.bnyro.contacts.domain.model.ContactData
import com.bnyro.contacts.domain.model.ContactsGroup
import com.bnyro.contacts.domain.model.ValueWithType
import com.bnyro.contacts.util.ImageHelper
import com.bnyro.contacts.util.Preferences
import java.io.File
import com.bnyro.contacts.util.extension.pmap
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import java.io.File

class LocalContactsRepository(context: Context) : ContactsRepository {
override val label: String = context.getString(R.string.local)
Expand Down
Loading

0 comments on commit 72ec0db

Please sign in to comment.