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

use a different view at the widget config screen for checklists

Browse Source
This commit is contained in:
tibbi 2018-12-09 11:26:14 +01:00
parent 378ad17326
commit c35d97d49a
5 changed files with 46 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@ import com.simplemobiletools.notes.pro.extensions.getTextSize
import com.simplemobiletools.notes.pro.extensions.widgetsDB
import com.simplemobiletools.notes.pro.helpers.MyWidgetProvider
import com.simplemobiletools.notes.pro.helpers.NotesHelper
import com.simplemobiletools.notes.pro.helpers.TYPE_CHECKLIST
import com.simplemobiletools.notes.pro.models.Note
import com.simplemobiletools.notes.pro.models.Widget
import kotlinx.android.synthetic.main.widget_config.*
@ -56,7 +57,7 @@ class WidgetConfigureActivity : SimpleActivity() {
override fun onResume() {
super.onResume()
notes_view.setTextSize(TypedValue.COMPLEX_UNIT_PX, applicationContext.getTextSize())
text_note_view.setTextSize(TypedValue.COMPLEX_UNIT_PX, applicationContext.getTextSize())
}
private fun initVariables() {
@ -104,13 +105,21 @@ class WidgetConfigureActivity : SimpleActivity() {
private fun updateCurrentNote(note: Note) {
mCurrentNoteId = note.id!!
notes_picker_value.text = note.title
val sampleValue = if (note.value.isEmpty() || mIsCustomizingColors) getString(R.string.widget_config) else note.value
notes_view.text = sampleValue
if (note.type == TYPE_CHECKLIST) {
text_note_view.beGone()
checklist_note_view.beVisible()
} else {
val sampleValue = if (note.value.isEmpty() || mIsCustomizingColors) getString(R.string.widget_config) else note.value
text_note_view.text = sampleValue
text_note_view.beVisible()
checklist_note_view.beGone()
}
}
private fun saveConfig() {
val views = RemoteViews(packageName, R.layout.activity_main)
views.setBackgroundColor(R.id.notes_view, mBgColor)
views.setBackgroundColor(R.id.text_note_view, mBgColor)
views.setBackgroundColor(R.id.checklist_note_view, mBgColor)
AppWidgetManager.getInstance(this).updateAppWidget(mWidgetId, views)
val widget = Widget(null, mWidgetId, mCurrentNoteId)
Thread {
@ -143,14 +152,15 @@ class WidgetConfigureActivity : SimpleActivity() {
private fun updateBackgroundColor() {
mBgColor = mBgColorWithoutTransparency.adjustAlpha(mBgAlpha)
notes_view.setBackgroundColor(mBgColor)
text_note_view.setBackgroundColor(mBgColor)
checklist_note_view.setBackgroundColor(mBgColor)
config_save.setBackgroundColor(mBgColor)
config_bg_color.setFillWithStroke(mBgColor, Color.BLACK)
}
private fun updateTextColor() {
config_save.setTextColor(mTextColor)
notes_view.setTextColor(mTextColor)
text_note_view.setTextColor(mTextColor)
config_text_color.setFillWithStroke(mTextColor, Color.BLACK)
}

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

@ -48,7 +48,7 @@ class TextFragment : NoteFragment() {
val layoutToInflate = if (config!!.enableLineWrap) R.layout.note_view_static else R.layout.note_view_horiz_scrollable
inflater.inflate(layoutToInflate, view.notes_relative_layout, true)
if (config!!.clickableLinks) {
view.notes_view.apply {
view.text_note_view.apply {
linksClickable = true
autoLinkMask = Linkify.WEB_URLS or Linkify.EMAIL_ADDRESSES
movementMethod = MyMovementMethod.getInstance()
@ -56,7 +56,7 @@ class TextFragment : NoteFragment() {
}
view.notes_horizontal_scrollview?.onGlobalLayout {
view.notes_view.minWidth = view.notes_horizontal_scrollview.width
view.text_note_view.minWidth = view.notes_horizontal_scrollview.width
}
return view
@ -78,7 +78,7 @@ class TextFragment : NoteFragment() {
if (config!!.autosaveNotes) {
saveText(false)
}
view.notes_view.removeTextChangedListener(textWatcher)
view.text_note_view.removeTextChangedListener(textWatcher)
}
override fun setMenuVisibility(menuVisible: Boolean) {
@ -107,13 +107,13 @@ class TextFragment : NoteFragment() {
if (savedInstanceState != null && note != null && savedInstanceState.containsKey(TEXT)) {
skipTextUpdating = true
val newText = savedInstanceState.getString(TEXT) ?: ""
view.notes_view.setText(newText)
view.text_note_view.setText(newText)
}
}
private fun setupFragment() {
val config = config ?: return
view.notes_view.apply {
view.text_note_view.apply {
typeface = if (config.monospacedFont) Typeface.MONOSPACE else Typeface.DEFAULT
val fileContents = note!!.getNoteStoredValue()
@ -147,15 +147,15 @@ class TextFragment : NoteFragment() {
if (config.showWordCount) {
view.notes_counter.beVisible()
view.notes_counter.setTextColor(config.textColor)
setWordCounter(view.notes_view.text.toString())
setWordCounter(view.text_note_view.text.toString())
} else {
view.notes_counter.beGone()
}
view.notes_view.addTextChangedListener(textWatcher)
view.text_note_view.addTextChangedListener(textWatcher)
}
fun getNotesView() = view.notes_view
fun getNotesView() = view.text_note_view
fun saveText(force: Boolean) {
if (note == null) {
@ -182,7 +182,7 @@ class TextFragment : NoteFragment() {
fun hasUnsavedChanges() = getCurrentNoteViewText() != note!!.getNoteStoredValue()
fun focusEditText() {
view.notes_view.requestFocus()
view.text_note_view.requestFocus()
}
private fun saveNoteValue(note: Note) {
@ -199,7 +199,7 @@ class TextFragment : NoteFragment() {
}
}
fun getCurrentNoteViewText() = view.notes_view?.text?.toString()
fun getCurrentNoteViewText() = view.text_note_view?.text?.toString()
@SuppressLint("RtlHardcoded")
private fun getTextGravity() = when (config!!.gravity) {
@ -216,7 +216,7 @@ class TextFragment : NoteFragment() {
fun undo() {
val edit = textHistory.getPrevious() ?: return
val text = view.notes_view.editableText
val text = view.text_note_view.editableText
val start = edit.start
val end = start + if (edit.after != null) edit.after.length else 0
@ -244,7 +244,7 @@ class TextFragment : NoteFragment() {
fun redo() {
val edit = textHistory.getNext() ?: return
val text = view.notes_view.editableText
val text = view.text_note_view.editableText
val start = edit.start
val end = start + if (edit.before != null) edit.before.length else 0

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

@ -8,7 +8,7 @@
android:scrollbars="horizontal">
<com.simplemobiletools.commons.views.MyEditText
android:id="@+id/notes_view"
android:id="@+id/text_note_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@null"

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<com.simplemobiletools.commons.views.MyEditText
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/notes_view"
android:id="@+id/text_note_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@null"

19
app/src/main/res/layout/widget_config.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/notes_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -32,7 +33,7 @@
</RelativeLayout>
<TextView
android:id="@+id/notes_view"
android:id="@+id/text_note_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/config_bg_color"
@ -43,6 +44,18 @@
android:padding="@dimen/activity_margin"
android:text="@string/widget_config"/>
<com.simplemobiletools.commons.views.MyRecyclerView
android:id="@+id/checklist_note_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/config_bg_color"
android:layout_below="@+id/notes_picker_holder"
android:layout_marginBottom="@dimen/activity_margin"
android:clipToPadding="false"
android:overScrollMode="never"
android:visibility="gone"
app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager"/>
<ImageView
android:id="@+id/config_bg_color"
android:layout_width="@dimen/widget_colorpicker_size"
@ -53,8 +66,8 @@
android:id="@+id/config_bg_seekbar_holder"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignBottom="@+id/config_bg_color"
android:layout_alignTop="@+id/config_bg_color"
android:layout_alignBottom="@+id/config_bg_color"
android:layout_toEndOf="@+id/config_bg_color"
android:layout_toRightOf="@+id/config_bg_color"
android:background="@android:color/white">
@ -78,10 +91,10 @@
android:id="@+id/config_save"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignTop="@+id/config_text_color"
android:layout_alignBottom="@+id/config_text_color"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignTop="@+id/config_text_color"
android:fontFamily="sans-serif-light"
android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/activity_margin"