chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

fix some lint warnings and Kotlin style issues (#1390)

Browse source
This commit is contained in:
Konrad Pozniak 2019-07-16 19:26:55 +02:00 • committed by GitHub
commit 83f9638aaf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 10 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/keylesspalace/tusky/util/ListStatusAccessibilityDelegate.kt
View file

@ -159,7 +159,7 @@ class ListStatusAccessibilityDelegate(
val textLinks = links.map { item -> item.link }
AlertDialog.Builder(host.context)
.setTitle(R.string.title_links_dialog)
.setAdapter(ArrayAdapter<String>(
.setAdapter(ArrayAdapter(
host.context,
android.R.layout.simple_list_item_1,
textLinks)
@ -188,7 +188,7 @@ class ListStatusAccessibilityDelegate(
val tags = getHashtags(status).map { it.subSequence(1, it.length) }.toList()
AlertDialog.Builder(host.context)
.setTitle(R.string.title_hashtags_dialog)
.setAdapter(ArrayAdapter<CharSequence>(host.context,
.setAdapter(ArrayAdapter(host.context,
android.R.layout.simple_list_item_1, tags)
) { _, which ->
statusActionListener.onViewTag(tags[which].toString())

3
app/src/main/java/com/keylesspalace/tusky/util/SpanUtils.kt
View file

@ -6,6 +6,7 @@ import android.text.style.CharacterStyle
import android.text.style.ForegroundColorSpan
import android.text.style.URLSpan
import java.util.regex.Pattern
import kotlin.math.max
/**
* @see <a href="https://github.com/tootsuite/mastodon/blob/master/app/models/tag.rb">
@ -68,7 +69,7 @@ private fun findPattern(string: String, fromIndex: Int): FindCharsResult {
&& ((i - fromIndex) < finder.searchPrefixWidth ||
Character.isWhitespace(string.codePointAt(i - finder.searchPrefixWidth)))) {
result.matchType = matchType
result.start = Math.max(0, i - finder.searchPrefixWidth)
result.start = max(0, i - finder.searchPrefixWidth)
findEndOfPattern(string, result, finder.pattern)
if (result.start + finder.searchPrefixWidth <= i + 1 && // The found result is actually triggered by the correct search character
result.end >= result.start) { // ...and we actually found a valid result