Merge pull request #526 from AppDevNext/AdaptLogFormat

Adapt log format

Author: hannesa2

LogcatCoreLib/src/main/java/info/hannes/timber/DebugFormatTree.kt

@@ -3,25 +3,29 @@ package info.hannes.timber
 import org.json.JSONException
 import org.json.JSONObject
 import timber.log.Timber
+import timber.log.Timber.Forest.tag
 
 /* If you use old logcat, e.g Android Studio Electric Eel, you should use for newLogcat a false */
 open class DebugFormatTree(private val newLogcat: Boolean = true) : Timber.DebugTree() {
 
     private var codeIdentifier = ""
+    private var method = ""
 
     override fun createStackElementTag(element: StackTraceElement): String? {
         if (newLogcat) {
-            codeIdentifier = String.format(
-                "(%s:%d)",
-                element.fileName,
-                element.lineNumber // format ensures line numbers have at least 3 places to align consecutive output from the same file
-            )
-            return String.format(
+            method = String.format(
                 "%s.%s()",
                 // method is fully qualified only when class differs on filename otherwise it can be cropped on long lambda expressions
                 super.createStackElementTag(element)?.replaceFirst(element.fileName.takeWhile { it != '.' }, ""),
                 element.methodName
             )
+
+            codeIdentifier = String.format(
+                "(%s:%d)",
+                element.fileName,
+                element.lineNumber // format ensures line numbers have at least 3 places to align consecutive output from the same file
+            )
+            return "(${element.fileName}:${element.lineNumber})"
         } else
             return String.format(
                 "(%s:%d) %s.%s()",
@@ -45,6 +49,6 @@ open class DebugFormatTree(private val newLogcat: Boolean = true) : Timber.Debug
         }
         if (newLogcat)
             localMessage = codeIdentifier + localMessage
-        super.log(priority, tag, localMessage, t)
+        super.log(priority, tag, "$method: $localMessage", t)
     }
 }