fenix/Simple-Notes
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git synced 2025-06-05 17:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

updating commons and target SDK to 31

Browse Source
This commit is contained in:
tibbi
2022-04-02 22:26:25 +02:00
parent 7c822735f7
commit 43fa37e3ed
11 changed files with 52 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -487,7 +487,7 @@ class MainActivity : SimpleActivity() {
if (text.isNotBlank() && text.length > 1) {
searchMatches = noteView.value.searchMatches(text)
noteView.highlightText(text, getAdjustedPrimaryColor())
noteView.highlightText(text, getProperPrimaryColor())
}
currentTextFragment?.setTextWatcher()

4
app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt
View File

@ -52,7 +52,7 @@ class SettingsActivity : SimpleActivity() {
settings_startup_label,
settings_saving_label
).forEach {
it.setTextColor(getAdjustedPrimaryColor())
it.setTextColor(getProperPrimaryColor())
}
arrayOf(
@ -62,7 +62,7 @@ class SettingsActivity : SimpleActivity() {
settings_startup_holder,
settings_saving_holder
).forEach {
it.background.applyColorFilter(baseConfig.backgroundColor.getContrastColor())
it.background.applyColorFilter(getProperBackgroundColor().getContrastColor())
}
}

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

@ -22,7 +22,7 @@ class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayLis
init {
addNewEditText()
view.apply {
add_item.applyColorFilter(activity.getAdjustedPrimaryColor())
add_item.applyColorFilter(activity.getProperPrimaryColor())
add_item.background.applyColorFilter(textColor)
add_item.setOnClickListener {
addNewEditText()

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

@ -95,7 +95,7 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
return
}
val adjustedPrimaryColor = requireActivity().getAdjustedPrimaryColor()
val adjustedPrimaryColor = requireActivity().getProperPrimaryColor()
view.checklist_fab.apply {
setColors(
requireActivity().config.textColor,

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

@ -5,7 +5,7 @@ import android.view.ViewGroup
import androidx.fragment.app.Fragment
import com.simplemobiletools.commons.extensions.applyColorFilter
import com.simplemobiletools.commons.extensions.beVisibleIf
import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
import com.simplemobiletools.commons.extensions.getProperPrimaryColor
import com.simplemobiletools.commons.extensions.performSecurityCheck
import com.simplemobiletools.commons.helpers.PROTECTION_NONE
import com.simplemobiletools.notes.pro.activities.MainActivity
@ -27,7 +27,7 @@ abstract class NoteFragment : Fragment() {
note_locked_label.setTextColor(requireContext().config.textColor)
note_locked_label.setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getPercentageFontSize())
note_locked_show.setTextColor(requireContext().getAdjustedPrimaryColor())
note_locked_show.setTextColor(requireContext().getProperPrimaryColor())
note_locked_show.setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getPercentageFontSize())
note_locked_show.setOnClickListener {
handleUnlocking()

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

@ -123,7 +123,7 @@ class TextFragment : NoteFragment() {
return
}
val adjustedPrimaryColor = context.getAdjustedPrimaryColor()
val adjustedPrimaryColor = context.getProperPrimaryColor()
setColors(config.textColor, adjustedPrimaryColor, config.backgroundColor)
setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getPercentageFontSize())
highlightColor = adjustedPrimaryColor.adjustAlpha(.4f)

5
app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/MyWidgetProvider.kt
View File

@ -24,7 +24,7 @@ class MyWidgetProvider : AppWidgetProvider() {
private fun setupAppOpenIntent(context: Context, views: RemoteViews, id: Int, widget: Widget) {
val intent = context.getLaunchIntent() ?: Intent(context, SplashActivity::class.java)
intent.putExtra(OPEN_NOTE_ID, widget.noteId)
val pendingIntent = PendingIntent.getActivity(context, widget.widgetId, intent, PendingIntent.FLAG_UPDATE_CURRENT)
val pendingIntent = PendingIntent.getActivity(context, widget.widgetId, intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
views.setOnClickPendingIntent(id, pendingIntent)
}
@ -50,7 +50,8 @@ class MyWidgetProvider : AppWidgetProvider() {
val startActivityIntent = context.getLaunchIntent() ?: Intent(context, SplashActivity::class.java)
startActivityIntent.putExtra(OPEN_NOTE_ID, widget.noteId)
val startActivityPendingIntent = PendingIntent.getActivity(context, widgetId, startActivityIntent, PendingIntent.FLAG_UPDATE_CURRENT)
val startActivityPendingIntent =
PendingIntent.getActivity(context, widgetId, startActivityIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
views.setPendingIntentTemplate(R.id.notes_widget_listview, startActivityPendingIntent)
appWidgetManager.updateAppWidget(widgetId, views)