fenix/Simple-Notes
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git synced 2025-03-26 05:20:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed review issues 1

Browse Source
This commit is contained in:
Pavol Franek 2020-03-25 13:30:16 +01:00
parent 6793be0039
commit 0e3ae48386
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
View File

@ -190,19 +190,21 @@ class MainActivity : SimpleActivity() {
return indexes return indexes
} }
private fun searchHighLightText(view: MyEditText, textToHighlight: String) { private fun searchHighLightText(view: MyEditText, highlightText: String) {
val content = view.text.toString() val content = view.text.toString()
var indexOf = content.indexOf(textToHighlight, 0, true) var indexOf = content.indexOf(highlightText, 0, true)
val wordToSpan = SpannableString(view.text) val wordToSpan = SpannableString(view.text)
var offset = 0 var offset = 0
while (offset < content.length && indexOf != -1) { while (offset < content.length && indexOf != -1) {
indexOf = content.indexOf(textToHighlight, offset, true) indexOf = content.indexOf(highlightText, offset, true)
if (indexOf == -1) { if (indexOf == -1) {
break break
} else { } else {
wordToSpan.setSpan(BackgroundColorSpan(ColorUtils.setAlphaComponent(config.primaryColor, 90)), indexOf, indexOf + textToHighlight.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) val spanBgColor = BackgroundColorSpan(ColorUtils.setAlphaComponent(config.primaryColor, 90))
val spanFlag = Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
wordToSpan.setSpan(spanBgColor, indexOf, indexOf + highlightText.length, spanFlag)
view.setText(wordToSpan, TextView.BufferType.SPANNABLE) view.setText(wordToSpan, TextView.BufferType.SPANNABLE)
} }
@ -245,10 +247,11 @@ class MainActivity : SimpleActivity() {
} }
updateTextColors(view_pager) updateTextColors(view_pager)
val contrastColor = config.primaryColor.getContrastColor()
search_root.setBackgroundColor(config.primaryColor) search_root.setBackgroundColor(config.primaryColor)
search_previous.applyColorFilter(config.primaryColor.getContrastColor()) search_previous.applyColorFilter(contrastColor)
search_next.applyColorFilter(config.primaryColor.getContrastColor()) search_next.applyColorFilter(contrastColor)
search_clear.applyColorFilter(config.primaryColor.getContrastColor()) search_clear.applyColorFilter(contrastColor)
} }
override fun onPause() { override fun onPause() {
@ -356,6 +359,7 @@ class MainActivity : SimpleActivity() {
view_pager.currentItem = getWantedNoteIndex(wantedNoteId) view_pager.currentItem = getWantedNoteIndex(wantedNoteId)
checkIntents(intent) checkIntents(intent)
} }
private val currentItemIsCheckList get() = mAdapter?.isChecklistFragment(view_pager.currentItem) ?: false private val currentItemIsCheckList get() = mAdapter?.isChecklistFragment(view_pager.currentItem) ?: false
private fun checkIntents(intent: Intent) { private fun checkIntents(intent: Intent) {

5
app/src/main/kotlin/com/simplemobiletools/notes/pro/extensions/String.kt
View File

@ -22,8 +22,9 @@ fun String.parseChecklistItems(): ArrayList<ChecklistItem>? {
@RequiresApi(Build.VERSION_CODES.N) @RequiresApi(Build.VERSION_CODES.N)
fun String.toHtml() = fun String.toHtml() =
if (isNougatPlus()) if (isNougatPlus()) {
Html.fromHtml(this, Html.FROM_HTML_MODE_LEGACY) Html.fromHtml(this, Html.FROM_HTML_MODE_LEGACY)
else } else {
Html.fromHtml(this) Html.fromHtml(this)
}

2
app/src/main/res/layout/search_item.xml
View File

@ -64,5 +64,5 @@
android:layout_height="1dp" android:layout_height="1dp"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:alpha="0.1" android:alpha="0.1"
android:background="#fff" /> android:background="@color/md_grey_white" />
</FrameLayout> </FrameLayout>