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

updating a couple more colors

Browse Source
This commit is contained in:
tibbi 2022-04-02 22:32:59 +02:00
parent 18e4502054
commit 66fbfccd91
7 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,6 @@ import java.io.FileOutputStream
import java.io.OutputStream import java.io.OutputStream
import java.nio.charset.Charset import java.nio.charset.Charset
import java.util.* import java.util.*
import kotlin.collections.ArrayList
class MainActivity : SimpleActivity() { class MainActivity : SimpleActivity() {
private val EXPORT_FILE_SYNC = 1 private val EXPORT_FILE_SYNC = 1
@ -122,14 +121,14 @@ class MainActivity : SimpleActivity() {
setTextSize(TypedValue.COMPLEX_UNIT_PX, getPercentageFontSize()) setTextSize(TypedValue.COMPLEX_UNIT_PX, getPercentageFontSize())
setGravity(Gravity.CENTER_VERTICAL) setGravity(Gravity.CENTER_VERTICAL)
setNonPrimaryAlpha(0.4f) setNonPrimaryAlpha(0.4f)
setTextColor(config.textColor) setTextColor(getProperTextColor())
} }
updateTextColors(view_pager) updateTextColors(view_pager)
checkShortcuts() checkShortcuts()
search_wrapper.setBackgroundColor(config.primaryColor) search_wrapper.setBackgroundColor(getProperPrimaryColor())
val contrastColor = config.primaryColor.getContrastColor() val contrastColor = getProperPrimaryColor().getContrastColor()
arrayListOf(searchPrevBtn, searchNextBtn, searchClearBtn).forEach { arrayListOf(searchPrevBtn, searchNextBtn, searchClearBtn).forEach {
it.applyColorFilter(contrastColor) it.applyColorFilter(contrastColor)
} }

2
app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt
View File

@ -59,7 +59,7 @@ class WidgetConfigureActivity : SimpleActivity() {
config_bg_color.setOnClickListener { pickBackgroundColor() } config_bg_color.setOnClickListener { pickBackgroundColor() }
config_text_color.setOnClickListener { pickTextColor() } config_text_color.setOnClickListener { pickTextColor() }
notes_picker_value.setOnClickListener { showNoteSelector() } notes_picker_value.setOnClickListener { showNoteSelector() }
notes_picker_holder.background = ColorDrawable(config.backgroundColor) notes_picker_holder.background = ColorDrawable(getProperBackgroundColor())
show_note_title_holder.setOnClickListener { show_note_title_holder.setOnClickListener {
show_note_title.toggle() show_note_title.toggle()
handleNoteTitleDisplay() handleNoteTitleDisplay()

3
app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt
View File

@ -10,13 +10,12 @@ import android.widget.EditText
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.extensions.config
import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.* import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.*
import kotlinx.android.synthetic.main.item_add_checklist.view.* import kotlinx.android.synthetic.main.item_add_checklist.view.*
class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayList<String>) -> Unit) { class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayList<String>) -> Unit) {
private val titles = mutableListOf<EditText>() private val titles = mutableListOf<EditText>()
private val textColor = activity.config.textColor private val textColor = activity.getProperTextColor()
private val view: ViewGroup = activity.layoutInflater.inflate(R.layout.dialog_new_checklist_item, null) as ViewGroup private val view: ViewGroup = activity.layoutInflater.inflate(R.layout.dialog_new_checklist_item, null) as ViewGroup
init { init {

7
app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/OpenNoteDialog.kt
View File

@ -5,10 +5,7 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.RadioGroup import android.widget.RadioGroup
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import com.simplemobiletools.commons.extensions.applyColorFilter import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.extensions.beVisibleIf
import com.simplemobiletools.commons.extensions.setupDialogStuff
import com.simplemobiletools.commons.extensions.toast
import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.extensions.config import com.simplemobiletools.notes.pro.extensions.config
import com.simplemobiletools.notes.pro.helpers.NotesHelper import com.simplemobiletools.notes.pro.helpers.NotesHelper
@ -35,7 +32,7 @@ class OpenNoteDialog(val activity: Activity, val callback: (checkedId: Long, new
} }
private fun initDialog(notes: ArrayList<Note>, view: View) { private fun initDialog(notes: ArrayList<Note>, view: View) {
val textColor = activity.config.textColor val textColor = activity.getProperTextColor()
notes.forEach { notes.forEach {
activity.layoutInflater.inflate(R.layout.open_note_item, null).apply { activity.layoutInflater.inflate(R.layout.open_note_item, null).apply {
val note = it val note = it

4
app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt
View File

@ -98,7 +98,7 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
val adjustedPrimaryColor = requireActivity().getProperPrimaryColor() val adjustedPrimaryColor = requireActivity().getProperPrimaryColor()
view.checklist_fab.apply { view.checklist_fab.apply {
setColors( setColors(
requireActivity().config.textColor, requireActivity().getProperTextColor(),
adjustedPrimaryColor, adjustedPrimaryColor,
adjustedPrimaryColor.getContrastColor() adjustedPrimaryColor.getContrastColor()
) )
@ -109,7 +109,7 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
} }
} }
view.fragment_placeholder.setTextColor(requireActivity().config.textColor) view.fragment_placeholder.setTextColor(requireActivity().getProperTextColor())
view.fragment_placeholder_2.apply { view.fragment_placeholder_2.apply {
setTextColor(adjustedPrimaryColor) setTextColor(adjustedPrimaryColor)
underlineText() underlineText()

9
app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/NoteFragment.kt
View File

@ -3,10 +3,7 @@ package com.simplemobiletools.notes.pro.fragments
import android.util.TypedValue import android.util.TypedValue
import android.view.ViewGroup import android.view.ViewGroup
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import com.simplemobiletools.commons.extensions.applyColorFilter import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.extensions.beVisibleIf
import com.simplemobiletools.commons.extensions.getProperPrimaryColor
import com.simplemobiletools.commons.extensions.performSecurityCheck
import com.simplemobiletools.commons.helpers.PROTECTION_NONE import com.simplemobiletools.commons.helpers.PROTECTION_NONE
import com.simplemobiletools.notes.pro.activities.MainActivity import com.simplemobiletools.notes.pro.activities.MainActivity
import com.simplemobiletools.notes.pro.extensions.config import com.simplemobiletools.notes.pro.extensions.config
@ -22,9 +19,9 @@ abstract class NoteFragment : Fragment() {
protected fun setupLockedViews(view: ViewGroup, note: Note) { protected fun setupLockedViews(view: ViewGroup, note: Note) {
view.apply { view.apply {
note_locked_layout.beVisibleIf(note.isLocked() && !shouldShowLockedContent) note_locked_layout.beVisibleIf(note.isLocked() && !shouldShowLockedContent)
note_locked_image.applyColorFilter(config!!.textColor) note_locked_image.applyColorFilter(requireContext().getProperTextColor())
note_locked_label.setTextColor(requireContext().config.textColor) note_locked_label.setTextColor(requireContext().getProperTextColor())
note_locked_label.setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getPercentageFontSize()) note_locked_label.setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getPercentageFontSize())
note_locked_show.setTextColor(requireContext().getProperPrimaryColor()) note_locked_show.setTextColor(requireContext().getProperPrimaryColor())

4
app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt
View File

@ -124,7 +124,7 @@ class TextFragment : NoteFragment() {
} }
val adjustedPrimaryColor = context.getProperPrimaryColor() val adjustedPrimaryColor = context.getProperPrimaryColor()
setColors(config.textColor, adjustedPrimaryColor, config.backgroundColor) setColors(context.getProperTextColor(), adjustedPrimaryColor, context.getProperBackgroundColor())
setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getPercentageFontSize()) setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getPercentageFontSize())
highlightColor = adjustedPrimaryColor.adjustAlpha(.4f) highlightColor = adjustedPrimaryColor.adjustAlpha(.4f)
@ -157,7 +157,7 @@ class TextFragment : NoteFragment() {
} }
if (config.showWordCount) { if (config.showWordCount) {
view.notes_counter.setTextColor(config.textColor) view.notes_counter.setTextColor(context!!.getProperTextColor())
setWordCounter(view.text_note_view.text.toString()) setWordCounter(view.text_note_view.text.toString())
} }