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

REM-890 - Add feature common module #253

Merged
merged 1 commit into from
Dec 21, 2024
Merged
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ plugins {
alias(libs.plugins.navigation.safeargs)
alias(libs.plugins.crashlytics.gradle)
alias(libs.plugins.google.services)
alias(libs.plugins.ksp)
alias(libs.plugins.ktlint)
}

Expand Down Expand Up @@ -189,6 +188,7 @@ dependencies {
implementation(project(":logging"))
implementation(project(":analytics"))
implementation(project(":repository"))
implementation(project(":feature-common"))

implementation(libs.google.api.services.calendar) {
exclude(group = "com.google.guava", module = "listenablefuture")
Expand Down Expand Up @@ -237,10 +237,6 @@ dependencies {
implementation(libs.androidx.lifecycle.common.java8)
implementation(libs.androidx.lifecycle.livedata.ktx)

implementation(libs.androidx.room.ktx)
implementation(libs.androidx.room.runtime)
ksp(libs.androidx.room.compiler)

implementation(libs.androidx.navigation.fragment.ktx)
implementation(libs.androidx.navigation.ui.ktx)

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/elementary/tasks/ReminderApp.kt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import com.elementary.tasks.core.utils.Notifier
import com.elementary.tasks.core.utils.completableModule
import com.elementary.tasks.core.utils.converterModule
import com.elementary.tasks.core.utils.dataFlowRepositoryModule
import com.elementary.tasks.core.utils.dbModule
import com.elementary.tasks.core.utils.newUtilsModule
import com.elementary.tasks.core.utils.params.RemotePrefs
import com.elementary.tasks.core.utils.storageModule
Expand All @@ -30,6 +29,7 @@ import com.elementary.tasks.home.homeModule
import com.elementary.tasks.notes.noteModule
import com.elementary.tasks.reminder.reminderModule
import com.elementary.tasks.voice.voiceModule
import com.github.naz013.feature.common.featureCommonModule
import com.github.naz013.logging.initLogging
import com.github.naz013.repository.repositoryModule
import org.koin.android.ext.android.get
Expand Down Expand Up @@ -66,7 +66,7 @@ class ReminderApp : MultiDexApplication(), KoinComponent {
modules(
listOf(
utilModule,
dbModule(this@ReminderApp),
featureCommonModule,
dataFlowRepositoryModule,
storageModule,
completableModule,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ import com.elementary.tasks.core.os.Permissions
import com.elementary.tasks.core.os.datapicker.ContactPicker
import com.elementary.tasks.core.services.PermanentBirthdayReceiver
import com.elementary.tasks.core.utils.Constants
import com.elementary.tasks.core.utils.nonNullObserve
import com.github.naz013.feature.common.livedata.nonNullObserve
import com.elementary.tasks.core.utils.ui.DateTimePickerProvider
import com.elementary.tasks.core.utils.ui.applyBottomInsets
import com.elementary.tasks.core.utils.ui.applyTopInsets
import com.elementary.tasks.core.utils.ui.gone
import com.github.naz013.feature.common.android.applyBottomInsets
import com.github.naz013.feature.common.android.applyTopInsets
import com.github.naz013.feature.common.android.gone
import com.elementary.tasks.core.utils.ui.listenScrollableView
import com.elementary.tasks.core.utils.ui.showError
import com.elementary.tasks.core.utils.ui.trimmedText
import com.elementary.tasks.core.utils.ui.visible
import com.elementary.tasks.core.utils.ui.visibleInvisible
import com.github.naz013.feature.common.android.visible
import com.github.naz013.feature.common.android.visibleInvisible
import com.elementary.tasks.core.views.ContactPickerView
import com.elementary.tasks.databinding.ActivityAddBirthdayBinding
import com.github.naz013.logging.Logger
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import com.elementary.tasks.core.data.ui.birthday.UiBirthdayEdit
import com.elementary.tasks.core.os.IntentDataHolder
import com.elementary.tasks.core.os.contacts.ContactsReader
import com.elementary.tasks.core.utils.Constants
import com.elementary.tasks.core.utils.DispatcherProvider
import com.github.naz013.feature.common.coroutine.DispatcherProvider
import com.elementary.tasks.core.utils.Notifier
import com.elementary.tasks.core.utils.datetime.DateTimeManager
import com.elementary.tasks.core.utils.io.UriReader
import com.elementary.tasks.core.utils.mutableLiveDataOf
import com.elementary.tasks.core.utils.toLiveData
import com.github.naz013.feature.common.viewmodel.mutableLiveDataOf
import com.github.naz013.feature.common.livedata.toLiveData
import com.elementary.tasks.core.utils.work.WorkerLauncher
import com.github.naz013.analytics.AnalyticsEventSender
import com.github.naz013.analytics.Feature
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ import com.elementary.tasks.core.arch.BindingActivity
import com.elementary.tasks.core.data.Commands
import com.elementary.tasks.core.data.ui.birthday.UiBirthdayShow
import com.elementary.tasks.core.os.Permissions
import com.elementary.tasks.core.os.buildIntent
import com.elementary.tasks.core.os.startActivity
import com.elementary.tasks.core.os.toast
import com.github.naz013.feature.common.android.buildIntent
import com.github.naz013.feature.common.android.startActivity
import com.github.naz013.feature.common.android.toast
import com.elementary.tasks.core.utils.Constants
import com.elementary.tasks.core.utils.TelephonyUtil
import com.elementary.tasks.core.utils.ThemeProvider
import com.elementary.tasks.core.utils.nonNullObserve
import com.elementary.tasks.core.utils.ui.gone
import com.github.naz013.feature.common.livedata.nonNullObserve
import com.github.naz013.feature.common.android.gone
import com.elementary.tasks.core.utils.ui.setTextOrHide
import com.elementary.tasks.core.utils.ui.transparent
import com.elementary.tasks.core.utils.ui.visible
import com.github.naz013.feature.common.android.transparent
import com.github.naz013.feature.common.android.visible
import com.elementary.tasks.databinding.ActivityDialogBirthdayBinding
import com.elementary.tasks.tests.TestObjects
import com.github.naz013.logging.Logger
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import com.elementary.tasks.core.data.Commands
import com.elementary.tasks.core.data.adapter.birthday.UiBirthdayShowAdapter
import com.elementary.tasks.core.data.ui.birthday.UiBirthdayShow
import com.elementary.tasks.core.utils.Constants
import com.elementary.tasks.core.utils.DispatcherProvider
import com.elementary.tasks.core.utils.Notifier
import com.elementary.tasks.core.utils.datetime.DateTimeManager
import com.elementary.tasks.core.utils.mutableLiveDataOf
import com.elementary.tasks.core.utils.toLiveData
import com.elementary.tasks.core.utils.work.WorkerLauncher
import com.github.naz013.domain.Birthday
import com.github.naz013.feature.common.coroutine.DispatcherProvider
import com.github.naz013.feature.common.livedata.toLiveData
import com.github.naz013.feature.common.viewmodel.mutableLiveDataOf
import com.github.naz013.repository.BirthdayRepository
import kotlinx.coroutines.launch
import org.threeten.bp.LocalDate
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import android.view.ViewGroup
import com.elementary.tasks.core.binding.HolderBinding
import com.elementary.tasks.core.data.ui.birthday.UiBirthdayList
import com.elementary.tasks.core.utils.ListActions
import com.elementary.tasks.core.utils.append
import com.elementary.tasks.core.utils.listOfNotEmpty
import com.elementary.tasks.core.utils.ui.inflater
import com.elementary.tasks.core.utils.ui.visibleGone
import com.github.naz013.feature.common.append
import com.github.naz013.feature.common.listOfNotEmpty
import com.github.naz013.feature.common.android.inflater
import com.github.naz013.feature.common.android.visibleGone
import com.elementary.tasks.databinding.ListItemBirthdayBinding

class BirthdayHolder(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ import com.github.naz013.analytics.Screen
import com.github.naz013.analytics.ScreenUsedEvent
import com.elementary.tasks.core.data.ui.birthday.UiBirthdayList
import com.elementary.tasks.core.interfaces.ActionsListener
import com.elementary.tasks.core.os.SystemServiceProvider
import com.github.naz013.feature.common.android.SystemServiceProvider
import com.elementary.tasks.core.utils.ListActions
import com.elementary.tasks.core.utils.nonNullObserve
import com.github.naz013.feature.common.livedata.nonNullObserve
import com.elementary.tasks.core.utils.ui.SearchMenuHandler
import com.elementary.tasks.core.utils.ui.ViewUtils
import com.elementary.tasks.core.utils.ui.applyBottomInsets
import com.elementary.tasks.core.utils.ui.visibleGone
import com.github.naz013.feature.common.android.applyBottomInsets
import com.github.naz013.feature.common.android.visibleGone
import com.elementary.tasks.databinding.FragmentBirthdaysBinding
import com.elementary.tasks.home.eventsview.BaseSubEventsFragment
import com.elementary.tasks.pin.PinLoginActivity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import com.elementary.tasks.core.data.Commands
import com.elementary.tasks.core.data.adapter.birthday.UiBirthdayListAdapter
import com.elementary.tasks.core.data.livedata.SearchableLiveData
import com.elementary.tasks.core.utils.Constants
import com.elementary.tasks.core.utils.DispatcherProvider
import com.elementary.tasks.core.utils.Notifier
import com.elementary.tasks.core.utils.work.WorkerLauncher
import com.github.naz013.domain.Birthday
import com.github.naz013.feature.common.coroutine.DispatcherProvider
import com.github.naz013.repository.BirthdayRepository
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ import com.elementary.tasks.core.os.Permissions
import com.elementary.tasks.core.utils.Constants
import com.elementary.tasks.core.utils.Module
import com.elementary.tasks.core.utils.TelephonyUtil
import com.elementary.tasks.core.utils.nonNullObserve
import com.elementary.tasks.core.utils.ui.applyBottomInsets
import com.elementary.tasks.core.utils.ui.applyBottomInsetsMargin
import com.elementary.tasks.core.utils.ui.applyTopInsets
import com.elementary.tasks.core.utils.ui.gone
import com.elementary.tasks.core.utils.ui.visible
import com.elementary.tasks.core.utils.ui.visibleGone
import com.github.naz013.feature.common.livedata.nonNullObserve
import com.github.naz013.feature.common.android.applyBottomInsets
import com.github.naz013.feature.common.android.applyBottomInsetsMargin
import com.github.naz013.feature.common.android.applyTopInsets
import com.github.naz013.feature.common.android.gone
import com.github.naz013.feature.common.android.visible
import com.github.naz013.feature.common.android.visibleGone
import com.elementary.tasks.databinding.ActivityBirthdayPreviewBinding
import com.elementary.tasks.pin.PinLoginActivity
import org.koin.androidx.viewmodel.ext.android.viewModel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import com.elementary.tasks.core.data.Commands
import com.elementary.tasks.core.data.adapter.birthday.UiBirthdayPreviewAdapter
import com.elementary.tasks.core.data.ui.birthday.UiBirthdayPreview
import com.elementary.tasks.core.utils.Constants
import com.elementary.tasks.core.utils.DispatcherProvider
import com.elementary.tasks.core.utils.Notifier
import com.elementary.tasks.core.utils.mutableLiveDataOf
import com.elementary.tasks.core.utils.toLiveData
import com.elementary.tasks.core.utils.work.WorkerLauncher
import com.github.naz013.analytics.AnalyticsEventSender
import com.github.naz013.analytics.Feature
import com.github.naz013.analytics.FeatureUsedEvent
import com.github.naz013.feature.common.coroutine.DispatcherProvider
import com.github.naz013.feature.common.livedata.toLiveData
import com.github.naz013.feature.common.viewmodel.mutableLiveDataOf
import com.github.naz013.repository.BirthdayRepository
import kotlinx.coroutines.launch

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import com.elementary.tasks.core.cloud.SyncManagers
import com.elementary.tasks.core.cloud.converters.IndexTypes
import com.elementary.tasks.core.cloud.storages.CompositeStorage
import com.elementary.tasks.core.utils.Constants
import com.elementary.tasks.core.utils.DispatcherProvider
import com.github.naz013.feature.common.coroutine.DispatcherProvider
import kotlinx.coroutines.withContext

class BirthdayDeleteBackupWorker(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import androidx.work.CoroutineWorker
import androidx.work.WorkerParameters
import com.elementary.tasks.core.os.Permissions
import com.elementary.tasks.core.os.contacts.ContactsReader
import com.elementary.tasks.core.utils.DispatcherProvider
import com.github.naz013.feature.common.coroutine.DispatcherProvider
import com.elementary.tasks.core.utils.datetime.DateTimeManager
import com.elementary.tasks.core.utils.io.readString
import com.github.naz013.feature.common.readString
import com.github.naz013.domain.Birthday
import com.github.naz013.repository.BirthdayRepository
import kotlinx.coroutines.withContext
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import android.text.TextUtils
import com.elementary.tasks.core.os.Permissions
import com.elementary.tasks.core.os.contacts.ContactsReader
import com.elementary.tasks.core.utils.datetime.DateTimeManager
import com.elementary.tasks.core.utils.io.readLong
import com.elementary.tasks.core.utils.io.readString
import com.github.naz013.feature.common.readLong
import com.github.naz013.feature.common.readString
import com.github.naz013.domain.Birthday
import com.github.naz013.repository.BirthdayRepository

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import com.elementary.tasks.core.cloud.DataFlow
import com.elementary.tasks.core.cloud.SyncManagers
import com.elementary.tasks.core.cloud.storages.CompositeStorage
import com.elementary.tasks.core.utils.Constants
import com.elementary.tasks.core.utils.DispatcherProvider
import com.github.naz013.feature.common.coroutine.DispatcherProvider
import kotlinx.coroutines.withContext

class SingleBackupWorker(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import com.elementary.tasks.core.data.ui.UiReminderListData
import com.elementary.tasks.core.data.ui.birthday.UiBirthdayList
import com.elementary.tasks.core.data.ui.reminder.UiReminderType
import com.elementary.tasks.core.utils.Configs
import com.elementary.tasks.core.utils.DispatcherProvider
import com.github.naz013.feature.common.coroutine.DispatcherProvider
import com.elementary.tasks.core.utils.datetime.DateTimeManager
import com.elementary.tasks.core.utils.datetime.recurrence.RecurrenceDateTimeTag
import com.elementary.tasks.core.utils.datetime.recurrence.RecurrenceManager
import com.elementary.tasks.core.utils.datetime.recurrence.TagType
import com.elementary.tasks.core.utils.getNonNullList
import com.elementary.tasks.core.utils.plusMillis
import com.github.naz013.feature.common.livedata.getNonNullList
import com.github.naz013.feature.common.plusMillis
import com.github.naz013.domain.Birthday
import com.github.naz013.domain.Reminder
import com.github.naz013.logging.Logger
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package com.elementary.tasks.calendar.data
import androidx.annotation.MainThread
import androidx.lifecycle.LiveData
import com.elementary.tasks.core.calendar.EventsCursor
import com.elementary.tasks.core.os.ContextProvider
import com.elementary.tasks.core.utils.DispatcherProvider
import com.elementary.tasks.core.utils.ThemeProvider
import com.elementary.tasks.core.utils.params.Prefs
import com.github.naz013.feature.common.android.ContextProvider
import com.github.naz013.feature.common.coroutine.DispatcherProvider
import com.github.naz013.logging.Logger
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job
Expand Down Expand Up @@ -83,6 +83,7 @@ class DayLiveData(
map
)
}

is ReminderEventModel -> {
val eventTime = model.model.due?.localDateTime ?: continue
setEvent(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package com.elementary.tasks.calendar.data

import androidx.lifecycle.LiveData
import com.elementary.tasks.core.calendar.EventsCursor
import com.elementary.tasks.core.os.ContextProvider
import com.elementary.tasks.core.utils.DispatcherProvider
import com.elementary.tasks.core.utils.ThemeProvider
import com.elementary.tasks.core.utils.params.Prefs
import com.github.naz013.feature.common.android.ContextProvider
import com.github.naz013.feature.common.coroutine.DispatcherProvider
import com.github.naz013.logging.Logger
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job
Expand Down Expand Up @@ -78,6 +78,7 @@ class MonthLiveData(
map
)
}

is ReminderEventModel -> {
val eventTime = model.model.due?.localDateTime ?: continue
setEvent(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import com.elementary.tasks.calendar.dayview.pager.DayPagerAdapter
import com.elementary.tasks.calendar.dayview.weekheader.WeekAdapter
import com.elementary.tasks.core.calendar.InfinitePagerAdapter
import com.elementary.tasks.core.calendar.InfiniteViewPager
import com.elementary.tasks.core.utils.nonNullObserve
import com.github.naz013.feature.common.livedata.nonNullObserve
import com.elementary.tasks.core.utils.ui.GlobalButtonObservable
import com.elementary.tasks.databinding.FragmentDayViewBinding
import com.github.naz013.logging.Logger
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,20 @@ package com.elementary.tasks.calendar.dayview
import com.elementary.tasks.calendar.dayview.weekheader.WeekDay
import com.elementary.tasks.calendar.dayview.weekheader.WeekHeaderController
import com.elementary.tasks.core.arch.BaseProgressViewModel
import com.elementary.tasks.core.arch.OneWayLiveData
import com.elementary.tasks.core.utils.DispatcherProvider
import com.github.naz013.feature.common.coroutine.DispatcherProvider
import com.github.naz013.feature.common.livedata.toLiveData
import com.github.naz013.feature.common.viewmodel.mutableLiveDataOf
import org.threeten.bp.LocalDate

class WeekViewModel(
dispatcherProvider: DispatcherProvider,
private val weekHeaderController: WeekHeaderController
) : BaseProgressViewModel(dispatcherProvider) {

val week = OneWayLiveData<List<WeekDay>>()
private val _week = mutableLiveDataOf<List<WeekDay>>()
val week = _week.toLiveData()

fun onDateSelected(date: LocalDate) {
week.viewModelPost(weekHeaderController.calculateWeek(date))
_week.postValue(weekHeaderController.calculateWeek(date))
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import com.elementary.tasks.core.arch.BindingFragment
import com.elementary.tasks.core.interfaces.ActionsListener
import com.elementary.tasks.core.utils.ListActions
import com.elementary.tasks.core.utils.ThemeProvider
import com.elementary.tasks.core.utils.nonNullObserve
import com.elementary.tasks.core.utils.ui.visibleGone
import com.github.naz013.feature.common.livedata.nonNullObserve
import com.github.naz013.feature.common.android.visibleGone
import com.elementary.tasks.databinding.FragmentEventsListBinding
import com.elementary.tasks.reminder.ReminderBuilderLauncher
import com.elementary.tasks.reminder.ReminderResolver
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import com.elementary.tasks.core.controller.EventControlFactory
import com.elementary.tasks.core.data.Commands
import com.elementary.tasks.core.data.ui.UiReminderListData
import com.elementary.tasks.core.utils.Constants
import com.elementary.tasks.core.utils.DispatcherProvider
import com.github.naz013.feature.common.coroutine.DispatcherProvider
import com.elementary.tasks.core.utils.work.WorkerLauncher
import com.elementary.tasks.reminder.work.ReminderSingleBackupWorker
import com.github.naz013.repository.BirthdayRepository
Expand Down
Loading
Loading