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

Merge branch 'master' into weblate-simple-mobile-tools-simple-notes

Browse Source
This commit is contained in:
Tibor Kaputa 2021-11-17 22:50:42 +01:00 committed by GitHub
commit a8c60df9e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 350 additions and 419 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -56,7 +56,7 @@ android {
} }
dependencies { dependencies {
implementation 'com.github.SimpleMobileTools:Simple-Commons:5079455be9' implementation 'com.github.SimpleMobileTools:Simple-Commons:f86699e092'
implementation 'androidx.constraintlayout:constraintlayout:2.1.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
implementation 'androidx.documentfile:documentfile:1.0.1' implementation 'androidx.documentfile:documentfile:1.0.1'

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

@ -266,7 +266,7 @@ class MainActivity : SimpleActivity() {
} }
} }
private fun isCurrentItemChecklist() = mAdapter?.isChecklistFragment(view_pager.currentItem) ?: false private fun isCurrentItemChecklist() = if (this::mCurrentNote.isInitialized) mCurrentNote.type == NoteType.TYPE_CHECKLIST.value else false
private fun checkIntents(intent: Intent) { private fun checkIntents(intent: Intent) {
intent.apply { intent.apply {

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

@ -4,10 +4,7 @@ import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.view.Menu import android.view.Menu
import com.simplemobiletools.commons.dialogs.RadioGroupDialog import com.simplemobiletools.commons.dialogs.RadioGroupDialog
import com.simplemobiletools.commons.extensions.beGone import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.extensions.beVisibleIf
import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
import com.simplemobiletools.commons.extensions.updateTextColors
import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS
import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.commons.helpers.isOreoPlus import com.simplemobiletools.commons.helpers.isOreoPlus
@ -46,9 +43,27 @@ class SettingsActivity : SimpleActivity() {
setupIncognitoMode() setupIncognitoMode()
setupCustomizeWidgetColors() setupCustomizeWidgetColors()
updateTextColors(settings_scrollview) updateTextColors(settings_scrollview)
setupSectionColors()
setupAddNewChecklistItemsTop()
invalidateOptionsMenu() invalidateOptionsMenu()
arrayOf(
settings_color_customization_label,
settings_general_settings_label,
settings_text_label,
settings_startup_label,
settings_saving_label
).forEach {
it.setTextColor(getAdjustedPrimaryColor())
}
arrayOf(
settings_color_customization_holder,
settings_general_settings_holder,
settings_text_holder,
settings_startup_holder,
settings_saving_holder
).forEach {
it.background.applyColorFilter(baseConfig.backgroundColor.getContrastColor())
}
} }
override fun onCreateOptionsMenu(menu: Menu): Boolean { override fun onCreateOptionsMenu(menu: Menu): Boolean {
@ -56,13 +71,6 @@ class SettingsActivity : SimpleActivity() {
return super.onCreateOptionsMenu(menu) return super.onCreateOptionsMenu(menu)
} }
private fun setupSectionColors() {
val adjustedPrimaryColor = getAdjustedPrimaryColor()
arrayListOf(text_label, startup_label, saving_label, widgets_label).forEach {
it.setTextColor(adjustedPrimaryColor)
}
}
private fun setupCustomizeColors() { private fun setupCustomizeColors() {
settings_customize_colors_holder.setOnClickListener { settings_customize_colors_holder.setOnClickListener {
startCustomizationActivity() startCustomizationActivity()
@ -72,6 +80,11 @@ class SettingsActivity : SimpleActivity() {
private fun setupUseEnglish() { private fun setupUseEnglish() {
settings_use_english_holder.beVisibleIf(config.wasUseEnglishToggled || Locale.getDefault().language != "en") settings_use_english_holder.beVisibleIf(config.wasUseEnglishToggled || Locale.getDefault().language != "en")
settings_use_english.isChecked = config.useEnglish settings_use_english.isChecked = config.useEnglish
if (settings_use_english_holder.isGone()) {
settings_font_size_holder.background = resources.getDrawable(R.drawable.ripple_all_corners, theme)
}
settings_use_english_holder.setOnClickListener { settings_use_english_holder.setOnClickListener {
settings_use_english.toggle() settings_use_english.toggle()
config.useEnglish = settings_use_english.isChecked config.useEnglish = settings_use_english.isChecked
@ -123,6 +136,10 @@ class SettingsActivity : SimpleActivity() {
private fun setupShowNotePicker() { private fun setupShowNotePicker() {
NotesHelper(this).getNotes { NotesHelper(this).getNotes {
settings_show_note_picker_holder.beVisibleIf(it.size > 1) settings_show_note_picker_holder.beVisibleIf(it.size > 1)
if (settings_show_note_picker_holder.isGone()) {
settings_show_keyboard_holder.background = resources.getDrawable(R.drawable.ripple_bottom_corners, theme)
}
} }
settings_show_note_picker.isChecked = config.showNotePicker settings_show_note_picker.isChecked = config.showNotePicker
@ -181,7 +198,8 @@ class SettingsActivity : SimpleActivity() {
val items = arrayListOf( val items = arrayListOf(
RadioItem(GRAVITY_LEFT, getString(R.string.left)), RadioItem(GRAVITY_LEFT, getString(R.string.left)),
RadioItem(GRAVITY_CENTER, getString(R.string.center)), RadioItem(GRAVITY_CENTER, getString(R.string.center)),
RadioItem(GRAVITY_RIGHT, getString(R.string.right))) RadioItem(GRAVITY_RIGHT, getString(R.string.right))
)
RadioGroupDialog(this@SettingsActivity, items, config.gravity) { RadioGroupDialog(this@SettingsActivity, items, config.gravity) {
config.gravity = it as Int config.gravity = it as Int
@ -191,11 +209,13 @@ class SettingsActivity : SimpleActivity() {
} }
} }
private fun getGravityText() = getString(when (config.gravity) { private fun getGravityText() = getString(
GRAVITY_LEFT -> R.string.left when (config.gravity) {
GRAVITY_CENTER -> R.string.center GRAVITY_LEFT -> R.string.left
else -> R.string.right GRAVITY_CENTER -> R.string.center
}) else -> R.string.right
}
)
private fun setupCursorPlacement() { private fun setupCursorPlacement() {
settings_cursor_placement.isChecked = config.placeCursorToEnd settings_cursor_placement.isChecked = config.placeCursorToEnd
@ -230,9 +250,8 @@ class SettingsActivity : SimpleActivity() {
if (widgets.size == 1) { if (widgets.size == 1) {
widgetToCustomize = widgets.first() widgetToCustomize = widgets.first()
} else if (widgets.size > 1) { } else if (widgets.size > 1) {
arrayListOf(widgets_label, settings_customize_widget_colors_holder).forEach { settings_customize_widget_colors_holder.beGone()
it.beGone() settings_customize_colors_holder.background = resources.getDrawable(R.drawable.ripple_all_corners, theme)
}
} }
} }
} }
@ -245,12 +264,4 @@ class SettingsActivity : SimpleActivity() {
config.useIncognitoMode = settings_use_incognito_mode.isChecked config.useIncognitoMode = settings_use_incognito_mode.isChecked
} }
} }
private fun setupAddNewChecklistItemsTop() {
settings_add_checklist_top.isChecked = config.addNewChecklistItemsTop
settings_add_checklist_top_holder.setOnClickListener {
settings_add_checklist_top.toggle()
config.addNewChecklistItemsTop = settings_add_checklist_top.isChecked
}
}
} }

15
app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/DeleteNoteDialog.kt
View File

@ -16,17 +16,20 @@ class DeleteNoteDialog(val activity: SimpleActivity, val note: Note, val callbac
val view = activity.layoutInflater.inflate(R.layout.dialog_delete_note, null).apply { val view = activity.layoutInflater.inflate(R.layout.dialog_delete_note, null).apply {
if (note.path.isNotEmpty()) { if (note.path.isNotEmpty()) {
delete_note_checkbox.text = String.format(activity.getString(R.string.delete_file_itself), note.path) delete_note_checkbox.text = String.format(activity.getString(R.string.delete_file_itself), note.path)
delete_note_checkbox.beVisible() delete_note_checkbox_holder.beVisible()
delete_note_checkbox_holder.setOnClickListener {
delete_note_checkbox.toggle()
}
} }
delete_note_description.text = message delete_note_description.text = message
} }
AlertDialog.Builder(activity) AlertDialog.Builder(activity)
.setPositiveButton(R.string.ok) { dialog, which -> dialogConfirmed(view.delete_note_checkbox.isChecked) } .setPositiveButton(R.string.ok) { dialog, which -> dialogConfirmed(view.delete_note_checkbox.isChecked) }
.setNegativeButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, null)
.create().apply { .create().apply {
activity.setupDialogStuff(view, this) activity.setupDialogStuff(view, this)
} }
} }
private fun dialogConfirmed(deleteFile: Boolean) { private fun dialogConfirmed(deleteFile: Boolean) {

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

@ -21,11 +21,14 @@ class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayLis
init { init {
addNewEditText() addNewEditText()
view.add_item.applyColorFilter(activity.getAdjustedPrimaryColor()) view.apply {
view.add_item.background.applyColorFilter(textColor) add_item.applyColorFilter(activity.getAdjustedPrimaryColor())
view.add_item.setOnClickListener { add_item.background.applyColorFilter(textColor)
addNewEditText() add_item.setOnClickListener {
addNewEditText()
}
} }
AlertDialog.Builder(activity) AlertDialog.Builder(activity)
.setPositiveButton(R.string.ok, null) .setPositiveButton(R.string.ok, null)
.setNegativeButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, null)

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

@ -62,16 +62,15 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
// checklist title can be null only because of the glitch in upgrade to 6.6.0, remove this check in the future // checklist title can be null only because of the glitch in upgrade to 6.6.0, remove this check in the future
items = items.filter { it.title != null }.toMutableList() as ArrayList<ChecklistItem> items = items.filter { it.title != null }.toMutableList() as ArrayList<ChecklistItem>
val sorting = config?.sorting ?: 0
if (sorting and SORT_BY_CUSTOM == 0 && config?.moveDoneChecklistItems == true) {
items.sortBy { it.isDone }
}
setupFragment()
} catch (e: Exception) { } catch (e: Exception) {
migrateCheckListOnFailure(storedNote) migrateCheckListOnFailure(storedNote)
} }
val sorting = config?.sorting ?: 0
if (sorting and SORT_BY_CUSTOM == 0 && config?.moveDoneChecklistItems == true) {
items.sortBy { it.isDone }
}
setupFragment()
} }
} }
} }
@ -147,12 +146,7 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
} }
} }
if (config?.addNewChecklistItemsTop == true) { items.addAll(newItems)
items.addAll(0, newItems)
} else {
items.addAll(newItems)
}
saveNote() saveNote()
setupAdapter() setupAdapter()
} }

4
app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Config.kt
View File

@ -89,8 +89,4 @@ class Config(context: Context) : BaseConfig(context) {
var fontSizePercentage: Int var fontSizePercentage: Int
get() = prefs.getInt(FONT_SIZE_PERCENTAGE, 100) get() = prefs.getInt(FONT_SIZE_PERCENTAGE, 100)
set(fontSizePercentage) = prefs.edit().putInt(FONT_SIZE_PERCENTAGE, fontSizePercentage).apply() set(fontSizePercentage) = prefs.edit().putInt(FONT_SIZE_PERCENTAGE, fontSizePercentage).apply()
var addNewChecklistItemsTop: Boolean
get() = prefs.getBoolean(ADD_NEW_CHECKLIST_ITEMS_TOP, false)
set(addNewCheckListItemsTop) = prefs.edit().putBoolean(ADD_NEW_CHECKLIST_ITEMS_TOP, addNewCheckListItemsTop).apply()
} }

1
app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Constants.kt
View File

@ -32,7 +32,6 @@ const val USE_INCOGNITO_MODE = "use_incognito_mode"
const val LAST_CREATED_NOTE_TYPE = "last_created_note_type" const val LAST_CREATED_NOTE_TYPE = "last_created_note_type"
const val MOVE_DONE_CHECKLIST_ITEMS = "move_undone_checklist_items" // it has been replaced from moving undone items at the top to moving done to bottom const val MOVE_DONE_CHECKLIST_ITEMS = "move_undone_checklist_items" // it has been replaced from moving undone items at the top to moving done to bottom
const val FONT_SIZE_PERCENTAGE = "font_size_percentage" const val FONT_SIZE_PERCENTAGE = "font_size_percentage"
const val ADD_NEW_CHECKLIST_ITEMS_TOP = "add_new_checklist_items_top"
// gravity // gravity
const val GRAVITY_LEFT = 0 const val GRAVITY_LEFT = 0

586
app/src/main/res/layout/activity_settings.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/settings_scrollview" android:id="@+id/settings_scrollview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@ -11,426 +11,340 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <TextView
android:id="@+id/settings_customize_colors_holder" android:id="@+id/settings_color_customization_label"
style="@style/SettingsSectionLabelStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin" android:text="@string/color_customization" />
android:background="?attr/selectableItemBackground"
android:paddingStart="@dimen/normal_margin"
android:paddingTop="@dimen/activity_margin"
android:paddingEnd="@dimen/normal_margin"
android:paddingBottom="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MyTextView <LinearLayout
android:id="@+id/settings_customize_colors_label" android:id="@+id/settings_color_customization_holder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingStart="@dimen/medium_margin"
android:text="@string/customize_colors" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_use_english_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin" android:layout_margin="@dimen/medium_margin"
android:background="?attr/selectableItemBackground" android:background="@drawable/section_holder_stroke"
android:paddingStart="@dimen/normal_margin" android:orientation="vertical">
android:paddingTop="@dimen/activity_margin"
android:paddingEnd="@dimen/normal_margin"
android:paddingBottom="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MySwitchCompat <RelativeLayout
android:id="@+id/settings_use_english" android:id="@+id/settings_customize_colors_holder"
style="@style/SettingsHolderTextViewOneLinerStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" android:background="@drawable/ripple_top_corners">
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/use_english_language"
app:switchPadding="@dimen/medium_margin" />
</RelativeLayout> <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_customize_colors_label"
style="@style/SettingsTextLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/customize_colors" />
<com.simplemobiletools.commons.views.MyTextView </RelativeLayout>
android:id="@+id/text_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/bigger_margin"
android:layout_marginTop="@dimen/section_margin"
android:text="@string/text"
android:textAllCaps="true"
android:textSize="@dimen/smaller_text_size" />
<RelativeLayout <RelativeLayout
android:id="@+id/settings_show_word_count_holder" android:id="@+id/settings_customize_widget_colors_holder"
android:layout_width="match_parent" style="@style/SettingsHolderTextViewOneLinerStyle"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
android:paddingStart="@dimen/normal_margin"
android:paddingTop="@dimen/activity_margin"
android:paddingEnd="@dimen/normal_margin"
android:paddingBottom="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MySwitchCompat
android:id="@+id/settings_show_word_count"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" android:background="@drawable/ripple_bottom_corners">
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/show_word_count"
app:switchPadding="@dimen/medium_margin" />
</RelativeLayout> <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_customize_widget_colors_label"
style="@style/SettingsTextLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/customize_widget_colors" />
<RelativeLayout </RelativeLayout>
android:id="@+id/settings_clickable_links_holder" </LinearLayout>
<TextView
android:id="@+id/settings_general_settings_label"
style="@style/SettingsSectionLabelStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin" android:text="@string/general_settings" />
android:background="?attr/selectableItemBackground"
android:paddingStart="@dimen/normal_margin"
android:paddingTop="@dimen/activity_margin"
android:paddingEnd="@dimen/normal_margin"
android:paddingBottom="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MySwitchCompat <LinearLayout
android:id="@+id/settings_clickable_links" android:id="@+id/settings_general_settings_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/medium_margin"
android:background="@drawable/section_holder_stroke"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/settings_use_english_holder"
style="@style/SettingsHolderCheckboxStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" android:background="@drawable/ripple_top_corners">
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/links_and_emails_clickable"
app:switchPadding="@dimen/medium_margin" />
</RelativeLayout> <com.simplemobiletools.commons.views.MyAppCompatCheckbox
android:id="@+id/settings_use_english"
style="@style/SettingsCheckboxStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/use_english_language" />
<RelativeLayout </RelativeLayout>
android:id="@+id/settings_monospaced_font_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
android:paddingStart="@dimen/normal_margin"
android:paddingTop="@dimen/activity_margin"
android:paddingEnd="@dimen/normal_margin"
android:paddingBottom="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MySwitchCompat <RelativeLayout
android:id="@+id/settings_monospaced_font" android:id="@+id/settings_font_size_holder"
style="@style/SettingsHolderTextViewStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" android:background="@drawable/ripple_bottom_corners">
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/monospaced_font"
app:switchPadding="@dimen/medium_margin" />
</RelativeLayout> <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_font_size_label"
style="@style/SettingsTextLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/font_size" />
<RelativeLayout <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_use_incognito_mode_holder" android:id="@+id/settings_font_size"
style="@style/SettingsTextValueStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/settings_font_size_label"
tools:text="100%" />
</RelativeLayout>
</LinearLayout>
<TextView
android:id="@+id/settings_text_label"
style="@style/SettingsSectionLabelStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin" android:text="@string/text" />
android:background="?attr/selectableItemBackground"
android:paddingStart="@dimen/normal_margin"
android:paddingTop="@dimen/activity_margin"
android:paddingEnd="@dimen/normal_margin"
android:paddingBottom="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MySwitchCompat <LinearLayout
android:id="@+id/settings_use_incognito_mode" android:id="@+id/settings_text_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/medium_margin"
android:background="@drawable/section_holder_stroke"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/settings_show_word_count_holder"
style="@style/SettingsHolderCheckboxStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" android:background="@drawable/ripple_top_corners">
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/use_incognito_mode"
app:switchPadding="@dimen/medium_margin" />
</RelativeLayout> <com.simplemobiletools.commons.views.MyAppCompatCheckbox
android:id="@+id/settings_show_word_count"
style="@style/SettingsCheckboxStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/show_word_count" />
<RelativeLayout </RelativeLayout>
android:id="@+id/settings_enable_line_wrap_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
android:paddingStart="@dimen/normal_margin"
android:paddingTop="@dimen/activity_margin"
android:paddingEnd="@dimen/normal_margin"
android:paddingBottom="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MySwitchCompat <RelativeLayout
android:id="@+id/settings_enable_line_wrap" android:id="@+id/settings_clickable_links_holder"
style="@style/SettingsHolderCheckboxStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" android:background="@drawable/ripple_background">
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/enable_line_wrap"
app:switchPadding="@dimen/medium_margin" />
</RelativeLayout> <com.simplemobiletools.commons.views.MyAppCompatCheckbox
android:id="@+id/settings_clickable_links"
style="@style/SettingsCheckboxStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/links_and_emails_clickable" />
<RelativeLayout </RelativeLayout>
android:id="@+id/settings_font_size_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
android:paddingStart="@dimen/normal_margin"
android:paddingTop="@dimen/activity_margin"
android:paddingEnd="@dimen/normal_margin"
android:paddingBottom="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MyTextView <RelativeLayout
android:id="@+id/settings_font_size_label" android:id="@+id/settings_monospaced_font_holder"
style="@style/SettingsHolderCheckboxStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:background="@drawable/ripple_background">
android:layout_toStartOf="@+id/settings_font_size"
android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin"
android:text="@string/font_size" />
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyAppCompatCheckbox
android:id="@+id/settings_font_size" android:id="@+id/settings_monospaced_font"
android:layout_width="wrap_content" style="@style/SettingsCheckboxStyle"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_alignParentEnd="true" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/medium_margin" android:text="@string/monospaced_font" />
android:background="@null"
android:clickable="false" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/settings_gravity_holder" android:id="@+id/settings_use_incognito_mode_holder"
android:layout_width="match_parent" style="@style/SettingsHolderCheckboxStyle"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
android:paddingStart="@dimen/normal_margin"
android:paddingTop="@dimen/activity_margin"
android:paddingEnd="@dimen/normal_margin"
android:paddingBottom="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_gravity_label"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:background="@drawable/ripple_background">
android:layout_toStartOf="@+id/settings_gravity"
android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin"
android:text="@string/alignment" />
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyAppCompatCheckbox
android:id="@+id/settings_gravity" android:id="@+id/settings_use_incognito_mode"
android:layout_width="wrap_content" style="@style/SettingsCheckboxStyle"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_alignParentEnd="true" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/medium_margin" android:text="@string/use_incognito_mode" />
android:background="@null"
android:clickable="false" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/settings_add_checklist_top_holder" android:id="@+id/settings_enable_line_wrap_holder"
android:layout_width="match_parent" style="@style/SettingsHolderCheckboxStyle"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
android:paddingStart="@dimen/normal_margin"
android:paddingTop="@dimen/activity_margin"
android:paddingEnd="@dimen/normal_margin"
android:paddingBottom="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MySwitchCompat
android:id="@+id/settings_add_checklist_top"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" android:background="@drawable/ripple_background">
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/add_new_checklist_items_top"
app:switchPadding="@dimen/medium_margin" />
</RelativeLayout> <com.simplemobiletools.commons.views.MyAppCompatCheckbox
android:id="@+id/settings_enable_line_wrap"
style="@style/SettingsCheckboxStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/enable_line_wrap" />
<com.simplemobiletools.commons.views.MyTextView </RelativeLayout>
android:id="@+id/startup_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/bigger_margin"
android:layout_marginTop="@dimen/section_margin"
android:text="@string/startup"
android:textAllCaps="true"
android:textSize="@dimen/smaller_text_size" />
<RelativeLayout <RelativeLayout
android:id="@+id/settings_cursor_placement_holder" android:id="@+id/settings_gravity_holder"
android:layout_width="match_parent" style="@style/SettingsHolderTextViewStyle"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
android:paddingStart="@dimen/normal_margin"
android:paddingTop="@dimen/activity_margin"
android:paddingEnd="@dimen/normal_margin"
android:paddingBottom="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MySwitchCompat
android:id="@+id/settings_cursor_placement"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" android:background="@drawable/ripple_bottom_corners">
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/place_cursor_end"
app:switchPadding="@dimen/medium_margin" />
</RelativeLayout> <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_gravity_label"
style="@style/SettingsTextLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/alignment" />
<RelativeLayout <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_show_keyboard_holder" android:id="@+id/settings_gravity"
style="@style/SettingsTextValueStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/settings_gravity_label"
tools:text="@string/left" />
</RelativeLayout>
</LinearLayout>
<TextView
android:id="@+id/settings_startup_label"
style="@style/SettingsSectionLabelStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin" android:text="@string/startup" />
android:background="?attr/selectableItemBackground"
android:paddingStart="@dimen/normal_margin"
android:paddingTop="@dimen/activity_margin"
android:paddingEnd="@dimen/normal_margin"
android:paddingBottom="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MySwitchCompat <LinearLayout
android:id="@+id/settings_show_keyboard" android:id="@+id/settings_startup_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/medium_margin"
android:background="@drawable/section_holder_stroke"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/settings_cursor_placement_holder"
style="@style/SettingsHolderCheckboxStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" android:background="@drawable/ripple_top_corners">
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/show_keyboard"
app:switchPadding="@dimen/medium_margin" />
</RelativeLayout> <com.simplemobiletools.commons.views.MyAppCompatCheckbox
android:id="@+id/settings_cursor_placement"
style="@style/SettingsCheckboxStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/place_cursor_end" />
<RelativeLayout </RelativeLayout>
android:id="@+id/settings_show_note_picker_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
android:paddingStart="@dimen/normal_margin"
android:paddingTop="@dimen/activity_margin"
android:paddingEnd="@dimen/normal_margin"
android:paddingBottom="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MySwitchCompat <RelativeLayout
android:id="@+id/settings_show_note_picker" android:id="@+id/settings_show_keyboard_holder"
style="@style/SettingsHolderCheckboxStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" android:background="@drawable/ripple_background">
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/show_note_picker"
app:switchPadding="@dimen/medium_margin" />
</RelativeLayout> <com.simplemobiletools.commons.views.MyAppCompatCheckbox
android:id="@+id/settings_show_keyboard"
style="@style/SettingsCheckboxStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/show_keyboard" />
<com.simplemobiletools.commons.views.MyTextView </RelativeLayout>
android:id="@+id/saving_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/bigger_margin"
android:layout_marginTop="@dimen/section_margin"
android:text="@string/saving_label"
android:textAllCaps="true"
android:textSize="@dimen/smaller_text_size" />
<RelativeLayout <RelativeLayout
android:id="@+id/settings_autosave_notes_holder" android:id="@+id/settings_show_note_picker_holder"
android:layout_width="match_parent" style="@style/SettingsHolderCheckboxStyle"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
android:paddingStart="@dimen/normal_margin"
android:paddingTop="@dimen/activity_margin"
android:paddingEnd="@dimen/normal_margin"
android:paddingBottom="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MySwitchCompat
android:id="@+id/settings_autosave_notes"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" android:background="@drawable/ripple_bottom_corners">
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/autosave_notes"
app:switchPadding="@dimen/medium_margin" />
</RelativeLayout> <com.simplemobiletools.commons.views.MyAppCompatCheckbox
android:id="@+id/settings_show_note_picker"
style="@style/SettingsCheckboxStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/show_note_picker" />
<RelativeLayout </RelativeLayout>
android:id="@+id/settings_display_success_holder" </LinearLayout>
<TextView
android:id="@+id/settings_saving_label"
style="@style/SettingsSectionLabelStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin" android:text="@string/saving_label" />
android:background="?attr/selectableItemBackground"
android:paddingStart="@dimen/normal_margin"
android:paddingTop="@dimen/activity_margin"
android:paddingEnd="@dimen/normal_margin"
android:paddingBottom="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MySwitchCompat <LinearLayout
android:id="@+id/settings_display_success" android:id="@+id/settings_saving_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/medium_margin"
android:background="@drawable/section_holder_stroke"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/settings_autosave_notes_holder"
style="@style/SettingsHolderCheckboxStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" android:background="@drawable/ripple_top_corners">
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/display_success_message"
app:switchPadding="@dimen/medium_margin" />
</RelativeLayout> <com.simplemobiletools.commons.views.MyAppCompatCheckbox
android:id="@+id/settings_autosave_notes"
style="@style/SettingsCheckboxStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/autosave_notes" />
<com.simplemobiletools.commons.views.MyTextView </RelativeLayout>
android:id="@+id/widgets_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/bigger_margin"
android:layout_marginTop="@dimen/section_margin"
android:text="@string/widgets"
android:textAllCaps="true"
android:textSize="@dimen/smaller_text_size" />
<RelativeLayout <RelativeLayout
android:id="@+id/settings_customize_widget_colors_holder" android:id="@+id/settings_display_success_holder"
android:layout_width="match_parent" style="@style/SettingsHolderCheckboxStyle"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
android:paddingStart="@dimen/normal_margin"
android:paddingTop="@dimen/activity_margin"
android:paddingEnd="@dimen/normal_margin"
android:paddingBottom="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_customize_widget_colors_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:background="@drawable/ripple_bottom_corners">
android:paddingStart="@dimen/medium_margin"
android:text="@string/customize_widget_colors" />
</RelativeLayout> <com.simplemobiletools.commons.views.MyAppCompatCheckbox
android:id="@+id/settings_display_success"
style="@style/SettingsCheckboxStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/display_success_message" />
</RelativeLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

34
app/src/main/res/layout/dialog_delete_note.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/delete_note_holder" android:id="@+id/delete_note_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -9,21 +10,30 @@
android:id="@+id/delete_note_description" android:id="@+id/delete_note_description"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/small_margin"
android:layout_marginTop="@dimen/medium_margin"
android:padding="@dimen/activity_margin" android:padding="@dimen/activity_margin"
android:textSize="@dimen/bigger_text_size" /> android:textSize="@dimen/bigger_text_size"
tools:text="@string/delete_note_prompt_message" />
<com.simplemobiletools.commons.views.MyAppCompatCheckbox <RelativeLayout
android:id="@+id/delete_note_checkbox" android:id="@+id/delete_note_checkbox_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/activity_margin" android:background="?attr/selectableItemBackground"
android:layout_marginEnd="@dimen/activity_margin" android:padding="@dimen/activity_margin"
android:checked="false" android:visibility="gone">
android:paddingStart="@dimen/activity_margin"
android:paddingTop="@dimen/small_margin"
android:paddingEnd="@dimen/activity_margin"
android:paddingBottom="@dimen/small_margin"
android:text="@string/delete_file_itself"
android:visibility="gone" />
<com.simplemobiletools.commons.views.MyAppCompatCheckbox
android:id="@+id/delete_note_checkbox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/small_margin"
android:background="@null"
android:checked="false"
android:clickable="false"
android:layoutDirection="rtl"
android:text="@string/delete_file_itself" />
</RelativeLayout>
</LinearLayout> </LinearLayout>

1
app/src/main/res/layout/dialog_new_checklist_item.xml
View File

@ -33,5 +33,4 @@
android:src="@drawable/ic_plus_vector" /> android:src="@drawable/ic_plus_vector" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

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

@ -11,7 +11,6 @@
android:id="@+id/notes_picker_holder" android:id="@+id/notes_picker_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="@dimen/activity_margin"
android:paddingBottom="@dimen/activity_margin"> android:paddingBottom="@dimen/activity_margin">
<RelativeLayout <RelativeLayout
@ -19,16 +18,15 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:paddingTop="@dimen/activity_margin" android:padding="@dimen/activity_margin">
android:paddingEnd="@dimen/activity_margin"
android:paddingBottom="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MySwitchCompat <com.simplemobiletools.commons.views.MyAppCompatCheckbox
android:id="@+id/show_note_title" android:id="@+id/show_note_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" android:background="@null"
android:clickable="false" android:clickable="false"
android:layoutDirection="rtl"
android:text="@string/show_note_title" android:text="@string/show_note_title"
app:switchPadding="@dimen/medium_margin" /> app:switchPadding="@dimen/medium_margin" />
@ -41,6 +39,7 @@
android:layout_below="@+id/show_note_title_holder" android:layout_below="@+id/show_note_title_holder"
android:layout_marginTop="@dimen/medium_margin" android:layout_marginTop="@dimen/medium_margin"
android:layout_marginBottom="@dimen/normal_margin" android:layout_marginBottom="@dimen/normal_margin"
android:paddingStart="@dimen/activity_margin"
android:text="@string/note_shown_widget" /> android:text="@string/note_shown_widget" />
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
@ -48,6 +47,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/notes_picker_label" android:layout_below="@+id/notes_picker_label"
android:layout_marginStart="@dimen/activity_margin"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:padding="@dimen/normal_margin" android:padding="@dimen/normal_margin"
android:text="@string/general_note" /> android:text="@string/general_note" />

2
app/src/main/res/menu/cab_checklist.xml
View File

@ -13,7 +13,7 @@
app:showAsAction="always" /> app:showAsAction="always" />
<item <item
android:id="@+id/cab_rename" android:id="@+id/cab_rename"
android:icon="@drawable/ic_rename_new" android:icon="@drawable/ic_rename_vector"
android:title="@string/rename" android:title="@string/rename"
app:showAsAction="always" /> app:showAsAction="always" />
<item <item

8
app/src/main/res/menu/menu.xml
View File

@ -33,7 +33,7 @@
app:showAsAction="ifRoom" /> app:showAsAction="ifRoom" />
<item <item
android:id="@+id/rename_note" android:id="@+id/rename_note"
android:icon="@drawable/ic_rename_new" android:icon="@drawable/ic_rename_vector"
android:title="@string/rename_note" android:title="@string/rename_note"
app:showAsAction="ifRoom" /> app:showAsAction="ifRoom" />
<item <item
@ -86,10 +86,12 @@
app:showAsAction="ifRoom" /> app:showAsAction="ifRoom" />
<item <item
android:id="@+id/settings" android:id="@+id/settings"
android:icon="@drawable/ic_settings_cog_vector"
android:title="@string/settings" android:title="@string/settings"
app:showAsAction="never" /> app:showAsAction="ifRoom" />
<item <item
android:id="@+id/about" android:id="@+id/about"
android:icon="@drawable/ic_info_vector"
android:title="@string/about" android:title="@string/about"
app:showAsAction="never" /> app:showAsAction="ifRoom" />
</menu> </menu>

2
build.gradle
View File

@ -9,7 +9,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.0.2' classpath 'com.android.tools.build:gradle:7.0.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong