REM-884 - Get rid of Timber logging

app/build.gradle

@@ -245,7 +245,6 @@ dependencies {
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
     implementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.14'
     implementation 'com.dropbox.core:dropbox-core-sdk:5.4.6'
-    implementation 'com.jakewharton.timber:timber:5.0.1'
     implementation 'org.dmfs:lib-recur:0.17.1'
     implementation 'org.apache.commons:commons-lang3:3.17.0'
     implementation 'com.github.naz013:ColorSlider:2.0.6'
@@ -262,10 +261,6 @@ dependencies {
 
     implementation 'org.jetbrains.kotlin:kotlin-reflect:2.1.0'
 
-    implementation 'org.slf4j:slf4j-api:2.0.16'
-    implementation 'com.github.tony19:logback-android:3.0.0'
-    testImplementation 'ch.qos.logback:logback-classic:1.5.12'
-
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'androidx.test:core:1.6.1'
     testImplementation 'org.mockito:mockito-core:5.12.0'

app/src/main/java/com/elementary/tasks/birthdays/create/AddBirthdayActivity.kt

@@ -27,11 +27,11 @@ import com.elementary.tasks.core.utils.ui.visible
 import com.elementary.tasks.core.utils.ui.visibleInvisible
 import com.elementary.tasks.core.views.ContactPickerView
 import com.elementary.tasks.databinding.ActivityAddBirthdayBinding
+import com.github.naz013.logging.Logger
 import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import org.threeten.bp.LocalDate
-import timber.log.Timber
 
 class AddBirthdayActivity : BindingActivity<ActivityAddBirthdayBinding>() {
 
@@ -43,6 +43,7 @@ class AddBirthdayActivity : BindingActivity<ActivityAddBirthdayBinding>() {
   override fun onCreate(savedInstanceState: Bundle?) {
     enableEdgeToEdge()
     super.onCreate(savedInstanceState)
+    Logger.i("Opening the birthday screen for id: ${idFromIntent()}")
     binding.scrollView.applyBottomInsets()
     initTopAppBar()
     initContactView()
@@ -169,7 +170,6 @@ class AddBirthdayActivity : BindingActivity<ActivityAddBirthdayBinding>() {
       }
     }
     viewModel.formattedDate.nonNullObserve(this) {
-      Timber.d("onDateChanged: $it")
       binding.birthDate.text = it
     }
     viewModel.isContactAttached.nonNullObserve(this) {

app/src/main/java/com/elementary/tasks/birthdays/create/AddBirthdayViewModel.kt

@@ -132,8 +132,8 @@ class AddBirthdayViewModel(
         updatedAt = dateTimeManager.getNowGmtDateTime(),
         ignoreYear = ignoreYear
       )
-      Logger.logEvent("Birthday saved")
       analyticsEventSender.send(FeatureUsedEvent(Feature.CREATE_BIRTHDAY))
+      Logger.i("Saving the birthday with id: ${birthday.uuId}")
       saveBirthday(birthday)
     }
   }
@@ -146,7 +146,7 @@ class AddBirthdayViewModel(
       updatesHelper.updateTasksWidget()
       updatesHelper.updateBirthdaysWidget()
       workerLauncher.startWork(BirthdayDeleteBackupWorker::class.java, Constants.INTENT_ID, id)
-      Logger.logEvent("Birthday deleted")
+      Logger.i("Deleting the birthday with id: $id")
       postInProgress(false)
       postCommand(Commands.DELETED)
     }

app/src/main/java/com/elementary/tasks/birthdays/dialog/ShowBirthday29Activity.kt

@@ -22,9 +22,9 @@ import com.elementary.tasks.core.utils.ui.transparent
 import com.elementary.tasks.core.utils.ui.visible
 import com.elementary.tasks.databinding.ActivityDialogBirthdayBinding
 import com.elementary.tasks.tests.TestObjects
+import com.github.naz013.logging.Logger
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
-import timber.log.Timber
 
 class ShowBirthday29Activity : BindingActivity<ActivityDialogBirthdayBinding>() {
 
@@ -34,6 +34,8 @@ class ShowBirthday29Activity : BindingActivity<ActivityDialogBirthdayBinding>()
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
+    Logger.i("Showing the birthday full screen for id: ${getId()}")
+
     drawBehindSystemBars(binding.rootView)
 
     binding.buttonOk.setOnClickListener { ok() }
@@ -59,6 +61,7 @@ class ShowBirthday29Activity : BindingActivity<ActivityDialogBirthdayBinding>()
     }
     lifecycle.addObserver(viewModel)
     if (getId().isEmpty() && BuildConfig.DEBUG) {
+      Logger.d("Showing the birthday full screen for test id")
       loadTest()
     }
   }
@@ -110,7 +113,6 @@ class ShowBirthday29Activity : BindingActivity<ActivityDialogBirthdayBinding>()
   }
 
   private fun discardNotification(id: Int) {
-    Timber.d("discardNotification: $id")
     notifier.cancel(id)
   }
 
@@ -120,6 +122,7 @@ class ShowBirthday29Activity : BindingActivity<ActivityDialogBirthdayBinding>()
   }
 
   private fun makeCall() {
+    Logger.i("Making a call for id: ${getId()}")
     permissionFlow.askPermission(Permissions.CALL_PHONE) {
       viewModel.getNumber()?.also {
         TelephonyUtil.makeCall(it, this)
@@ -129,13 +132,15 @@ class ShowBirthday29Activity : BindingActivity<ActivityDialogBirthdayBinding>()
   }
 
   private fun sendSMS() {
+    Logger.i("Sending an SMS for id: ${getId()}")
     viewModel.getNumber()?.also {
       TelephonyUtil.sendSms(it, this)
       updateBirthday()
     } ?: run { ok() }
   }
 
   private fun ok() {
+    Logger.i("Ok button clicked for id: ${getId()}")
     updateBirthday()
   }
 

app/src/main/java/com/elementary/tasks/calendar/data/CalendarDataEngine.kt

@@ -20,6 +20,7 @@ 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.logging.Logger
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.async
@@ -30,7 +31,6 @@ import kotlinx.coroutines.withContext
 import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDateTime
 import org.threeten.bp.LocalTime
-import timber.log.Timber
 
 class CalendarDataEngine(
   birthdaysDao: BirthdaysDao,
@@ -166,7 +166,7 @@ class CalendarDataEngine(
         async { mapBirthdays(birthdays) }
       )
       val duration = System.currentTimeMillis() - millis
-      Timber.d("processData: duration=$duration millis")
+      Logger.d("processData: duration=$duration millis")
       state = EngineState.READY
       withContext(dispatcherProvider.main()) {
         calendarDataEngineBroadcast.sendEvent()
@@ -192,14 +192,14 @@ class CalendarDataEngine(
     val dayMap = mutableMapOf<LocalDate, MutableList<ReminderEventModel>>()
 
     if (!isActive) {
-      Timber.d("mapReminders: cancelled, return")
+      Logger.d("mapReminders: cancelled, return")
       return@withContext
     }
 
     filtered.forEach { mapReminder(it, monthMap, dayMap) }
 
     if (!isActive) {
-      Timber.d("mapReminders: cancelled, return")
+      Logger.d("mapReminders: cancelled, return")
       return@withContext
     }
 
@@ -209,7 +209,7 @@ class CalendarDataEngine(
     }
 
     if (!isActive) {
-      Timber.d("mapReminders: cancelled, return")
+      Logger.d("mapReminders: cancelled, return")
       return@withContext
     }
 
@@ -218,10 +218,10 @@ class CalendarDataEngine(
       dayReminderMap.putAll(dayMap)
     }
 
-    Timber.d("mapReminders: took ${System.currentTimeMillis() - millis} millis")
+    Logger.d("mapReminders: took ${System.currentTimeMillis() - millis} millis")
 
     if (!isActive) {
-      Timber.d("mapReminders: cancelled, return")
+      Logger.d("mapReminders: cancelled, return")
       return@withContext
     }
 
@@ -230,14 +230,14 @@ class CalendarDataEngine(
     dayMap.clear()
 
     if (!isActive) {
-      Timber.d("mapReminders: cancelled, return")
+      Logger.d("mapReminders: cancelled, return")
       return@withContext
     }
 
     filtered.forEach { mapFutureReminder(it, monthMap, dayMap) }
 
     if (!isActive) {
-      Timber.d("mapReminders: cancelled, return")
+      Logger.d("mapReminders: cancelled, return")
       return@withContext
     }
 
@@ -247,7 +247,7 @@ class CalendarDataEngine(
     }
 
     if (!isActive) {
-      Timber.d("mapReminders: cancelled, return")
+      Logger.d("mapReminders: cancelled, return")
       return@withContext
     }
 
@@ -259,7 +259,7 @@ class CalendarDataEngine(
     monthMap.clear()
     dayMap.clear()
 
-    Timber.d("mapReminders: future: took ${System.currentTimeMillis() - millis} millis")
+    Logger.d("mapReminders: future: took ${System.currentTimeMillis() - millis} millis")
   }
 
   private fun mapReminder(
@@ -464,7 +464,7 @@ class CalendarDataEngine(
     list.forEach { mapBirthday(it, monthBirthdaysMap, dayBirthdaysMap) }
 
     if (!isActive) {
-      Timber.d("mapBirthdays: cancelled, return")
+      Logger.d("mapBirthdays: cancelled, return")
       return@withContext
     }
 
@@ -474,7 +474,7 @@ class CalendarDataEngine(
     }
 
     if (!isActive) {
-      Timber.d("mapBirthdays: cancelled, return")
+      Logger.d("mapBirthdays: cancelled, return")
       return@withContext
     }
 
@@ -483,7 +483,7 @@ class CalendarDataEngine(
       dayBirthdayMap.putAll(dayBirthdaysMap)
     }
 
-    Timber.d("mapBirthdays: took ${System.currentTimeMillis() - millis} millis")
+    Logger.d("mapBirthdays: took ${System.currentTimeMillis() - millis} millis")
   }
 
   private fun mapBirthday(

app/src/main/java/com/elementary/tasks/calendar/data/DayLiveData.kt

@@ -7,11 +7,11 @@ 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.logging.Logger
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import org.threeten.bp.LocalDate
-import timber.log.Timber
 
 class DayLiveData(
   private val context: ContextProvider,
@@ -62,7 +62,7 @@ class DayLiveData(
         .sortedBy { it.millis }
         .also { postValue(it) }
         .also {
-          Timber.d("loadData: ${it.size}, date=$date")
+          Logger.d("loadData: ${it.size}, date=$date")
         }
     }
   }

app/src/main/java/com/elementary/tasks/calendar/data/MonthLiveData.kt

@@ -6,11 +6,11 @@ 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.logging.Logger
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import org.threeten.bp.LocalDate
-import timber.log.Timber
 
 class MonthLiveData(
   private val context: ContextProvider,
@@ -57,7 +57,7 @@ class MonthLiveData(
       ).let { mapData(it) }
         .also { postValue(it) }
         .also {
-          Timber.d("loadData: ${it.size}, date=$date")
+          Logger.d("loadData: ${it.size}, date=$date")
         }
     }
   }

app/src/main/java/com/elementary/tasks/calendar/dayview/WeekViewFragment.kt

@@ -14,10 +14,10 @@ import com.elementary.tasks.core.calendar.InfiniteViewPager
 import com.elementary.tasks.core.utils.nonNullObserve
 import com.elementary.tasks.core.utils.ui.GlobalButtonObservable
 import com.elementary.tasks.databinding.FragmentDayViewBinding
+import com.github.naz013.logging.Logger
 import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.threeten.bp.LocalDate
-import timber.log.Timber
 
 class WeekViewFragment : BaseCalendarFragment<FragmentDayViewBinding>() {
 
@@ -91,7 +91,7 @@ class WeekViewFragment : BaseCalendarFragment<FragmentDayViewBinding>() {
   }
 
   private fun scrollPositions(date: LocalDate) {
-    Timber.d("scrollPositions: date=$date")
+    Logger.d("scrollPositions: date=$date")
     datePageChangeListener.jumpToDate(date)
   }
 
@@ -164,10 +164,10 @@ class WeekViewFragment : BaseCalendarFragment<FragmentDayViewBinding>() {
     }
 
     override fun onPageSelected(position: Int) {
-      Timber.d("onPageSelected: position=$position")
+      Logger.d("onPageSelected: position=$position")
       refreshAdapters(position)
       val item = dayPagerAdapter.fragments[getCurrent(position)].getModel() ?: return
-      Timber.d("onPageSelected: item=$item")
+      Logger.d("onPageSelected: item=$item")
       date = item.date
       updateMenuTitles()
       weekViewModel.onDateSelected(date)

app/src/main/java/com/elementary/tasks/calendar/dayview/day/DayEventsListFragment.kt

@@ -21,8 +21,8 @@ import com.elementary.tasks.core.utils.ui.visibleGone
 import com.elementary.tasks.databinding.FragmentEventsListBinding
 import com.elementary.tasks.reminder.ReminderBuilderLauncher
 import com.elementary.tasks.reminder.ReminderResolver
+import com.github.naz013.logging.Logger
 import org.koin.android.ext.android.inject
-import timber.log.Timber
 
 class DayEventsListFragment : BindingFragment<FragmentEventsListBinding>() {
 
@@ -93,7 +93,7 @@ class DayEventsListFragment : BindingFragment<FragmentEventsListBinding>() {
     reloadView()
 
     viewModel.events.nonNullObserve(viewLifecycleOwner) {
-      Timber.d("nonNullObserve: $dayPagerItem, ${it.size}")
+      Logger.d("nonNullObserve: $dayPagerItem, ${it.size}")
       dayEventsAdapter.setData(it)
       reloadView()
     }

app/src/main/java/com/elementary/tasks/calendar/monthview/CalendarFragment.kt

@@ -13,11 +13,11 @@ import com.elementary.tasks.core.analytics.ScreenUsedEvent
 import com.elementary.tasks.core.calendar.WeekdayArrayAdapter
 import com.elementary.tasks.core.protocol.StartDayOfWeekProtocol
 import com.elementary.tasks.databinding.FragmentFlextCalBinding
+import com.github.naz013.logging.Logger
 import org.apache.commons.lang3.StringUtils
 import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDateTime
 import org.threeten.bp.LocalTime
-import timber.log.Timber
 
 class CalendarFragment :
   BaseCalendarFragment<FragmentFlextCalBinding>(),
@@ -117,7 +117,7 @@ class CalendarFragment :
         override fun onPageScrollStateChanged(state: Int) {
           super.onPageScrollStateChanged(state)
           if (state == ViewPager2.SCROLL_STATE_IDLE) {
-            Timber.d("onPageScrollStateChanged: ${binding.infiniteViewPager.currentItem}")
+            Logger.d("onPageScrollStateChanged: ${binding.infiniteViewPager.currentItem}")
             when (binding.infiniteViewPager.currentItem) {
               0 -> {
                 // move to 4th position, current - 1
@@ -152,7 +152,7 @@ class CalendarFragment :
 
         override fun onPageSelected(position: Int) {
           super.onPageSelected(position)
-          Timber.d("onPageSelected: $position")
+          Logger.d("onPageSelected: $position")
           if (position == 1 || position == 4) {
             updateMenuTitles(currentDate)
             infinitePagerAdapter.selectPosition(position)