Skip to content
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 39 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,42 @@
[*]
max_line_length = 150

[*.{kt, kts}]
ktlint_disabled_rules=argument-list-wrapping,wrapping,multiline-if-else,no-wildcard-imports,import-ordering,no-consecutive-blank-lines,max-line-length,comment-spacing,import-ordering,no-blank-line-before-rbrace,final-newline,indent,no-multi-spaces,comment-spacing,parameter-list-wrapping
ktlint_standard = enabled # Disable all rules from the `standard` rule set provided by KtLint
ktlint_standard_no-empty-first-line-in-class-body = disabled
ktlint_standard_chain-method-continuation = disabled
ktlint_standard_no-blank-line-before-rbrace = disabled
ktlint_standard_no-wildcard-imports = disabled
ktlint_standard_function-signature = disabled
ktlint_standard_class-signature = disabled
ktlint_standard_property-naming = disabled
ktlint_standard_multiline-expression-wrapping = disabled
ktlint_standard_blank-line-before-declaration = disabled
ktlint_standard_function-expression-body = disabled
ktlint_standard_no-consecutive-blank-lines = disabled
ktlint_standard_string-template-indent = disabled
ktlint_standard_wrapping = disabled
ktlint_standard_trailing-comma-on-call-site = disabled
ktlint_standard_trailing-ktlint_trailing-comma-on-call-site = disabled
ktlint_standard_trailing-comma-on-declaration-site = disabled
ktlint_standard_trailing-trailing-comma-on-call-site = disabled
ktlint_standard_final-newline = enabled
ktlint_standard_comment-spacing = disabled
ktlint_standard_argument-list-wrapping = disabled
ktlint_standard_indent = disabled
ktlint_standard_if-else-bracing = disabled
ktlint_standard_if-else-wrapping = disabled
ktlint_standard_import-ordering = disabled
ktlint_standard_multiline-if-else = disabled
ktlint_standard_parameter-list-wrapping = disabled
ktlint_standard_discouraged-comment-location = disabled
ktlint_standard_enum-wrapping = disabled
ktlint_standard_annotation = disabled
ktlint_standard_no-consecutive-comments = disabled
ktlint_standard_block-comment-initial-star-alignment = disabled
ktlint_standard_parameter-list-spacing = disabled
ktlint_standard_comment-wrapping = disabled
ktlint_experimental = enabled # Enable rules marked as experimental for all rule sets that are enabled
ktlint_standard_some-experimental-rule = disabled # Disables the (experimental) `some-experimental-rule` in the `standard` rule set provided by KtLint
ktlint_custom-rule-set = enabled # Enable all rules in the `custom-rule-set` rule set (not provided by KtLint)
ktlint_custom-rule-set_custom-rule = disabled # Disables the `custom-rule` rule in the `custom-rule-set` rule set (not provided by KtLint)

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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 */
// 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 = ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,12 @@ abstract class LogBaseFragment : Fragment() {
searchItem?.setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
setFilter2LogAdapter("")
return true // Return true to collapse action view
return true // Return true to collapse action view
}

override fun onMenuItemActionExpand(item: MenuItem): Boolean {
// Do something when expanded
return true // Return true to expand action view
return true // Return true to expand action view
}
})

Expand Down Expand Up @@ -182,35 +182,42 @@ abstract class LogBaseFragment : Fragment() {
sendLogContent(it.filterLogs, fileName)
}
}

R.id.menu_clear -> {
clearLog()
showLogContent(null)
}

R.id.menu_show_verbose -> {
item.isChecked = true
stopSearchView()
setFilter2LogAdapter("")
}

R.id.menu_show_debug -> {
item.isChecked = true
stopSearchView()
setFilter2LogAdapter(ASSERT_LINE, ERROR_LINE, WARNING_LINE, INFO_LINE, DEBUG_LINE)
}

R.id.menu_show_info -> {
item.isChecked = true
stopSearchView()
setFilter2LogAdapter(ASSERT_LINE, ERROR_LINE, WARNING_LINE, INFO_LINE)
}

R.id.menu_show_warning -> {
item.isChecked = true
stopSearchView()
setFilter2LogAdapter(ASSERT_LINE, ERROR_LINE, WARNING_LINE)
}

R.id.menu_show_error -> {
item.isChecked = true
stopSearchView()
setFilter2LogAdapter(ASSERT_LINE, ERROR_LINE)
}

else -> returnValue = super.onOptionsItemSelected(item)
}
return returnValue
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ interface IAnalytics {
fun onStart(activity: Activity?)

fun onStop()
}
}
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:8.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jlleitschuh.gradle:ktlint-gradle:11.6.1"
classpath "org.jlleitschuh.gradle:ktlint-gradle:12.1.0"

classpath 'com.google.gms:google-services:4.4.0'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ class RecyclerViewItemDuplicateAssertion : ViewAssertion {
++i
}
}
}
}