Fix Timber and Logger integration problem

Author: enginebai

app/src/main/java/com/enginebai/project/AppContext.kt

@@ -1,14 +1,18 @@
 package com.enginebai.project
 
 import android.app.Application
+import com.enginebai.base.di.gsonModule
 import com.enginebai.base.di.loggingModule
 import com.enginebai.base.di.networkModule
+import com.orhanobut.logger.AndroidLogAdapter
+import com.orhanobut.logger.FormatStrategy
 import com.orhanobut.logger.Logger
 import org.koin.android.ext.android.get
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 import org.koin.core.context.startKoin
 import org.koin.core.logger.Level
+import org.koin.core.parameter.parametersOf
 import timber.log.Timber
 
 class AppContext : Application() {
@@ -23,12 +27,14 @@ class AppContext : Application() {
         startKoin {
             androidLogger(level = Level.INFO)
             androidContext(this@AppContext)
-            modules(listOf(networkModule, loggingModule))
+            modules(listOf(gsonModule, networkModule, loggingModule))
         }
     }
 
     private fun initLogging() {
-        Logger.addLogAdapter(get())
+        val formatStrategy: FormatStrategy = get()
+        val logAdapter: AndroidLogAdapter = get { parametersOf(formatStrategy) }
+        Logger.addLogAdapter(logAdapter)
         Timber.plant(get())
     }
 }

base/src/main/java/com/enginebai/base/di/UtilsModule.kt

@@ -1,20 +1,34 @@
 package com.enginebai.base.di
 
 import com.enginebai.base.BuildConfig
-import com.enginebai.base.utils.logging.MyCustomLoggingDebugTree
+import com.enginebai.base.utils.logging.TimberLoggerDebugTree
+import com.google.gson.Gson
 import com.orhanobut.logger.AndroidLogAdapter
-import com.orhanobut.logger.LogAdapter
+import com.orhanobut.logger.FormatStrategy
+import com.orhanobut.logger.PrettyFormatStrategy
 import org.koin.dsl.module
 import timber.log.Timber
 
 val loggingModule = module {
-    single<LogAdapter> {
-        object : AndroidLogAdapter() {
+    single<AndroidLogAdapter> { (formatStrategy: FormatStrategy) ->
+        object : AndroidLogAdapter(formatStrategy) {
             override fun isLoggable(priority: Int, tag: String?): Boolean {
                 return BuildConfig.DEBUG
             }
         }
     }
 
-    single<Timber.Tree> { MyCustomLoggingDebugTree() }
+    single<FormatStrategy> {
+        PrettyFormatStrategy.newBuilder()
+            .tag("enginebai")
+            .methodCount(3)
+            .methodOffset(5) // avoid timber internal stack track
+            .build()
+    }
+
+    single<Timber.Tree> { TimberLoggerDebugTree() }
+}
+
+val gsonModule = module {
+    single { Gson() }
 }

base/src/main/java/com/enginebai/base/utils/logging/MyCustomLoggingDebugTree.kt

@@ -0,0 +1,19 @@
+package com.enginebai.base.utils.logging
+
+import android.util.Log
+import com.orhanobut.logger.Logger
+import timber.log.Timber
+
+class TimberLoggerDebugTree : Timber.DebugTree() {
+
+    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
+        when (priority) {
+            Log.VERBOSE -> Logger.v(message)
+            Log.DEBUG -> Logger.d(message)
+            Log.INFO -> Logger.i(message)
+            Log.WARN -> Logger.w(message)
+            Log.ERROR -> Logger.e(t, message)
+            else -> Logger.wtf(message)
+        }
+    }
+}