fenix/Simple-Notes
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git synced 2025-04-03 10:11:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #661 from esensar/viewbinding-migration

Browse Source 
Migrate to viewbinding and kotlin gradle scripts
This commit is contained in:
Tibor Kaputa 2023-08-04 11:43:22 +02:00 committed by GitHub
commit bbb00cf771
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 853 additions and 604 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
app/build.gradle
View File

@ -1,78 +0,0 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'kotlin-android-extensions'
id 'kotlin-kapt'
id 'org.jetbrains.kotlin.plugin.serialization' version "$kotlin_version"
}
def keystorePropertiesFile = rootProject.file("keystore.properties")
def keystoreProperties = new Properties()
if (keystorePropertiesFile.exists()) {
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
}
android {
compileSdk 34
defaultConfig {
applicationId "com.simplemobiletools.notes.pro"
minSdkVersion 23
targetSdkVersion 34
versionCode 109
versionName "6.16.1"
setProperty("archivesBaseName", "notes")
}
signingConfigs {
if (keystorePropertiesFile.exists()) {
release {
keyAlias keystoreProperties['keyAlias']
keyPassword keystoreProperties['keyPassword']
storeFile file(keystoreProperties['storeFile'])
storePassword keystoreProperties['storePassword']
}
}
}
buildTypes {
debug {
applicationIdSuffix ".debug"
}
release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
if (keystorePropertiesFile.exists()) {
signingConfig signingConfigs.release
}
}
}
flavorDimensions "variants"
productFlavors {
core {}
fdroid {}
prepaid {}
}
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}
lintOptions {
checkReleaseBuilds false
abortOnError false
}
}
dependencies {
implementation 'com.github.SimpleMobileTools:Simple-Commons:2a2c17151e'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.documentfile:documentfile:1.0.1'
kapt 'androidx.room:room-compiler:2.5.2'
implementation 'androidx.room:room-runtime:2.5.2'
annotationProcessor 'androidx.room:room-compiler:2.5.2'
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"
}

102
app/build.gradle.kts Normal file
View File

@ -0,0 +1,102 @@
import java.io.FileInputStream
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.konan.properties.Properties
plugins {
alias(libs.plugins.android)
alias(libs.plugins.kotlinAndroid)
alias(libs.plugins.ksp)
alias(libs.plugins.kotlinSerialization)
}
val keystorePropertiesFile: File = rootProject.file("keystore.properties")
val keystoreProperties = Properties()
if (keystorePropertiesFile.exists()) {
keystoreProperties.load(FileInputStream(keystorePropertiesFile))
}
android {
compileSdk = project.libs.versions.app.build.compileSDKVersion.get().toInt()
defaultConfig {
applicationId = libs.versions.app.version.appId.get()
minSdk = project.libs.versions.app.build.minimumSDK.get().toInt()
targetSdk = project.libs.versions.app.build.targetSDK.get().toInt()
versionName = project.libs.versions.app.version.versionName.get()
versionCode = project.libs.versions.app.version.versionCode.get().toInt()
setProperty("archivesBaseName", "notes")
ksp {
arg("room.schemaLocation", "$projectDir/schemas")
}
}
signingConfigs {
if (keystorePropertiesFile.exists()) {
register("release") {
keyAlias = keystoreProperties.getProperty("keyAlias")
keyPassword = keystoreProperties.getProperty("keyPassword")
storeFile = file(keystoreProperties.getProperty("storeFile"))
storePassword = keystoreProperties.getProperty("storePassword")
}
}
}
buildFeatures {
viewBinding = true
buildConfig = true
}
buildTypes {
debug {
applicationIdSuffix = ".debug"
}
release {
isMinifyEnabled = true
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
if (keystorePropertiesFile.exists()) {
signingConfig = signingConfigs.getByName("release")
}
}
}
flavorDimensions.add("variants")
productFlavors {
register("core")
register("fdroid")
register("prepaid")
}
sourceSets {
getByName("main").java.srcDirs("src/main/kotlin")
}
compileOptions {
val currentJavaVersionFromLibs = JavaVersion.valueOf(libs.versions.app.build.javaVersion.get().toString())
sourceCompatibility = currentJavaVersionFromLibs
targetCompatibility = currentJavaVersionFromLibs
}
tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = project.libs.versions.app.build.kotlinJVMTarget.get()
}
namespace = libs.versions.app.version.appId.get()
lint {
checkReleaseBuilds = false
abortOnError = false
}
}
dependencies {
implementation(libs.simple.tools.commons)
implementation(libs.androidx.constraintlayout)
implementation(libs.androidx.documentfile)
implementation(libs.kotlinx.serialization.json)
implementation(libs.bundles.room)
ksp(libs.androidx.room.compiler)
}

140
app/schemas/com.simplemobiletools.notes.pro.databases.NotesDatabase/4.json Normal file
View File

@ -0,0 +1,140 @@
{
"formatVersion": 1,
"database": {
"version": 4,
"identityHash": "e470b6e1411ee6659417cf4dbe54f453",
"entities": [
{
"tableName": "notes",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `title` TEXT NOT NULL, `value` TEXT NOT NULL, `type` INTEGER NOT NULL, `path` TEXT NOT NULL, `protection_type` INTEGER NOT NULL, `protection_hash` TEXT NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "title",
"columnName": "title",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "value",
"columnName": "value",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "type",
"columnName": "type",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "path",
"columnName": "path",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "protectionType",
"columnName": "protection_type",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "protectionHash",
"columnName": "protection_hash",
"affinity": "TEXT",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
},
"indices": [
{
"name": "index_notes_id",
"unique": true,
"columnNames": [
"id"
],
"orders": [],
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_notes_id` ON `${TABLE_NAME}` (`id`)"
}
],
"foreignKeys": []
},
{
"tableName": "widgets",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `widget_id` INTEGER NOT NULL, `note_id` INTEGER NOT NULL, `widget_bg_color` INTEGER NOT NULL, `widget_text_color` INTEGER NOT NULL, `widget_show_title` INTEGER NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "widgetId",
"columnName": "widget_id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "noteId",
"columnName": "note_id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "widgetBgColor",
"columnName": "widget_bg_color",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "widgetTextColor",
"columnName": "widget_text_color",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "widgetShowTitle",
"columnName": "widget_show_title",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
},
"indices": [
{
"name": "index_widgets_widget_id",
"unique": true,
"columnNames": [
"widget_id"
],
"orders": [],
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_widgets_widget_id` ON `${TABLE_NAME}` (`widget_id`)"
}
],
"foreignKeys": []
}
],
"views": [],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'e470b6e1411ee6659417cf4dbe54f453')"
]
}
}

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

@ -39,14 +39,13 @@ import com.simplemobiletools.notes.pro.BuildConfig
import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.adapters.NotesPagerAdapter import com.simplemobiletools.notes.pro.adapters.NotesPagerAdapter
import com.simplemobiletools.notes.pro.databases.NotesDatabase import com.simplemobiletools.notes.pro.databases.NotesDatabase
import com.simplemobiletools.notes.pro.databinding.ActivityMainBinding
import com.simplemobiletools.notes.pro.dialogs.* import com.simplemobiletools.notes.pro.dialogs.*
import com.simplemobiletools.notes.pro.extensions.* import com.simplemobiletools.notes.pro.extensions.*
import com.simplemobiletools.notes.pro.fragments.TextFragment import com.simplemobiletools.notes.pro.fragments.TextFragment
import com.simplemobiletools.notes.pro.helpers.* import com.simplemobiletools.notes.pro.helpers.*
import com.simplemobiletools.notes.pro.models.Note import com.simplemobiletools.notes.pro.models.Note
import com.simplemobiletools.notes.pro.models.NoteType import com.simplemobiletools.notes.pro.models.NoteType
import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.item_checklist.*
import java.io.File import java.io.File
import java.nio.charset.Charset import java.nio.charset.Charset
import java.util.* import java.util.*
@ -81,26 +80,29 @@ class MainActivity : SimpleActivity() {
private lateinit var searchNextBtn: ImageView private lateinit var searchNextBtn: ImageView
private lateinit var searchClearBtn: ImageView private lateinit var searchClearBtn: ImageView
private lateinit var binding: ActivityMainBinding
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
isMaterialActivity = true isMaterialActivity = true
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main) binding = ActivityMainBinding.inflate(layoutInflater)
setContentView(binding.root)
appLaunched(BuildConfig.APPLICATION_ID) appLaunched(BuildConfig.APPLICATION_ID)
setupOptionsMenu() setupOptionsMenu()
refreshMenuItems() refreshMenuItems()
updateMaterialActivityViews(main_coordinator, null, useTransparentNavigation = false, useTopSearchMenu = false) updateMaterialActivityViews(binding.mainCoordinator, null, useTransparentNavigation = false, useTopSearchMenu = false)
searchQueryET = findViewById(R.id.search_query) searchQueryET = findViewById(com.simplemobiletools.commons.R.id.search_query)
searchPrevBtn = findViewById(R.id.search_previous) searchPrevBtn = findViewById(com.simplemobiletools.commons.R.id.search_previous)
searchNextBtn = findViewById(R.id.search_next) searchNextBtn = findViewById(com.simplemobiletools.commons.R.id.search_next)
searchClearBtn = findViewById(R.id.search_clear) searchClearBtn = findViewById(com.simplemobiletools.commons.R.id.search_clear)
initViewPager(intent.getLongExtra(OPEN_NOTE_ID, -1L)) initViewPager(intent.getLongExtra(OPEN_NOTE_ID, -1L))
pager_tab_strip.drawFullUnderline = false binding.pagerTabStrip.drawFullUnderline = false
pager_tab_strip.setTextSize(TypedValue.COMPLEX_UNIT_PX, getPercentageFontSize()) binding.pagerTabStrip.setTextSize(TypedValue.COMPLEX_UNIT_PX, getPercentageFontSize())
pager_tab_strip.layoutParams.height = binding.pagerTabStrip.layoutParams.height =
(pager_tab_strip.height + resources.getDimension(R.dimen.activity_margin) * 2 * (config.fontSizePercentage / 100f)).toInt() (binding.pagerTabStrip.height + resources.getDimension(com.simplemobiletools.commons.R.dimen.activity_margin) * 2 * (config.fontSizePercentage / 100f)).toInt()
checkWhatsNewDialog() checkWhatsNewDialog()
checkIntents(intent) checkIntents(intent)
@ -115,14 +117,14 @@ class MainActivity : SimpleActivity() {
setupSearchButtons() setupSearchButtons()
if (isPackageInstalled("com.simplemobiletools.notes")) { if (isPackageInstalled("com.simplemobiletools.notes")) {
val dialogText = getString(R.string.upgraded_from_free_notes) val dialogText = getString(com.simplemobiletools.commons.R.string.upgraded_from_free_notes)
ConfirmationDialog(this, dialogText, 0, R.string.ok, 0, false) {} ConfirmationDialog(this, dialogText, 0, com.simplemobiletools.commons.R.string.ok, 0, false) {}
} }
} }
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
setupToolbar(main_toolbar) setupToolbar(binding.mainToolbar)
if (storedEnableLineWrap != config.enableLineWrap) { if (storedEnableLineWrap != config.enableLineWrap) {
initViewPager() initViewPager()
} }
@ -134,24 +136,24 @@ class MainActivity : SimpleActivity() {
} }
refreshMenuItems() refreshMenuItems()
pager_tab_strip.apply { binding.pagerTabStrip.apply {
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(getProperPrimaryColor()) setTextColor(getProperPrimaryColor())
tabIndicatorColor = getProperPrimaryColor() tabIndicatorColor = getProperPrimaryColor()
} }
updateTextColors(view_pager) updateTextColors(binding.viewPager)
checkShortcuts() checkShortcuts()
search_wrapper.setBackgroundColor(getProperStatusBarColor()) binding.searchWrapper.setBackgroundColor(getProperStatusBarColor())
val contrastColor = getProperPrimaryColor().getContrastColor() val contrastColor = getProperPrimaryColor().getContrastColor()
arrayListOf(searchPrevBtn, searchNextBtn, searchClearBtn).forEach { arrayListOf(searchPrevBtn, searchNextBtn, searchClearBtn).forEach {
it.applyColorFilter(contrastColor) it.applyColorFilter(contrastColor)
} }
updateTopBarColors(main_toolbar, getProperBackgroundColor()) updateTopBarColors(binding.mainToolbar, getProperBackgroundColor())
} }
override fun onPause() { override fun onPause() {
@ -170,7 +172,7 @@ class MainActivity : SimpleActivity() {
val multipleNotesExist = mNotes.size > 1 val multipleNotesExist = mNotes.size > 1
val isCurrentItemChecklist = isCurrentItemChecklist() val isCurrentItemChecklist = isCurrentItemChecklist()
main_toolbar.menu.apply { binding.mainToolbar.menu.apply {
findItem(R.id.undo).apply { findItem(R.id.undo).apply {
isVisible = showUndoButton && mCurrentNote.type == NoteType.TYPE_TEXT isVisible = showUndoButton && mCurrentNote.type == NoteType.TYPE_TEXT
icon?.alpha = if (isEnabled) 255 else 127 icon?.alpha = if (isEnabled) 255 else 127
@ -190,18 +192,18 @@ class MainActivity : SimpleActivity() {
findItem(R.id.import_folder).isVisible = !isQPlus() findItem(R.id.import_folder).isVisible = !isQPlus()
findItem(R.id.lock_note).isVisible = mNotes.isNotEmpty() && (::mCurrentNote.isInitialized && !mCurrentNote.isLocked()) findItem(R.id.lock_note).isVisible = mNotes.isNotEmpty() && (::mCurrentNote.isInitialized && !mCurrentNote.isLocked())
findItem(R.id.unlock_note).isVisible = mNotes.isNotEmpty() && (::mCurrentNote.isInitialized && mCurrentNote.isLocked()) findItem(R.id.unlock_note).isVisible = mNotes.isNotEmpty() && (::mCurrentNote.isInitialized && mCurrentNote.isLocked())
findItem(R.id.more_apps_from_us).isVisible = !resources.getBoolean(R.bool.hide_google_relations) findItem(R.id.more_apps_from_us).isVisible = !resources.getBoolean(com.simplemobiletools.commons.R.bool.hide_google_relations)
saveNoteButton = findItem(R.id.save_note) saveNoteButton = findItem(R.id.save_note)
saveNoteButton!!.isVisible = saveNoteButton!!.isVisible =
!config.autosaveNotes && showSaveButton && (::mCurrentNote.isInitialized && mCurrentNote.type == NoteType.TYPE_TEXT) !config.autosaveNotes && showSaveButton && (::mCurrentNote.isInitialized && mCurrentNote.type == NoteType.TYPE_TEXT)
} }
pager_tab_strip.beVisibleIf(multipleNotesExist) binding.pagerTabStrip.beVisibleIf(multipleNotesExist)
} }
private fun setupOptionsMenu() { private fun setupOptionsMenu() {
main_toolbar.setOnMenuItemClickListener { menuItem -> binding.mainToolbar.setOnMenuItemClickListener { menuItem ->
if (config.autosaveNotes && menuItem.itemId != R.id.undo && menuItem.itemId != R.id.redo) { if (config.autosaveNotes && menuItem.itemId != R.id.undo && menuItem.itemId != R.id.redo) {
saveCurrentNote(false) saveCurrentNote(false)
} }
@ -257,7 +259,7 @@ class MainActivity : SimpleActivity() {
override fun onBackPressed() { override fun onBackPressed() {
if (!config.autosaveNotes && mAdapter?.anyHasUnsavedChanges() == true) { if (!config.autosaveNotes && mAdapter?.anyHasUnsavedChanges() == true) {
ConfirmationAdvancedDialog(this, "", R.string.unsaved_changes_warning, R.string.save, R.string.discard) { ConfirmationAdvancedDialog(this, "", R.string.unsaved_changes_warning, com.simplemobiletools.commons.R.string.save, com.simplemobiletools.commons.R.string.discard) {
if (it) { if (it) {
mAdapter?.saveAllFragmentTexts() mAdapter?.saveAllFragmentTexts()
} }
@ -273,7 +275,7 @@ class MainActivity : SimpleActivity() {
override fun onNewIntent(intent: Intent) { override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent) super.onNewIntent(intent)
val wantedNoteId = intent.getLongExtra(OPEN_NOTE_ID, -1L) val wantedNoteId = intent.getLongExtra(OPEN_NOTE_ID, -1L)
view_pager.currentItem = getWantedNoteIndex(wantedNoteId) binding.viewPager.currentItem = getWantedNoteIndex(wantedNoteId)
checkIntents(intent) checkIntents(intent)
} }
@ -309,7 +311,7 @@ class MainActivity : SimpleActivity() {
private fun getNewTextNoteShortcut(appIconColor: Int): ShortcutInfo { private fun getNewTextNoteShortcut(appIconColor: Int): ShortcutInfo {
val shortLabel = getString(R.string.text_note) val shortLabel = getString(R.string.text_note)
val longLabel = getString(R.string.new_text_note) val longLabel = getString(R.string.new_text_note)
val drawable = resources.getDrawable(R.drawable.shortcut_plus) val drawable = resources.getDrawable(com.simplemobiletools.commons.R.drawable.shortcut_plus)
(drawable as LayerDrawable).findDrawableByLayerId(R.id.shortcut_plus_background).applyColorFilter(appIconColor) (drawable as LayerDrawable).findDrawableByLayerId(R.id.shortcut_plus_background).applyColorFilter(appIconColor)
val bmp = drawable.convertToBitmap() val bmp = drawable.convertToBitmap()
@ -426,7 +428,7 @@ class MainActivity : SimpleActivity() {
mNotes = notes mNotes = notes
mCurrentNote = mNotes[0] mCurrentNote = mNotes[0]
mAdapter = NotesPagerAdapter(supportFragmentManager, mNotes, this) mAdapter = NotesPagerAdapter(supportFragmentManager, mNotes, this)
view_pager.apply { binding.viewPager.apply {
adapter = mAdapter adapter = mAdapter
currentItem = getWantedNoteIndex(wantedNoteId) currentItem = getWantedNoteIndex(wantedNoteId)
config.currentNoteId = mCurrentNote.id!! config.currentNoteId = mCurrentNote.id!!
@ -462,7 +464,7 @@ class MainActivity : SimpleActivity() {
closeSearch() closeSearch()
} }
view_pager.onPageChangeListener { binding.viewPager.onPageChangeListener {
currentTextFragment?.removeTextWatcher() currentTextFragment?.removeTextWatcher()
currentNotesView()?.let { noteView -> currentNotesView()?.let { noteView ->
noteView.text!!.clearBackgroundSpans() noteView.text!!.clearBackgroundSpans()
@ -529,9 +531,9 @@ class MainActivity : SimpleActivity() {
} }
} }
private fun getCurrentFragment() = mAdapter?.getFragment(view_pager.currentItem) private fun getCurrentFragment() = mAdapter?.getFragment(binding.viewPager.currentItem)
private val currentTextFragment: TextFragment? get() = mAdapter?.textFragment(view_pager.currentItem) private val currentTextFragment: TextFragment? get() = mAdapter?.textFragment(binding.viewPager.currentItem)
private fun selectSearchMatch(editText: MyEditText) { private fun selectSearchMatch(editText: MyEditText) {
if (searchMatches.isNotEmpty()) { if (searchMatches.isNotEmpty()) {
@ -544,7 +546,7 @@ class MainActivity : SimpleActivity() {
private fun openSearch() { private fun openSearch() {
isSearchActive = true isSearchActive = true
search_wrapper.fadeIn() binding.searchWrapper.fadeIn()
showKeyboard(searchQueryET) showKeyboard(searchQueryET)
currentNotesView()?.let { noteView -> currentNotesView()?.let { noteView ->
@ -560,7 +562,7 @@ class MainActivity : SimpleActivity() {
private fun closeSearch() { private fun closeSearch() {
searchQueryET.text?.clear() searchQueryET.text?.clear()
isSearchActive = false isSearchActive = false
search_wrapper.fadeOut() binding.searchWrapper.fadeOut()
hideKeyboard() hideKeyboard()
} }
@ -570,10 +572,10 @@ class MainActivity : SimpleActivity() {
return getNoteIndexWithId(noteIdToOpen) return getNoteIndexWithId(noteIdToOpen)
} }
private fun currentNotesView() = if (view_pager == null) { private fun currentNotesView() = if (binding.viewPager == null) {
null null
} else { } else {
mAdapter?.getCurrentNotesView(view_pager.currentItem) mAdapter?.getCurrentNotesView(binding.viewPager.currentItem)
} }
private fun displayRenameDialog() { private fun displayRenameDialog() {
@ -592,7 +594,7 @@ class MainActivity : SimpleActivity() {
} }
} else { } else {
val index = getNoteIndexWithId(id) val index = getNoteIndexWithId(id)
view_pager.currentItem = index binding.viewPager.currentItem = index
mCurrentNote = mNotes[index] mCurrentNote = mNotes[index]
} }
} }
@ -613,7 +615,7 @@ class MainActivity : SimpleActivity() {
showRedoButton = false showRedoButton = false
initViewPager(newNoteId) initViewPager(newNoteId)
updateSelectedNote(newNoteId) updateSelectedNote(newNoteId)
view_pager.onGlobalLayout { binding.viewPager.onGlobalLayout {
mAdapter?.focusEditText(getNoteIndexWithId(newNoteId)) mAdapter?.focusEditText(getNoteIndexWithId(newNoteId))
} }
} }
@ -628,15 +630,15 @@ class MainActivity : SimpleActivity() {
val licenses = LICENSE_RTL val licenses = LICENSE_RTL
val faqItems = arrayListOf( val faqItems = arrayListOf(
FAQItem(R.string.faq_1_title_commons, R.string.faq_1_text_commons), FAQItem(com.simplemobiletools.commons.R.string.faq_1_title_commons, com.simplemobiletools.commons.R.string.faq_1_text_commons),
FAQItem(R.string.faq_1_title, R.string.faq_1_text) FAQItem(R.string.faq_1_title, R.string.faq_1_text)
) )
if (!resources.getBoolean(R.bool.hide_google_relations)) { if (!resources.getBoolean(com.simplemobiletools.commons.R.bool.hide_google_relations)) {
faqItems.add(FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons)) faqItems.add(FAQItem(com.simplemobiletools.commons.R.string.faq_2_title_commons, com.simplemobiletools.commons.R.string.faq_2_text_commons))
faqItems.add(FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons)) faqItems.add(FAQItem(com.simplemobiletools.commons.R.string.faq_6_title_commons, com.simplemobiletools.commons.R.string.faq_6_text_commons))
faqItems.add(FAQItem(R.string.faq_7_title_commons, R.string.faq_7_text_commons)) faqItems.add(FAQItem(com.simplemobiletools.commons.R.string.faq_7_title_commons, com.simplemobiletools.commons.R.string.faq_7_text_commons))
faqItems.add(FAQItem(R.string.faq_10_title_commons, R.string.faq_10_text_commons)) faqItems.add(FAQItem(com.simplemobiletools.commons.R.string.faq_10_title_commons, com.simplemobiletools.commons.R.string.faq_10_text_commons))
} }
startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true) startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true)
@ -656,7 +658,7 @@ class MainActivity : SimpleActivity() {
putExtra(Intent.EXTRA_MIME_TYPES, mimetypes) putExtra(Intent.EXTRA_MIME_TYPES, mimetypes)
startActivityForResult(this, PICK_OPEN_FILE_INTENT) startActivityForResult(this, PICK_OPEN_FILE_INTENT)
} catch (e: ActivityNotFoundException) { } catch (e: ActivityNotFoundException) {
toast(R.string.system_service_disabled, Toast.LENGTH_LONG) toast(com.simplemobiletools.commons.R.string.system_service_disabled, Toast.LENGTH_LONG)
} catch (e: Exception) { } catch (e: Exception) {
showErrorToast(e) showErrorToast(e)
} }
@ -693,7 +695,7 @@ class MainActivity : SimpleActivity() {
private fun checkFile(path: String, checkTitle: Boolean, onChecksPassed: (file: File) -> Unit) { private fun checkFile(path: String, checkTitle: Boolean, onChecksPassed: (file: File) -> Unit) {
val file = File(path) val file = File(path)
if (path.isMediaFile()) { if (path.isMediaFile()) {
toast(R.string.invalid_file_format) toast(com.simplemobiletools.commons.R.string.invalid_file_format)
} else if (file.length() > 1000 * 1000) { } else if (file.length() > 1000 * 1000) {
toast(R.string.file_too_large) toast(R.string.file_too_large)
} else if (checkTitle && mNotes.any { it.title.equals(path.getFilenameFromPath(), true) }) { } else if (checkTitle && mNotes.any { it.title.equals(path.getFilenameFromPath(), true) }) {
@ -734,7 +736,7 @@ class MainActivity : SimpleActivity() {
if (realPath != null) { if (realPath != null) {
openPath(realPath) openPath(realPath)
} else { } else {
R.string.unknown_error_occurred com.simplemobiletools.commons.R.string.unknown_error_occurred
} }
} else if (realPath != null && realPath != "") { } else if (realPath != null && realPath != "") {
checkFile(realPath, false) { checkFile(realPath, false) {
@ -831,7 +833,7 @@ class MainActivity : SimpleActivity() {
} }
} }
} else { } else {
toast(R.string.no_storage_permissions) toast(com.simplemobiletools.commons.R.string.no_storage_permissions)
} }
} }
} }
@ -861,7 +863,7 @@ class MainActivity : SimpleActivity() {
try { try {
startActivityForResult(this, PICK_EXPORT_FILE_INTENT) startActivityForResult(this, PICK_EXPORT_FILE_INTENT)
} catch (e: ActivityNotFoundException) { } catch (e: ActivityNotFoundException) {
toast(R.string.system_service_disabled, Toast.LENGTH_LONG) toast(com.simplemobiletools.commons.R.string.system_service_disabled, Toast.LENGTH_LONG)
} catch (e: NetworkErrorException) { } catch (e: NetworkErrorException) {
toast(getString(R.string.cannot_load_over_internet), Toast.LENGTH_LONG) toast(getString(R.string.cannot_load_over_internet), Toast.LENGTH_LONG)
} catch (e: Exception) { } catch (e: Exception) {
@ -875,7 +877,7 @@ class MainActivity : SimpleActivity() {
ExportFileDialog(this, mCurrentNote) { ExportFileDialog(this, mCurrentNote) {
val textToExport = if (mCurrentNote.type == NoteType.TYPE_TEXT) getCurrentNoteText() else mCurrentNote.value val textToExport = if (mCurrentNote.type == NoteType.TYPE_TEXT) getCurrentNoteText() else mCurrentNote.value
if (textToExport == null || textToExport.isEmpty()) { if (textToExport == null || textToExport.isEmpty()) {
toast(R.string.unknown_error_occurred) toast(com.simplemobiletools.commons.R.string.unknown_error_occurred)
} else if (mCurrentNote.type == NoteType.TYPE_TEXT) { } else if (mCurrentNote.type == NoteType.TYPE_TEXT) {
showExportFilePickUpdateDialog(it, textToExport) showExportFilePickUpdateDialog(it, textToExport)
} else { } else {
@ -902,7 +904,7 @@ class MainActivity : SimpleActivity() {
mCurrentNote.value = textToExport mCurrentNote.value = textToExport
} }
getPagerAdapter().updateCurrentNoteData(view_pager.currentItem, mCurrentNote.path, mCurrentNote.value) getPagerAdapter().updateCurrentNoteData(binding.viewPager.currentItem, mCurrentNote.path, mCurrentNote.value)
NotesHelper(this).insertOrUpdateNote(mCurrentNote) NotesHelper(this).insertOrUpdateNote(mCurrentNote)
} }
} }
@ -924,7 +926,7 @@ class MainActivity : SimpleActivity() {
private fun exportNoteValueToFile(path: String, content: String, showSuccessToasts: Boolean, callback: ((success: Boolean) -> Unit)? = null) { private fun exportNoteValueToFile(path: String, content: String, showSuccessToasts: Boolean, callback: ((success: Boolean) -> Unit)? = null) {
try { try {
if (File(path).isDirectory) { if (File(path).isDirectory) {
toast(R.string.name_taken) toast(com.simplemobiletools.commons.R.string.name_taken)
return return
} }
@ -1022,15 +1024,15 @@ class MainActivity : SimpleActivity() {
} }
} }
private fun getPagerAdapter() = view_pager.adapter as NotesPagerAdapter private fun getPagerAdapter() = binding.viewPager.adapter as NotesPagerAdapter
private fun getCurrentNoteText() = getPagerAdapter().getCurrentNoteViewText(view_pager.currentItem) private fun getCurrentNoteText() = getPagerAdapter().getCurrentNoteViewText(binding.viewPager.currentItem)
private fun getCurrentNoteValue(): String { private fun getCurrentNoteValue(): String {
return if (mCurrentNote.type == NoteType.TYPE_TEXT) { return if (mCurrentNote.type == NoteType.TYPE_TEXT) {
getCurrentNoteText() ?: "" getCurrentNoteText() ?: ""
} else { } else {
getPagerAdapter().getNoteChecklistItems(view_pager.currentItem) ?: "" getPagerAdapter().getNoteChecklistItems(binding.viewPager.currentItem) ?: ""
} }
} }
@ -1039,19 +1041,19 @@ class MainActivity : SimpleActivity() {
getCurrentNoteText() ?: "" getCurrentNoteText() ?: ""
} else { } else {
var printableText = "" var printableText = ""
getPagerAdapter().getNoteChecklistRawItems(view_pager.currentItem)?.forEach { getPagerAdapter().getNoteChecklistRawItems(binding.viewPager.currentItem)?.forEach {
printableText += "${it.title}\n\n" printableText += "${it.title}\n\n"
} }
printableText printableText
} }
} }
private fun addTextToCurrentNote(text: String) = getPagerAdapter().appendText(view_pager.currentItem, text) private fun addTextToCurrentNote(text: String) = getPagerAdapter().appendText(binding.viewPager.currentItem, text)
private fun saveCurrentNote(force: Boolean) { private fun saveCurrentNote(force: Boolean) {
getPagerAdapter().saveCurrentNote(view_pager.currentItem, force) getPagerAdapter().saveCurrentNote(binding.viewPager.currentItem, force)
if (mCurrentNote.type == NoteType.TYPE_CHECKLIST) { if (mCurrentNote.type == NoteType.TYPE_CHECKLIST) {
mCurrentNote.value = getPagerAdapter().getNoteChecklistItems(view_pager.currentItem) ?: "" mCurrentNote.value = getPagerAdapter().getNoteChecklistItems(binding.viewPager.currentItem) ?: ""
} }
} }
@ -1102,7 +1104,7 @@ class MainActivity : SimpleActivity() {
if (deleteFile) { if (deleteFile) {
deleteFile(FileDirItem(note.path, note.title)) { deleteFile(FileDirItem(note.path, note.title)) {
if (!it) { if (!it) {
toast(R.string.unknown_error_occurred) toast(com.simplemobiletools.commons.R.string.unknown_error_occurred)
} }
} }
} }
@ -1130,11 +1132,11 @@ class MainActivity : SimpleActivity() {
} }
private fun undo() { private fun undo() {
mAdapter?.undo(view_pager.currentItem) mAdapter?.undo(binding.viewPager.currentItem)
} }
private fun redo() { private fun redo() {
mAdapter?.redo(view_pager.currentItem) mAdapter?.redo(binding.viewPager.currentItem)
} }
private fun getNoteIndexWithId(id: Long): Int { private fun getNoteIndexWithId(id: Long): Int {
@ -1155,7 +1157,7 @@ class MainActivity : SimpleActivity() {
} }
val res = resources val res = resources
val shareTitle = res.getString(R.string.share_via) val shareTitle = res.getString(com.simplemobiletools.commons.R.string.share_via)
Intent().apply { Intent().apply {
action = Intent.ACTION_SEND action = Intent.ACTION_SEND
putExtra(Intent.EXTRA_SUBJECT, mCurrentNote.title) putExtra(Intent.EXTRA_SUBJECT, mCurrentNote.title)
@ -1190,7 +1192,7 @@ class MainActivity : SimpleActivity() {
} }
private fun lockNote() { private fun lockNote() {
ConfirmationDialog(this, "", R.string.locking_warning, R.string.ok, R.string.cancel) { ConfirmationDialog(this, "", R.string.locking_warning, com.simplemobiletools.commons.R.string.ok, com.simplemobiletools.commons.R.string.cancel) {
SecurityDialog(this, "", SHOW_ALL_TABS) { hash, type, success -> SecurityDialog(this, "", SHOW_ALL_TABS) { hash, type, success ->
if (success) { if (success) {
mCurrentNote.protectionHash = hash mCurrentNote.protectionHash = hash
@ -1271,12 +1273,12 @@ class MainActivity : SimpleActivity() {
} }
private fun removeDoneItems() { private fun removeDoneItems() {
getPagerAdapter().removeDoneCheckListItems(view_pager.currentItem) getPagerAdapter().removeDoneCheckListItems(binding.viewPager.currentItem)
} }
private fun displaySortChecklistDialog() { private fun displaySortChecklistDialog() {
SortChecklistDialog(this) { SortChecklistDialog(this) {
getPagerAdapter().refreshChecklist(view_pager.currentItem) getPagerAdapter().refreshChecklist(binding.viewPager.currentItem)
updateWidgets() updateWidgets()
} }
} }

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

@ -12,15 +12,14 @@ import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.* import com.simplemobiletools.commons.helpers.*
import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.commons.models.RadioItem
import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.databinding.ActivitySettingsBinding
import com.simplemobiletools.notes.pro.dialogs.ExportNotesDialog import com.simplemobiletools.notes.pro.dialogs.ExportNotesDialog
import com.simplemobiletools.notes.pro.dialogs.ManageAutoBackupsDialog import com.simplemobiletools.notes.pro.dialogs.ManageAutoBackupsDialog
import com.simplemobiletools.notes.pro.extensions.* import com.simplemobiletools.notes.pro.extensions.*
import com.simplemobiletools.notes.pro.helpers.* import com.simplemobiletools.notes.pro.helpers.*
import com.simplemobiletools.notes.pro.models.Note import com.simplemobiletools.notes.pro.models.Note
import com.simplemobiletools.notes.pro.models.Widget import com.simplemobiletools.notes.pro.models.Widget
import kotlinx.android.synthetic.main.activity_settings.*
import kotlinx.serialization.SerializationException import kotlinx.serialization.SerializationException
import kotlinx.serialization.decodeFromString
import kotlinx.serialization.encodeToString import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import java.util.Locale import java.util.Locale
@ -28,19 +27,21 @@ import kotlin.system.exitProcess
class SettingsActivity : SimpleActivity() { class SettingsActivity : SimpleActivity() {
private val notesFileType = "application/json" private val notesFileType = "application/json"
private lateinit var binding: ActivitySettingsBinding
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
isMaterialActivity = true isMaterialActivity = true
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_settings) binding = ActivitySettingsBinding.inflate(layoutInflater)
setContentView(binding.root)
updateMaterialActivityViews(settings_coordinator, settings_holder, useTransparentNavigation = true, useTopSearchMenu = false) updateMaterialActivityViews(binding.settingsCoordinator, binding.settingsHolder, useTransparentNavigation = true, useTopSearchMenu = false)
setupMaterialScrollListener(settings_nested_scrollview, settings_toolbar) setupMaterialScrollListener(binding.settingsNestedScrollview, binding.settingsToolbar)
} }
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
setupToolbar(settings_toolbar, NavigationIcon.Arrow) setupToolbar(binding.settingsToolbar, NavigationIcon.Arrow)
setupCustomizeColors() setupCustomizeColors()
setupUseEnglish() setupUseEnglish()
@ -62,16 +63,16 @@ class SettingsActivity : SimpleActivity() {
setupNotesImport() setupNotesImport()
setupEnableAutomaticBackups() setupEnableAutomaticBackups()
setupManageAutomaticBackups() setupManageAutomaticBackups()
updateTextColors(settings_nested_scrollview) updateTextColors(binding.settingsNestedScrollview)
arrayOf( arrayOf(
settings_color_customization_section_label, binding.settingsColorCustomizationSectionLabel,
settings_general_settings_label, binding.settingsGeneralSettingsLabel,
settings_text_label, binding.settingsTextLabel,
settings_startup_label, binding.settingsStartupLabel,
settings_saving_label, binding.settingsSavingLabel,
settings_migrating_label, binding.settingsMigratingLabel,
settings_backups_label, binding.settingsBackupsLabel,
).forEach { ).forEach {
it.setTextColor(getProperPrimaryColor()) it.setTextColor(getProperPrimaryColor())
} }
@ -84,14 +85,14 @@ class SettingsActivity : SimpleActivity() {
private val getContent = registerForActivityResult(ActivityResultContracts.GetContent()) { uri -> private val getContent = registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->
if (uri != null) { if (uri != null) {
toast(R.string.importing) toast(com.simplemobiletools.commons.R.string.importing)
importNotes(uri) importNotes(uri)
} }
} }
private val saveDocument = registerForActivityResult(ActivityResultContracts.CreateDocument(notesFileType)) { uri -> private val saveDocument = registerForActivityResult(ActivityResultContracts.CreateDocument(notesFileType)) { uri ->
if (uri != null) { if (uri != null) {
toast(R.string.exporting) toast(com.simplemobiletools.commons.R.string.exporting)
NotesHelper(this).getNotes { notes -> NotesHelper(this).getNotes { notes ->
requestUnlockNotes(notes) { unlockedNotes -> requestUnlockNotes(notes) { unlockedNotes ->
val notLockedNotes = notes.filterNot { it.isLocked() } val notLockedNotes = notes.filterNot { it.isLocked() }
@ -103,101 +104,101 @@ class SettingsActivity : SimpleActivity() {
} }
private fun setupCustomizeColors() { private fun setupCustomizeColors() {
settings_color_customization_holder.setOnClickListener { binding.settingsColorCustomizationHolder.setOnClickListener {
startCustomizationActivity() startCustomizationActivity()
} }
} }
private fun setupUseEnglish() { private fun setupUseEnglish() {
settings_use_english_holder.beVisibleIf((config.wasUseEnglishToggled || Locale.getDefault().language != "en") && !isTiramisuPlus()) binding.settingsUseEnglishHolder.beVisibleIf((config.wasUseEnglishToggled || Locale.getDefault().language != "en") && !isTiramisuPlus())
settings_use_english.isChecked = config.useEnglish binding.settingsUseEnglish.isChecked = config.useEnglish
settings_use_english_holder.setOnClickListener { binding.settingsUseEnglishHolder.setOnClickListener {
settings_use_english.toggle() binding.settingsUseEnglish.toggle()
config.useEnglish = settings_use_english.isChecked config.useEnglish = binding.settingsUseEnglish.isChecked
exitProcess(0) exitProcess(0)
} }
} }
private fun setupLanguage() { private fun setupLanguage() {
settings_language.text = Locale.getDefault().displayLanguage binding.settingsLanguage.text = Locale.getDefault().displayLanguage
settings_language_holder.beVisibleIf(isTiramisuPlus()) binding.settingsLanguageHolder.beVisibleIf(isTiramisuPlus())
settings_language_holder.setOnClickListener { binding.settingsLanguageHolder.setOnClickListener {
launchChangeAppLanguageIntent() launchChangeAppLanguageIntent()
} }
} }
private fun setupAutosaveNotes() { private fun setupAutosaveNotes() {
settings_autosave_notes.isChecked = config.autosaveNotes binding.settingsAutosaveNotes.isChecked = config.autosaveNotes
settings_autosave_notes_holder.setOnClickListener { binding.settingsAutosaveNotesHolder.setOnClickListener {
settings_autosave_notes.toggle() binding.settingsAutosaveNotes.toggle()
config.autosaveNotes = settings_autosave_notes.isChecked config.autosaveNotes = binding.settingsAutosaveNotes.isChecked
} }
} }
private fun setupDisplaySuccess() { private fun setupDisplaySuccess() {
settings_display_success.isChecked = config.displaySuccess binding.settingsDisplaySuccess.isChecked = config.displaySuccess
settings_display_success_holder.setOnClickListener { binding.settingsDisplaySuccessHolder.setOnClickListener {
settings_display_success.toggle() binding.settingsDisplaySuccess.toggle()
config.displaySuccess = settings_display_success.isChecked config.displaySuccess = binding.settingsDisplaySuccess.isChecked
} }
} }
private fun setupClickableLinks() { private fun setupClickableLinks() {
settings_clickable_links.isChecked = config.clickableLinks binding.settingsClickableLinks.isChecked = config.clickableLinks
settings_clickable_links_holder.setOnClickListener { binding.settingsClickableLinksHolder.setOnClickListener {
settings_clickable_links.toggle() binding.settingsClickableLinks.toggle()
config.clickableLinks = settings_clickable_links.isChecked config.clickableLinks = binding.settingsClickableLinks.isChecked
} }
} }
private fun setupMonospacedFont() { private fun setupMonospacedFont() {
settings_monospaced_font.isChecked = config.monospacedFont binding.settingsMonospacedFont.isChecked = config.monospacedFont
settings_monospaced_font_holder.setOnClickListener { binding.settingsMonospacedFontHolder.setOnClickListener {
settings_monospaced_font.toggle() binding.settingsMonospacedFont.toggle()
config.monospacedFont = settings_monospaced_font.isChecked config.monospacedFont = binding.settingsMonospacedFont.isChecked
updateWidgets() updateWidgets()
} }
} }
private fun setupShowKeyboard() { private fun setupShowKeyboard() {
settings_show_keyboard.isChecked = config.showKeyboard binding.settingsShowKeyboard.isChecked = config.showKeyboard
settings_show_keyboard_holder.setOnClickListener { binding.settingsShowKeyboardHolder.setOnClickListener {
settings_show_keyboard.toggle() binding.settingsShowKeyboard.toggle()
config.showKeyboard = settings_show_keyboard.isChecked config.showKeyboard = binding.settingsShowKeyboard.isChecked
} }
} }
private fun setupShowNotePicker() { private fun setupShowNotePicker() {
NotesHelper(this).getNotes { NotesHelper(this).getNotes {
settings_show_note_picker_holder.beVisibleIf(it.size > 1) binding.settingsShowNotePickerHolder.beVisibleIf(it.size > 1)
} }
settings_show_note_picker.isChecked = config.showNotePicker binding.settingsShowNotePicker.isChecked = config.showNotePicker
settings_show_note_picker_holder.setOnClickListener { binding.settingsShowNotePickerHolder.setOnClickListener {
settings_show_note_picker.toggle() binding.settingsShowNotePicker.toggle()
config.showNotePicker = settings_show_note_picker.isChecked config.showNotePicker = binding.settingsShowNotePicker.isChecked
} }
} }
private fun setupShowWordCount() { private fun setupShowWordCount() {
settings_show_word_count.isChecked = config.showWordCount binding.settingsShowWordCount.isChecked = config.showWordCount
settings_show_word_count_holder.setOnClickListener { binding.settingsShowWordCountHolder.setOnClickListener {
settings_show_word_count.toggle() binding.settingsShowWordCount.toggle()
config.showWordCount = settings_show_word_count.isChecked config.showWordCount = binding.settingsShowWordCount.isChecked
} }
} }
private fun setupEnableLineWrap() { private fun setupEnableLineWrap() {
settings_enable_line_wrap.isChecked = config.enableLineWrap binding.settingsEnableLineWrap.isChecked = config.enableLineWrap
settings_enable_line_wrap_holder.setOnClickListener { binding.settingsEnableLineWrapHolder.setOnClickListener {
settings_enable_line_wrap.toggle() binding.settingsEnableLineWrap.toggle()
config.enableLineWrap = settings_enable_line_wrap.isChecked config.enableLineWrap = binding.settingsEnableLineWrap.isChecked
} }
} }
private fun setupFontSize() { private fun setupFontSize() {
settings_font_size.text = getFontSizePercentText(config.fontSizePercentage) binding.settingsFontSize.text = getFontSizePercentText(config.fontSizePercentage)
settings_font_size_holder.setOnClickListener { binding.settingsFontSizeHolder.setOnClickListener {
val items = arrayListOf( val items = arrayListOf(
RadioItem(FONT_SIZE_50_PERCENT, getFontSizePercentText(FONT_SIZE_50_PERCENT)), RadioItem(FONT_SIZE_50_PERCENT, getFontSizePercentText(FONT_SIZE_50_PERCENT)),
RadioItem(FONT_SIZE_60_PERCENT, getFontSizePercentText(FONT_SIZE_60_PERCENT)), RadioItem(FONT_SIZE_60_PERCENT, getFontSizePercentText(FONT_SIZE_60_PERCENT)),
@ -214,7 +215,7 @@ class SettingsActivity : SimpleActivity() {
RadioGroupDialog(this@SettingsActivity, items, config.fontSizePercentage) { RadioGroupDialog(this@SettingsActivity, items, config.fontSizePercentage) {
config.fontSizePercentage = it as Int config.fontSizePercentage = it as Int
settings_font_size.text = getFontSizePercentText(config.fontSizePercentage) binding.settingsFontSize.text = getFontSizePercentText(config.fontSizePercentage)
updateWidgets() updateWidgets()
} }
} }
@ -223,12 +224,12 @@ class SettingsActivity : SimpleActivity() {
private fun getFontSizePercentText(fontSizePercentage: Int): String = "$fontSizePercentage%" private fun getFontSizePercentText(fontSizePercentage: Int): String = "$fontSizePercentage%"
private fun setupGravity() { private fun setupGravity() {
settings_gravity.text = getGravityText() binding.settingsGravity.text = getGravityText()
settings_gravity_holder.setOnClickListener { binding.settingsGravityHolder.setOnClickListener {
val items = listOf(GRAVITY_START, GRAVITY_CENTER, GRAVITY_END).map { RadioItem(it, getGravityOptionLabel(it)) } val items = listOf(GRAVITY_START, GRAVITY_CENTER, GRAVITY_END).map { RadioItem(it, getGravityOptionLabel(it)) }
RadioGroupDialog(this@SettingsActivity, ArrayList(items), config.gravity) { RadioGroupDialog(this@SettingsActivity, ArrayList(items), config.gravity) {
config.gravity = it as Int config.gravity = it as Int
settings_gravity.text = getGravityText() binding.settingsGravity.text = getGravityText()
updateWidgets() updateWidgets()
} }
} }
@ -254,17 +255,17 @@ class SettingsActivity : SimpleActivity() {
private fun getGravityText() = getGravityOptionLabel(config.gravity) private fun getGravityText() = getGravityOptionLabel(config.gravity)
private fun setupCursorPlacement() { private fun setupCursorPlacement() {
settings_cursor_placement.isChecked = config.placeCursorToEnd binding.settingsCursorPlacement.isChecked = config.placeCursorToEnd
settings_cursor_placement_holder.setOnClickListener { binding.settingsCursorPlacementHolder.setOnClickListener {
settings_cursor_placement.toggle() binding.settingsCursorPlacement.toggle()
config.placeCursorToEnd = settings_cursor_placement.isChecked config.placeCursorToEnd = binding.settingsCursorPlacement.isChecked
} }
} }
private fun setupCustomizeWidgetColors() { private fun setupCustomizeWidgetColors() {
var widgetToCustomize: Widget? = null var widgetToCustomize: Widget? = null
settings_widget_color_customization_holder.setOnClickListener { binding.settingsWidgetColorCustomizationHolder.setOnClickListener {
Intent(this, WidgetConfigureActivity::class.java).apply { Intent(this, WidgetConfigureActivity::class.java).apply {
putExtra(IS_CUSTOMIZING_COLORS, true) putExtra(IS_CUSTOMIZING_COLORS, true)
@ -290,16 +291,16 @@ class SettingsActivity : SimpleActivity() {
} }
private fun setupIncognitoMode() { private fun setupIncognitoMode() {
settings_use_incognito_mode_holder.beVisibleIf(isOreoPlus()) binding.settingsUseIncognitoModeHolder.beVisibleIf(isOreoPlus())
settings_use_incognito_mode.isChecked = config.useIncognitoMode binding.settingsUseIncognitoMode.isChecked = config.useIncognitoMode
settings_use_incognito_mode_holder.setOnClickListener { binding.settingsUseIncognitoModeHolder.setOnClickListener {
settings_use_incognito_mode.toggle() binding.settingsUseIncognitoMode.toggle()
config.useIncognitoMode = settings_use_incognito_mode.isChecked config.useIncognitoMode = binding.settingsUseIncognitoMode.isChecked
} }
} }
private fun setupNotesExport() { private fun setupNotesExport() {
settings_export_notes_holder.setOnClickListener { binding.settingsExportNotesHolder.setOnClickListener {
ExportNotesDialog(this) { filename -> ExportNotesDialog(this) { filename ->
saveDocument.launch(filename) saveDocument.launch(filename)
} }
@ -307,14 +308,14 @@ class SettingsActivity : SimpleActivity() {
} }
private fun setupNotesImport() { private fun setupNotesImport() {
settings_import_notes_holder.setOnClickListener { binding.settingsImportNotesHolder.setOnClickListener {
getContent.launch(notesFileType) getContent.launch(notesFileType)
} }
} }
private fun exportNotes(notes: List<Note>, uri: Uri) { private fun exportNotes(notes: List<Note>, uri: Uri) {
if (notes.isEmpty()) { if (notes.isEmpty()) {
toast(R.string.no_entries_for_exporting) toast(com.simplemobiletools.commons.R.string.no_entries_for_exporting)
} else { } else {
try { try {
val outputStream = contentResolver.openOutputStream(uri)!! val outputStream = contentResolver.openOutputStream(uri)!!
@ -323,7 +324,7 @@ class SettingsActivity : SimpleActivity() {
outputStream.use { outputStream.use {
it.write(jsonString.toByteArray()) it.write(jsonString.toByteArray())
} }
toast(R.string.exporting_successful) toast(com.simplemobiletools.commons.R.string.exporting_successful)
} catch (e: Exception) { } catch (e: Exception) {
showErrorToast(e) showErrorToast(e)
} }
@ -337,31 +338,31 @@ class SettingsActivity : SimpleActivity() {
} }
val objects = Json.decodeFromString<List<Note>>(jsonString) val objects = Json.decodeFromString<List<Note>>(jsonString)
if (objects.isEmpty()) { if (objects.isEmpty()) {
toast(R.string.no_entries_for_importing) toast(com.simplemobiletools.commons.R.string.no_entries_for_importing)
return return
} }
NotesHelper(this).importNotes(this, objects) { importResult -> NotesHelper(this).importNotes(this, objects) { importResult ->
when (importResult) { when (importResult) {
NotesHelper.ImportResult.IMPORT_OK -> toast(R.string.importing_successful) NotesHelper.ImportResult.IMPORT_OK -> toast(com.simplemobiletools.commons.R.string.importing_successful)
NotesHelper.ImportResult.IMPORT_PARTIAL -> toast(R.string.importing_some_entries_failed) NotesHelper.ImportResult.IMPORT_PARTIAL -> toast(com.simplemobiletools.commons.R.string.importing_some_entries_failed)
NotesHelper.ImportResult.IMPORT_NOTHING_NEW -> toast(R.string.no_new_items) NotesHelper.ImportResult.IMPORT_NOTHING_NEW -> toast(com.simplemobiletools.commons.R.string.no_new_items)
else -> toast(R.string.importing_failed) else -> toast(com.simplemobiletools.commons.R.string.importing_failed)
} }
} }
} catch (_: SerializationException) { } catch (_: SerializationException) {
toast(R.string.invalid_file_format) toast(com.simplemobiletools.commons.R.string.invalid_file_format)
} catch (_: IllegalArgumentException) { } catch (_: IllegalArgumentException) {
toast(R.string.invalid_file_format) toast(com.simplemobiletools.commons.R.string.invalid_file_format)
} catch (e: Exception) { } catch (e: Exception) {
showErrorToast(e) showErrorToast(e)
} }
} }
private fun setupEnableAutomaticBackups() { private fun setupEnableAutomaticBackups() {
settings_backups_label.beVisibleIf(isRPlus()) binding.settingsBackupsLabel.beVisibleIf(isRPlus())
settings_enable_automatic_backups_holder.beVisibleIf(isRPlus()) binding.settingsEnableAutomaticBackupsHolder.beVisibleIf(isRPlus())
settings_enable_automatic_backups.isChecked = config.autoBackup binding.settingsEnableAutomaticBackups.isChecked = config.autoBackup
settings_enable_automatic_backups_holder.setOnClickListener { binding.settingsEnableAutomaticBackupsHolder.setOnClickListener {
val wasBackupDisabled = !config.autoBackup val wasBackupDisabled = !config.autoBackup
if (wasBackupDisabled) { if (wasBackupDisabled) {
ManageAutoBackupsDialog( ManageAutoBackupsDialog(
@ -379,8 +380,8 @@ class SettingsActivity : SimpleActivity() {
} }
private fun setupManageAutomaticBackups() { private fun setupManageAutomaticBackups() {
settings_manage_automatic_backups_holder.beVisibleIf(isRPlus() && config.autoBackup) binding.settingsManageAutomaticBackupsHolder.beVisibleIf(isRPlus() && config.autoBackup)
settings_manage_automatic_backups_holder.setOnClickListener { binding.settingsManageAutomaticBackupsHolder.setOnClickListener {
ManageAutoBackupsDialog( ManageAutoBackupsDialog(
activity = this, activity = this,
onSuccess = { onSuccess = {
@ -392,7 +393,7 @@ class SettingsActivity : SimpleActivity() {
private fun enableOrDisableAutomaticBackups(enable: Boolean) { private fun enableOrDisableAutomaticBackups(enable: Boolean) {
config.autoBackup = enable config.autoBackup = enable
settings_enable_automatic_backups.isChecked = enable binding.settingsEnableAutomaticBackups.isChecked = enable
settings_manage_automatic_backups_holder.beVisibleIf(enable) binding.settingsManageAutomaticBackupsHolder.beVisibleIf(enable)
} }
} }

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

@ -21,6 +21,7 @@ import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.commons.models.RadioItem
import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.adapters.ChecklistAdapter import com.simplemobiletools.notes.pro.adapters.ChecklistAdapter
import com.simplemobiletools.notes.pro.databinding.WidgetConfigBinding
import com.simplemobiletools.notes.pro.extensions.config import com.simplemobiletools.notes.pro.extensions.config
import com.simplemobiletools.notes.pro.extensions.getPercentageFontSize import com.simplemobiletools.notes.pro.extensions.getPercentageFontSize
import com.simplemobiletools.notes.pro.extensions.widgetsDB import com.simplemobiletools.notes.pro.extensions.widgetsDB
@ -29,9 +30,6 @@ import com.simplemobiletools.notes.pro.models.ChecklistItem
import com.simplemobiletools.notes.pro.models.Note import com.simplemobiletools.notes.pro.models.Note
import com.simplemobiletools.notes.pro.models.NoteType import com.simplemobiletools.notes.pro.models.NoteType
import com.simplemobiletools.notes.pro.models.Widget import com.simplemobiletools.notes.pro.models.Widget
import kotlinx.android.synthetic.main.widget_config.*
import kotlinx.serialization.decodeFromString
import kotlinx.serialization.json.Json
class WidgetConfigureActivity : SimpleActivity() { class WidgetConfigureActivity : SimpleActivity() {
private var mBgAlpha = 0f private var mBgAlpha = 0f
@ -43,12 +41,14 @@ class WidgetConfigureActivity : SimpleActivity() {
private var mIsCustomizingColors = false private var mIsCustomizingColors = false
private var mShowTitle = false private var mShowTitle = false
private var mNotes = listOf<Note>() private var mNotes = listOf<Note>()
private lateinit var binding: WidgetConfigBinding
public override fun onCreate(savedInstanceState: Bundle?) { public override fun onCreate(savedInstanceState: Bundle?) {
useDynamicTheme = false useDynamicTheme = false
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setResult(RESULT_CANCELED) setResult(RESULT_CANCELED)
setContentView(R.layout.widget_config) binding = WidgetConfigBinding.inflate(layoutInflater)
setContentView(binding.root)
initVariables() initVariables()
mWidgetId = intent.extras?.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID) ?: AppWidgetManager.INVALID_APPWIDGET_ID mWidgetId = intent.extras?.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID) ?: AppWidgetManager.INVALID_APPWIDGET_ID
@ -57,25 +57,25 @@ class WidgetConfigureActivity : SimpleActivity() {
finish() finish()
} }
updateTextColors(notes_picker_holder) updateTextColors(binding.notesPickerHolder)
config_save.setOnClickListener { saveConfig() } binding.configSave.setOnClickListener { saveConfig() }
config_bg_color.setOnClickListener { pickBackgroundColor() } binding.configBgColor.setOnClickListener { pickBackgroundColor() }
config_text_color.setOnClickListener { pickTextColor() } binding.configTextColor.setOnClickListener { pickTextColor() }
notes_picker_value.setOnClickListener { showNoteSelector() } binding.notesPickerValue.setOnClickListener { showNoteSelector() }
val primaryColor = getProperPrimaryColor() val primaryColor = getProperPrimaryColor()
config_bg_seekbar.setColors(mTextColor, primaryColor, primaryColor) binding.configBgSeekbar.setColors(mTextColor, primaryColor, primaryColor)
notes_picker_holder.background = ColorDrawable(getProperBackgroundColor()) binding.notesPickerHolder.background = ColorDrawable(getProperBackgroundColor())
show_note_title_holder.setOnClickListener { binding.showNoteTitleHolder.setOnClickListener {
show_note_title.toggle() binding.showNoteTitle.toggle()
handleNoteTitleDisplay() handleNoteTitleDisplay()
} }
} }
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
text_note_view.setTextSize(TypedValue.COMPLEX_UNIT_PX, getPercentageFontSize()) binding.textNoteView.setTextSize(TypedValue.COMPLEX_UNIT_PX, getPercentageFontSize())
} }
private fun initVariables() { private fun initVariables() {
@ -89,14 +89,14 @@ class WidgetConfigureActivity : SimpleActivity() {
mShowTitle = extras?.getBoolean(CUSTOMIZED_WIDGET_SHOW_TITLE) ?: false mShowTitle = extras?.getBoolean(CUSTOMIZED_WIDGET_SHOW_TITLE) ?: false
} }
if (mTextColor == resources.getColor(R.color.default_widget_text_color) && config.isUsingSystemTheme) { if (mTextColor == resources.getColor(com.simplemobiletools.commons.R.color.default_widget_text_color) && config.isUsingSystemTheme) {
mTextColor = resources.getColor(R.color.you_primary_color, theme) mTextColor = resources.getColor(com.simplemobiletools.commons.R.color.you_primary_color, theme)
} }
mBgAlpha = Color.alpha(mBgColor) / 255.toFloat() mBgAlpha = Color.alpha(mBgColor) / 255.toFloat()
mBgColorWithoutTransparency = Color.rgb(Color.red(mBgColor), Color.green(mBgColor), Color.blue(mBgColor)) mBgColorWithoutTransparency = Color.rgb(Color.red(mBgColor), Color.green(mBgColor), Color.blue(mBgColor))
config_bg_seekbar.apply { binding.configBgSeekbar.apply {
progress = (mBgAlpha * 100).toInt() progress = (mBgAlpha * 100).toInt()
onSeekBarChangeListener { onSeekBarChangeListener {
@ -108,12 +108,12 @@ class WidgetConfigureActivity : SimpleActivity() {
updateTextColor() updateTextColor()
mIsCustomizingColors = extras?.getBoolean(IS_CUSTOMIZING_COLORS) ?: false mIsCustomizingColors = extras?.getBoolean(IS_CUSTOMIZING_COLORS) ?: false
notes_picker_holder.beVisibleIf(!mIsCustomizingColors) binding.notesPickerHolder.beVisibleIf(!mIsCustomizingColors)
text_note_view_title.beGoneIf(!mShowTitle) binding.textNoteViewTitle.beGoneIf(!mShowTitle)
NotesHelper(this).getNotes { NotesHelper(this).getNotes {
mNotes = it mNotes = it
notes_picker_holder.beVisibleIf(mNotes.size > 1 && !mIsCustomizingColors) binding.notesPickerHolder.beVisibleIf(mNotes.size > 1 && !mIsCustomizingColors)
var note = mNotes.firstOrNull { !it.isLocked() } var note = mNotes.firstOrNull { !it.isLocked() }
if (mNotes.size == 1 && note == null) { if (mNotes.size == 1 && note == null) {
@ -157,8 +157,8 @@ class WidgetConfigureActivity : SimpleActivity() {
private fun updateCurrentNote(note: Note) { private fun updateCurrentNote(note: Note) {
mCurrentNoteId = note.id!! mCurrentNoteId = note.id!!
notes_picker_value.text = note.title binding.notesPickerValue.text = note.title
text_note_view_title.text = note.title binding.textNoteViewTitle.text = note.title
if (note.type == NoteType.TYPE_CHECKLIST) { if (note.type == NoteType.TYPE_CHECKLIST) {
val checklistItemType = object : TypeToken<List<ChecklistItem>>() {}.type val checklistItemType = object : TypeToken<List<ChecklistItem>>() {}.type
val items = Gson().fromJson<ArrayList<ChecklistItem>>(note.value, checklistItemType) ?: ArrayList(1) val items = Gson().fromJson<ArrayList<ChecklistItem>>(note.value, checklistItemType) ?: ArrayList(1)
@ -172,18 +172,18 @@ class WidgetConfigureActivity : SimpleActivity() {
} }
} }
ChecklistAdapter(this, items, null, checklist_note_view, false) {}.apply { ChecklistAdapter(this, items, null, binding.checklistNoteView, false) {}.apply {
updateTextColor(mTextColor) updateTextColor(mTextColor)
checklist_note_view.adapter = this binding.checklistNoteView.adapter = this
} }
text_note_view.beGone() binding.textNoteView.beGone()
checklist_note_view.beVisible() binding.checklistNoteView.beVisible()
} else { } else {
val sampleValue = if (note.value.isEmpty() || mIsCustomizingColors) getString(R.string.widget_config) else note.value val sampleValue = if (note.value.isEmpty() || mIsCustomizingColors) getString(R.string.widget_config) else note.value
text_note_view.text = sampleValue binding.textNoteView.text = sampleValue
text_note_view.typeface = if (config.monospacedFont) Typeface.MONOSPACE else Typeface.DEFAULT binding.textNoteView.typeface = if (config.monospacedFont) Typeface.MONOSPACE else Typeface.DEFAULT
text_note_view.beVisible() binding.textNoteView.beVisible()
checklist_note_view.beGone() binding.checklistNoteView.beGone()
} }
} }
@ -233,19 +233,19 @@ class WidgetConfigureActivity : SimpleActivity() {
private fun updateBackgroundColor() { private fun updateBackgroundColor() {
mBgColor = mBgColorWithoutTransparency.adjustAlpha(mBgAlpha) mBgColor = mBgColorWithoutTransparency.adjustAlpha(mBgAlpha)
text_note_view.setBackgroundColor(mBgColor) binding.textNoteView.setBackgroundColor(mBgColor)
checklist_note_view.setBackgroundColor(mBgColor) binding.checklistNoteView.setBackgroundColor(mBgColor)
text_note_view_title.setBackgroundColor(mBgColor) binding.textNoteViewTitle.setBackgroundColor(mBgColor)
config_bg_color.setFillWithStroke(mBgColor, mBgColor) binding.configBgColor.setFillWithStroke(mBgColor, mBgColor)
config_save.backgroundTintList = ColorStateList.valueOf(getProperPrimaryColor()) binding.configSave.backgroundTintList = ColorStateList.valueOf(getProperPrimaryColor())
} }
private fun updateTextColor() { private fun updateTextColor() {
text_note_view.setTextColor(mTextColor) binding.textNoteView.setTextColor(mTextColor)
text_note_view_title.setTextColor(mTextColor) binding.textNoteViewTitle.setTextColor(mTextColor)
(checklist_note_view.adapter as? ChecklistAdapter)?.updateTextColor(mTextColor) (binding.checklistNoteView.adapter as? ChecklistAdapter)?.updateTextColor(mTextColor)
config_text_color.setFillWithStroke(mTextColor, mTextColor) binding.configTextColor.setFillWithStroke(mTextColor, mTextColor)
config_save.setTextColor(getProperPrimaryColor().getContrastColor()) binding.configSave.setTextColor(getProperPrimaryColor().getContrastColor())
} }
private fun pickBackgroundColor() { private fun pickBackgroundColor() {
@ -267,8 +267,8 @@ class WidgetConfigureActivity : SimpleActivity() {
} }
private fun handleNoteTitleDisplay() { private fun handleNoteTitleDisplay() {
val showTitle = show_note_title.isChecked val showTitle = binding.showNoteTitle.isChecked
text_note_view_title.beGoneIf(!showTitle) binding.textNoteViewTitle.beGoneIf(!showTitle)
mShowTitle = showTitle mShowTitle = showTitle
} }
} }

34
app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt
View File

@ -21,14 +21,14 @@ import com.simplemobiletools.commons.interfaces.ItemTouchHelperContract
import com.simplemobiletools.commons.interfaces.StartReorderDragListener import com.simplemobiletools.commons.interfaces.StartReorderDragListener
import com.simplemobiletools.commons.views.MyRecyclerView import com.simplemobiletools.commons.views.MyRecyclerView
import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.databinding.ItemChecklistBinding
import com.simplemobiletools.notes.pro.dialogs.RenameChecklistItemDialog import com.simplemobiletools.notes.pro.dialogs.RenameChecklistItemDialog
import com.simplemobiletools.notes.pro.extensions.config import com.simplemobiletools.notes.pro.extensions.config
import com.simplemobiletools.notes.pro.extensions.getPercentageFontSize import com.simplemobiletools.notes.pro.extensions.getPercentageFontSize
import com.simplemobiletools.notes.pro.helpers.DONE_CHECKLIST_ITEM_ALPHA import com.simplemobiletools.notes.pro.helpers.DONE_CHECKLIST_ITEM_ALPHA
import com.simplemobiletools.notes.pro.interfaces.ChecklistItemsListener import com.simplemobiletools.notes.pro.interfaces.ChecklistItemsListener
import com.simplemobiletools.notes.pro.models.ChecklistItem import com.simplemobiletools.notes.pro.models.ChecklistItem
import kotlinx.android.synthetic.main.item_checklist.view.* import java.util.Collections
import java.util.*
class ChecklistAdapter( class ChecklistAdapter(
activity: BaseSimpleActivity, var items: MutableList<ChecklistItem>, val listener: ChecklistItemsListener?, activity: BaseSimpleActivity, var items: MutableList<ChecklistItem>, val listener: ChecklistItemsListener?,
@ -95,7 +95,9 @@ class ChecklistAdapter(
menu.findItem(R.id.cab_rename).isVisible = isOneItemSelected() menu.findItem(R.id.cab_rename).isVisible = isOneItemSelected()
} }
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = createViewHolder(R.layout.item_checklist, parent) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
return createViewHolder(ItemChecklistBinding.inflate(layoutInflater, parent, false).root)
}
override fun onBindViewHolder(holder: ViewHolder, position: Int) { override fun onBindViewHolder(holder: ViewHolder, position: Int) {
val item = items[position] val item = items[position]
@ -109,8 +111,14 @@ class ChecklistAdapter(
private fun initDrawables() { private fun initDrawables() {
val res = activity.resources val res = activity.resources
crossDrawable = res.getColoredDrawableWithColor(R.drawable.ic_cross_vector, res.getColor(R.color.md_red_700)) crossDrawable = res.getColoredDrawableWithColor(
checkDrawable = res.getColoredDrawableWithColor(R.drawable.ic_check_vector, res.getColor(R.color.md_green_700)) com.simplemobiletools.commons.R.drawable.ic_cross_vector,
res.getColor(com.simplemobiletools.commons.R.color.md_red_700)
)
checkDrawable = res.getColoredDrawableWithColor(
com.simplemobiletools.commons.R.drawable.ic_check_vector,
res.getColor(com.simplemobiletools.commons.R.color.md_green_700)
)
} }
private fun renameChecklistItem() { private fun renameChecklistItem() {
@ -182,8 +190,8 @@ class ChecklistAdapter(
private fun setupView(view: View, checklistItem: ChecklistItem, holder: ViewHolder) { private fun setupView(view: View, checklistItem: ChecklistItem, holder: ViewHolder) {
val isSelected = selectedKeys.contains(checklistItem.id) val isSelected = selectedKeys.contains(checklistItem.id)
view.apply { ItemChecklistBinding.bind(view).apply {
checklist_title.apply { checklistTitle.apply {
text = checklistItem.title text = checklistItem.title
setTextColor(textColor) setTextColor(textColor)
setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getPercentageFontSize()) setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getPercentageFontSize())
@ -198,13 +206,13 @@ class ChecklistAdapter(
} }
} }
checklist_image.setImageDrawable(if (checklistItem.isDone) checkDrawable else crossDrawable) checklistImage.setImageDrawable(if (checklistItem.isDone) checkDrawable else crossDrawable)
checklist_image.beVisibleIf(showIcons && selectedKeys.isEmpty()) checklistImage.beVisibleIf(showIcons && selectedKeys.isEmpty())
checklist_holder.isSelected = isSelected checklistHolder.isSelected = isSelected
checklist_drag_handle.beVisibleIf(selectedKeys.isNotEmpty()) checklistDragHandle.beVisibleIf(selectedKeys.isNotEmpty())
checklist_drag_handle.applyColorFilter(textColor) checklistDragHandle.applyColorFilter(textColor)
checklist_drag_handle.setOnTouchListener { v, event -> checklistDragHandle.setOnTouchListener { v, event ->
if (event.action == MotionEvent.ACTION_DOWN) { if (event.action == MotionEvent.ACTION_DOWN) {
startReorderDragListener.requestDrag(holder) startReorderDragListener.requestDrag(holder)
} }

34
app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/OpenNoteAdapter.kt
View File

@ -18,15 +18,11 @@ import com.simplemobiletools.commons.extensions.isBlackAndWhiteTheme
import com.simplemobiletools.commons.helpers.LOWER_ALPHA_INT import com.simplemobiletools.commons.helpers.LOWER_ALPHA_INT
import com.simplemobiletools.commons.helpers.SORT_BY_CUSTOM import com.simplemobiletools.commons.helpers.SORT_BY_CUSTOM
import com.simplemobiletools.commons.views.MyRecyclerView import com.simplemobiletools.commons.views.MyRecyclerView
import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.databinding.OpenNoteItemBinding
import com.simplemobiletools.notes.pro.extensions.config import com.simplemobiletools.notes.pro.extensions.config
import com.simplemobiletools.notes.pro.models.ChecklistItem import com.simplemobiletools.notes.pro.models.ChecklistItem
import com.simplemobiletools.notes.pro.models.Note import com.simplemobiletools.notes.pro.models.Note
import com.simplemobiletools.notes.pro.models.NoteType import com.simplemobiletools.notes.pro.models.NoteType
import kotlinx.android.synthetic.main.open_note_item.view.icon_lock
import kotlinx.android.synthetic.main.open_note_item.view.open_note_item_holder
import kotlinx.android.synthetic.main.open_note_item.view.open_note_item_text
import kotlinx.android.synthetic.main.open_note_item.view.open_note_item_title
class OpenNoteAdapter( class OpenNoteAdapter(
activity: BaseSimpleActivity, var items: List<Note>, activity: BaseSimpleActivity, var items: List<Note>,
@ -51,7 +47,7 @@ class OpenNoteAdapter(
override fun prepareActionMode(menu: Menu) {} override fun prepareActionMode(menu: Menu) {}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
return createViewHolder(R.layout.open_note_item, parent) return createViewHolder(OpenNoteItemBinding.inflate(layoutInflater, parent, false).root)
} }
override fun onBindViewHolder(holder: ViewHolder, position: Int) { override fun onBindViewHolder(holder: ViewHolder, position: Int) {
@ -65,26 +61,26 @@ class OpenNoteAdapter(
override fun getItemCount() = items.size override fun getItemCount() = items.size
private fun setupView(view: View, note: Note) { private fun setupView(view: View, note: Note) {
view.apply { OpenNoteItemBinding.bind(view).apply {
setupCard(open_note_item_holder) root.setupCard()
open_note_item_title.apply { openNoteItemTitle.apply {
text = note.title text = note.title
setTextColor(properPrimaryColor) setTextColor(properPrimaryColor)
} }
val formattedText = note.getFormattedValue(context) val formattedText = note.getFormattedValue(root.context)
open_note_item_text.beGoneIf(formattedText.isNullOrBlank() || note.isLocked()) openNoteItemText.beGoneIf(formattedText.isNullOrBlank() || note.isLocked())
icon_lock.beVisibleIf(note.isLocked()) iconLock.beVisibleIf(note.isLocked())
icon_lock.setImageDrawable(activity.resources.getColoredDrawableWithColor(R.drawable.ic_lock_vector, properPrimaryColor)) iconLock.setImageDrawable(activity.resources.getColoredDrawableWithColor(com.simplemobiletools.commons.R.drawable.ic_lock_vector, properPrimaryColor))
open_note_item_text.apply { openNoteItemText.apply {
text = formattedText text = formattedText
setTextColor(textColor) setTextColor(textColor)
} }
} }
} }
private fun View.setupCard(holder: View) { private fun View.setupCard() {
if (context.isBlackAndWhiteTheme()) { if (context.isBlackAndWhiteTheme()) {
holder.setBackgroundResource(R.drawable.black_dialog_background) setBackgroundResource(com.simplemobiletools.commons.R.drawable.black_dialog_background)
} else { } else {
val cardBackgroundColor = if (backgroundColor == Color.BLACK) { val cardBackgroundColor = if (backgroundColor == Color.BLACK) {
Color.WHITE Color.WHITE
@ -92,11 +88,11 @@ class OpenNoteAdapter(
Color.BLACK Color.BLACK
} }
val cardBackground = if (context.config.isUsingSystemTheme) { val cardBackground = if (context.config.isUsingSystemTheme) {
R.drawable.dialog_you_background com.simplemobiletools.commons.R.drawable.dialog_you_background
} else { } else {
R.drawable.dialog_bg com.simplemobiletools.commons.R.drawable.dialog_bg
} }
holder.background = background =
activity.resources.getColoredDrawableWithColor(cardBackground, cardBackgroundColor, LOWER_ALPHA_INT) activity.resources.getColoredDrawableWithColor(cardBackground, cardBackgroundColor, LOWER_ALPHA_INT)
} }
} }

2
app/src/main/kotlin/com/simplemobiletools/notes/pro/databases/NotesDatabase.kt
View File

@ -28,7 +28,7 @@ abstract class NotesDatabase : RoomDatabase() {
private var defaultWidgetBgColor = 0 private var defaultWidgetBgColor = 0
fun getInstance(context: Context): NotesDatabase { fun getInstance(context: Context): NotesDatabase {
defaultWidgetBgColor = context.resources.getColor(R.color.default_widget_bg_color) defaultWidgetBgColor = context.resources.getColor(com.simplemobiletools.commons.R.color.default_widget_bg_color)
if (db == null) { if (db == null) {
synchronized(NotesDatabase::class) { synchronized(NotesDatabase::class) {
if (db == null) { if (db == null) {

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

@ -10,7 +10,7 @@ class DateTimePatternInfoDialog(activity: BaseSimpleActivity) {
init { init {
val view = activity.layoutInflater.inflate(R.layout.datetime_pattern_info_layout, null) val view = activity.layoutInflater.inflate(R.layout.datetime_pattern_info_layout, null)
activity.getAlertDialogBuilder() activity.getAlertDialogBuilder()
.setPositiveButton(R.string.ok) { _, _ -> { } } .setPositiveButton(com.simplemobiletools.commons.R.string.ok) { _, _ -> { } }
.apply { .apply {
activity.setupDialogStuff(view, this) activity.setupDialogStuff(view, this)
} }

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

@ -6,30 +6,30 @@ import com.simplemobiletools.commons.extensions.getAlertDialogBuilder
import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.setupDialogStuff
import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.activities.SimpleActivity import com.simplemobiletools.notes.pro.activities.SimpleActivity
import com.simplemobiletools.notes.pro.databinding.DialogDeleteNoteBinding
import com.simplemobiletools.notes.pro.models.Note import com.simplemobiletools.notes.pro.models.Note
import kotlinx.android.synthetic.main.dialog_delete_note.view.*
class DeleteNoteDialog(val activity: SimpleActivity, val note: Note, val callback: (deleteFile: Boolean) -> Unit) { class DeleteNoteDialog(val activity: SimpleActivity, val note: Note, val callback: (deleteFile: Boolean) -> Unit) {
var dialog: AlertDialog? = null var dialog: AlertDialog? = null
init { init {
val message = String.format(activity.getString(R.string.delete_note_prompt_message), note.title) val message = String.format(activity.getString(R.string.delete_note_prompt_message), note.title)
val view = activity.layoutInflater.inflate(R.layout.dialog_delete_note, null).apply { val binding = DialogDeleteNoteBinding.inflate(activity.layoutInflater).apply{
if (note.path.isNotEmpty()) { if (note.path.isNotEmpty()) {
delete_note_checkbox.text = String.format(activity.getString(R.string.delete_file_itself), note.path) deleteNoteCheckbox.text = String.format(activity.getString(R.string.delete_file_itself), note.path)
delete_note_checkbox_holder.beVisible() deleteNoteCheckboxHolder.beVisible()
delete_note_checkbox_holder.setOnClickListener { deleteNoteCheckboxHolder.setOnClickListener {
delete_note_checkbox.toggle() deleteNoteCheckbox.toggle()
} }
} }
delete_note_description.text = message deleteNoteDescription.text = message
} }
activity.getAlertDialogBuilder() activity.getAlertDialogBuilder()
.setPositiveButton(R.string.delete) { dialog, which -> dialogConfirmed(view.delete_note_checkbox.isChecked) } .setPositiveButton(com.simplemobiletools.commons.R.string.delete) { dialog, which -> dialogConfirmed(binding.deleteNoteCheckbox.isChecked) }
.setNegativeButton(R.string.cancel, null) .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
.apply { .apply {
activity.setupDialogStuff(view, this) activity.setupDialogStuff(binding.root, this)
} }
} }

28
app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportFileDialog.kt
View File

@ -5,46 +5,46 @@ import com.simplemobiletools.commons.dialogs.FilePickerDialog
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.activities.SimpleActivity import com.simplemobiletools.notes.pro.activities.SimpleActivity
import com.simplemobiletools.notes.pro.databinding.DialogExportFileBinding
import com.simplemobiletools.notes.pro.extensions.config import com.simplemobiletools.notes.pro.extensions.config
import com.simplemobiletools.notes.pro.models.Note import com.simplemobiletools.notes.pro.models.Note
import kotlinx.android.synthetic.main.dialog_export_file.view.*
import java.io.File import java.io.File
class ExportFileDialog(val activity: SimpleActivity, val note: Note, val callback: (exportPath: String) -> Unit) { class ExportFileDialog(val activity: SimpleActivity, val note: Note, val callback: (exportPath: String) -> Unit) {
init { init {
var realPath = File(note.path).parent ?: activity.config.lastUsedSavePath var realPath = File(note.path).parent ?: activity.config.lastUsedSavePath
val view = activity.layoutInflater.inflate(R.layout.dialog_export_file, null).apply { val binding = DialogExportFileBinding.inflate(activity.layoutInflater).apply {
file_path.setText(activity.humanizePath(realPath)) filePath.setText(activity.humanizePath(realPath))
file_name.setText(note.title) fileName.setText(note.title)
extension.setText(activity.config.lastUsedExtension) extension.setText(activity.config.lastUsedExtension)
file_path.setOnClickListener { filePath.setOnClickListener {
FilePickerDialog(activity, realPath, false, false, true, true) { FilePickerDialog(activity, realPath, false, false, true, true) {
file_path.setText(activity.humanizePath(it)) filePath.setText(activity.humanizePath(it))
realPath = it realPath = it
} }
} }
} }
activity.getAlertDialogBuilder() activity.getAlertDialogBuilder()
.setPositiveButton(R.string.ok, null) .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null)
.setNegativeButton(R.string.cancel, null) .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
.apply { .apply {
activity.setupDialogStuff(view, this, R.string.export_as_file) { alertDialog -> activity.setupDialogStuff(binding.root, this, R.string.export_as_file) { alertDialog ->
alertDialog.showKeyboard(view.file_name) alertDialog.showKeyboard(binding.fileName)
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
val filename = view.file_name.value val filename = binding.fileName.value
val extension = view.extension.value val extension = binding.extension.value
if (filename.isEmpty()) { if (filename.isEmpty()) {
activity.toast(R.string.filename_cannot_be_empty) activity.toast(com.simplemobiletools.commons.R.string.filename_cannot_be_empty)
return@setOnClickListener return@setOnClickListener
} }
val fullFilename = if (extension.isEmpty()) filename else "$filename.$extension" val fullFilename = if (extension.isEmpty()) filename else "$filename.$extension"
if (!fullFilename.isAValidFilename()) { if (!fullFilename.isAValidFilename()) {
activity.toast(String.format(activity.getString(R.string.filename_invalid_characters_placeholder, fullFilename))) activity.toast(String.format(activity.getString(com.simplemobiletools.commons.R.string.filename_invalid_characters_placeholder, fullFilename)))
return@setOnClickListener return@setOnClickListener
} }

20
app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportFilesDialog.kt
View File

@ -5,34 +5,34 @@ import com.simplemobiletools.commons.dialogs.FilePickerDialog
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.activities.SimpleActivity import com.simplemobiletools.notes.pro.activities.SimpleActivity
import com.simplemobiletools.notes.pro.databinding.DialogExportFilesBinding
import com.simplemobiletools.notes.pro.extensions.config import com.simplemobiletools.notes.pro.extensions.config
import com.simplemobiletools.notes.pro.models.Note import com.simplemobiletools.notes.pro.models.Note
import kotlinx.android.synthetic.main.dialog_export_files.view.*
class ExportFilesDialog(val activity: SimpleActivity, val notes: ArrayList<Note>, val callback: (parent: String, extension: String) -> Unit) { class ExportFilesDialog(val activity: SimpleActivity, val notes: ArrayList<Note>, val callback: (parent: String, extension: String) -> Unit) {
init { init {
var realPath = activity.config.lastUsedSavePath var realPath = activity.config.lastUsedSavePath
val view = activity.layoutInflater.inflate(R.layout.dialog_export_files, null).apply { val binding = DialogExportFilesBinding.inflate(activity.layoutInflater).apply {
folder_path.setText(activity.humanizePath(realPath)) folderPath.setText(activity.humanizePath(realPath))
extension.setText(activity.config.lastUsedExtension) extension.setText(activity.config.lastUsedExtension)
folder_path.setOnClickListener { folderPath.setOnClickListener {
FilePickerDialog(activity, realPath, false, false, true, true) { FilePickerDialog(activity, realPath, false, false, true, true) {
folder_path.setText(activity.humanizePath(it)) folderPath.setText(activity.humanizePath(it))
realPath = it realPath = it
} }
} }
} }
activity.getAlertDialogBuilder() activity.getAlertDialogBuilder()
.setPositiveButton(R.string.ok, null) .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null)
.setNegativeButton(R.string.cancel, null) .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
.apply { .apply {
activity.setupDialogStuff(view, this, R.string.export_as_file) { alertDialog -> activity.setupDialogStuff(binding.root, this, R.string.export_as_file) { alertDialog ->
alertDialog.showKeyboard(view.extension) alertDialog.showKeyboard(binding.extension)
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
activity.handleSAFDialog(realPath) { activity.handleSAFDialog(realPath) {
val extension = view.extension.value val extension = binding.extension.value
activity.config.lastUsedExtension = extension activity.config.lastUsedExtension = extension
activity.config.lastUsedSavePath = realPath activity.config.lastUsedSavePath = realPath
callback(realPath, extension) callback(realPath, extension)

21
app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportNotesDialog.kt
View File

@ -1,38 +1,37 @@
package com.simplemobiletools.notes.pro.dialogs package com.simplemobiletools.notes.pro.dialogs
import android.view.ViewGroup
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.activities.SimpleActivity import com.simplemobiletools.notes.pro.activities.SimpleActivity
import kotlinx.android.synthetic.main.dialog_export_notes.view.export_notes_filename import com.simplemobiletools.notes.pro.databinding.DialogExportNotesBinding
class ExportNotesDialog(val activity: SimpleActivity, callback: (filename: String) -> Unit) { class ExportNotesDialog(val activity: SimpleActivity, callback: (filename: String) -> Unit) {
init { init {
val view = (activity.layoutInflater.inflate(R.layout.dialog_export_notes, null) as ViewGroup).apply { val binding = DialogExportNotesBinding.inflate(activity.layoutInflater).apply {
export_notes_filename.setText( exportNotesFilename.setText(
buildString { buildString {
append(context.getString(R.string.notes)) append(root.context.getString(com.simplemobiletools.commons.R.string.notes))
append("_") append("_")
append(context.getCurrentFormattedDateTime()) append(root.context.getCurrentFormattedDateTime())
} }
) )
} }
activity.getAlertDialogBuilder().setPositiveButton(R.string.ok, null).setNegativeButton(R.string.cancel, null).apply { activity.getAlertDialogBuilder().setPositiveButton(com.simplemobiletools.commons.R.string.ok, null).setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null).apply {
activity.setupDialogStuff(view, this, R.string.export_notes) { alertDialog -> activity.setupDialogStuff(binding.root, this, R.string.export_notes) { alertDialog ->
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
val filename = view.export_notes_filename.value val filename = binding.exportNotesFilename.value
when { when {
filename.isEmpty() -> activity.toast(R.string.empty_name) filename.isEmpty() -> activity.toast(com.simplemobiletools.commons.R.string.empty_name)
filename.isAValidFilename() -> { filename.isAValidFilename() -> {
callback(filename) callback(filename)
alertDialog.dismiss() alertDialog.dismiss()
} }
else -> activity.toast(R.string.invalid_name) else -> activity.toast(com.simplemobiletools.commons.R.string.invalid_name)
} }
} }
} }

16
app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ImportFolderDialog.kt
View File

@ -1,37 +1,35 @@
package com.simplemobiletools.notes.pro.dialogs package com.simplemobiletools.notes.pro.dialogs
import android.view.ViewGroup
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.PROTECTION_NONE import com.simplemobiletools.commons.helpers.PROTECTION_NONE
import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.activities.SimpleActivity import com.simplemobiletools.notes.pro.activities.SimpleActivity
import com.simplemobiletools.notes.pro.databinding.DialogImportFolderBinding
import com.simplemobiletools.notes.pro.extensions.notesDB import com.simplemobiletools.notes.pro.extensions.notesDB
import com.simplemobiletools.notes.pro.extensions.parseChecklistItems import com.simplemobiletools.notes.pro.extensions.parseChecklistItems
import com.simplemobiletools.notes.pro.helpers.NotesHelper import com.simplemobiletools.notes.pro.helpers.NotesHelper
import com.simplemobiletools.notes.pro.models.Note import com.simplemobiletools.notes.pro.models.Note
import com.simplemobiletools.notes.pro.models.NoteType import com.simplemobiletools.notes.pro.models.NoteType
import kotlinx.android.synthetic.main.dialog_import_folder.view.open_file_filename
import kotlinx.android.synthetic.main.dialog_import_folder.view.open_file_type
import java.io.File import java.io.File
class ImportFolderDialog(val activity: SimpleActivity, val path: String, val callback: () -> Unit) : AlertDialog.Builder(activity) { class ImportFolderDialog(val activity: SimpleActivity, val path: String, val callback: () -> Unit) : AlertDialog.Builder(activity) {
private var dialog: AlertDialog? = null private var dialog: AlertDialog? = null
init { init {
val view = (activity.layoutInflater.inflate(R.layout.dialog_import_folder, null) as ViewGroup).apply { val binding = DialogImportFolderBinding.inflate(activity.layoutInflater).apply {
open_file_filename.setText(activity.humanizePath(path)) openFileFilename.setText(activity.humanizePath(path))
} }
activity.getAlertDialogBuilder() activity.getAlertDialogBuilder()
.setPositiveButton(R.string.ok, null) .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null)
.setNegativeButton(R.string.cancel, null) .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
.apply { .apply {
activity.setupDialogStuff(view, this, R.string.import_folder) { alertDialog -> activity.setupDialogStuff(binding.root, this, R.string.import_folder) { alertDialog ->
dialog = alertDialog dialog = alertDialog
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
val updateFilesOnEdit = view.open_file_type.checkedRadioButtonId == R.id.open_file_update_file val updateFilesOnEdit = binding.openFileType.checkedRadioButtonId == R.id.open_file_update_file
ensureBackgroundThread { ensureBackgroundThread {
saveFolder(updateFilesOnEdit) saveFolder(updateFilesOnEdit)
} }

41
app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ManageAutoBackupsDialog.kt
View File

@ -1,58 +1,55 @@
package com.simplemobiletools.notes.pro.dialogs package com.simplemobiletools.notes.pro.dialogs
import android.view.ViewGroup
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import com.simplemobiletools.commons.dialogs.FilePickerDialog import com.simplemobiletools.commons.dialogs.FilePickerDialog
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.activities.SimpleActivity import com.simplemobiletools.notes.pro.activities.SimpleActivity
import com.simplemobiletools.notes.pro.databinding.DialogManageAutomaticBackupsBinding
import com.simplemobiletools.notes.pro.extensions.config import com.simplemobiletools.notes.pro.extensions.config
import kotlinx.android.synthetic.main.dialog_manage_automatic_backups.view.backup_notes_filename
import kotlinx.android.synthetic.main.dialog_manage_automatic_backups.view.backup_notes_filename_hint
import kotlinx.android.synthetic.main.dialog_manage_automatic_backups.view.backup_notes_folder
import java.io.File import java.io.File
class ManageAutoBackupsDialog(private val activity: SimpleActivity, onSuccess: () -> Unit) { class ManageAutoBackupsDialog(private val activity: SimpleActivity, onSuccess: () -> Unit) {
private val view = (activity.layoutInflater.inflate(R.layout.dialog_manage_automatic_backups, null) as ViewGroup) private val binding = DialogManageAutomaticBackupsBinding.inflate(activity.layoutInflater)
private val view = binding.root
private val config = activity.config private val config = activity.config
private var backupFolder = config.autoBackupFolder private var backupFolder = config.autoBackupFolder
init { init {
view.apply { binding.apply {
backup_notes_folder.setText(activity.humanizePath(backupFolder)) backupNotesFolder.setText(activity.humanizePath(backupFolder))
val filename = config.autoBackupFilename.ifEmpty { val filename = config.autoBackupFilename.ifEmpty {
"${activity.getString(R.string.notes)}_%Y%M%D_%h%m%s" "${activity.getString(com.simplemobiletools.commons.R.string.notes)}_%Y%M%D_%h%m%s"
} }
backup_notes_filename.setText(filename) backupNotesFilename.setText(filename)
backup_notes_filename_hint.setEndIconOnClickListener { backupNotesFilenameHint.setEndIconOnClickListener {
DateTimePatternInfoDialog(activity) DateTimePatternInfoDialog(activity)
} }
backup_notes_filename_hint.setEndIconOnLongClickListener { backupNotesFilenameHint.setEndIconOnLongClickListener {
DateTimePatternInfoDialog(activity) DateTimePatternInfoDialog(activity)
true true
} }
backup_notes_folder.setOnClickListener { backupNotesFolder.setOnClickListener {
selectBackupFolder() selectBackupFolder()
} }
} }
activity.getAlertDialogBuilder() activity.getAlertDialogBuilder()
.setPositiveButton(R.string.ok, null) .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null)
.setNegativeButton(R.string.cancel, null) .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
.apply { .apply {
activity.setupDialogStuff(view, this, R.string.manage_automatic_backups) { dialog -> activity.setupDialogStuff(view, this, com.simplemobiletools.commons.R.string.manage_automatic_backups) { dialog ->
dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
val filename = view.backup_notes_filename.value val filename = binding.backupNotesFilename.value
when { when {
filename.isEmpty() -> activity.toast(R.string.empty_name) filename.isEmpty() -> activity.toast(com.simplemobiletools.commons.R.string.empty_name)
filename.isAValidFilename() -> { filename.isAValidFilename() -> {
val file = File(backupFolder, "$filename.json") val file = File(backupFolder, "$filename.json")
if (file.exists() && !file.canWrite()) { if (file.exists() && !file.canWrite()) {
activity.toast(R.string.name_taken) activity.toast(com.simplemobiletools.commons.R.string.name_taken)
return@setOnClickListener return@setOnClickListener
} }
@ -70,7 +67,7 @@ class ManageAutoBackupsDialog(private val activity: SimpleActivity, onSuccess: (
} }
} }
else -> activity.toast(R.string.invalid_name) else -> activity.toast(com.simplemobiletools.commons.R.string.invalid_name)
} }
} }
} }
@ -78,7 +75,7 @@ class ManageAutoBackupsDialog(private val activity: SimpleActivity, onSuccess: (
} }
private fun selectBackupFolder() { private fun selectBackupFolder() {
activity.hideKeyboard(view.backup_notes_filename) activity.hideKeyboard(binding.backupNotesFilename)
FilePickerDialog(activity, backupFolder, false, showFAB = true) { path -> FilePickerDialog(activity, backupFolder, false, showFAB = true) { path ->
activity.handleSAFDialog(path) { grantedSAF -> activity.handleSAFDialog(path) { grantedSAF ->
if (!grantedSAF) { if (!grantedSAF) {
@ -91,7 +88,7 @@ class ManageAutoBackupsDialog(private val activity: SimpleActivity, onSuccess: (
} }
backupFolder = path backupFolder = path
view.backup_notes_folder.setText(activity.humanizePath(path)) binding.backupNotesFolder.setText(activity.humanizePath(path))
} }
} }
} }

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

@ -4,20 +4,20 @@ import android.app.Activity
import android.content.DialogInterface.BUTTON_POSITIVE import android.content.DialogInterface.BUTTON_POSITIVE
import android.view.KeyEvent import android.view.KeyEvent
import android.view.View import android.view.View
import android.view.ViewGroup
import android.view.inputmethod.EditorInfo import android.view.inputmethod.EditorInfo
import androidx.appcompat.widget.AppCompatEditText import androidx.appcompat.widget.AppCompatEditText
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.DARK_GREY import com.simplemobiletools.commons.helpers.DARK_GREY
import com.simplemobiletools.commons.helpers.SORT_BY_CUSTOM import com.simplemobiletools.commons.helpers.SORT_BY_CUSTOM
import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.databinding.DialogNewChecklistItemBinding
import com.simplemobiletools.notes.pro.databinding.ItemAddChecklistBinding
import com.simplemobiletools.notes.pro.extensions.config import com.simplemobiletools.notes.pro.extensions.config
import kotlinx.android.synthetic.main.dialog_new_checklist_item.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<AppCompatEditText>() private val titles = mutableListOf<AppCompatEditText>()
private val view: ViewGroup = activity.layoutInflater.inflate(R.layout.dialog_new_checklist_item, null) as ViewGroup private val binding = DialogNewChecklistItemBinding.inflate(activity.layoutInflater)
private val view = binding.root
init { init {
addNewEditText() addNewEditText()
@ -27,25 +27,25 @@ class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayLis
activity.getProperPrimaryColor().getContrastColor() activity.getProperPrimaryColor().getContrastColor()
} }
view.apply { binding.apply {
add_item.applyColorFilter(plusTextColor) addItem.applyColorFilter(plusTextColor)
add_item.setOnClickListener { addItem.setOnClickListener {
addNewEditText() addNewEditText()
} }
settings_add_checklist_top.beVisibleIf(activity.config.sorting == SORT_BY_CUSTOM) settingsAddChecklistTop.beVisibleIf(activity.config.sorting == SORT_BY_CUSTOM)
settings_add_checklist_top.isChecked = activity.config.addNewChecklistItemsTop settingsAddChecklistTop.isChecked = activity.config.addNewChecklistItemsTop
} }
activity.getAlertDialogBuilder() activity.getAlertDialogBuilder()
.setPositiveButton(R.string.ok, null) .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null)
.setNegativeButton(R.string.cancel, null) .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
.apply { .apply {
activity.setupDialogStuff(view, this, R.string.add_new_checklist_items) { alertDialog -> activity.setupDialogStuff(view, this, R.string.add_new_checklist_items) { alertDialog ->
alertDialog.showKeyboard(titles.first()) alertDialog.showKeyboard(titles.first())
alertDialog.getButton(BUTTON_POSITIVE).setOnClickListener { alertDialog.getButton(BUTTON_POSITIVE).setOnClickListener {
activity.config.addNewChecklistItemsTop = view.settings_add_checklist_top.isChecked activity.config.addNewChecklistItemsTop = binding.settingsAddChecklistTop.isChecked
when { when {
titles.all { it.text!!.isEmpty() } -> activity.toast(R.string.empty_name) titles.all { it.text!!.isEmpty() } -> activity.toast(com.simplemobiletools.commons.R.string.empty_name)
else -> { else -> {
val titles = titles.map { it.text.toString() }.filter { it.isNotEmpty() }.toMutableList() as ArrayList<String> val titles = titles.map { it.text.toString() }.filter { it.isNotEmpty() }.toMutableList() as ArrayList<String>
callback(titles) callback(titles)
@ -58,8 +58,8 @@ class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayLis
} }
private fun addNewEditText() { private fun addNewEditText() {
activity.layoutInflater.inflate(R.layout.item_add_checklist, null).apply { ItemAddChecklistBinding.inflate(activity.layoutInflater).apply {
title_edit_text.setOnEditorActionListener { _, actionId, _ -> titleEditText.setOnEditorActionListener { _, actionId, _ ->
if (actionId == EditorInfo.IME_ACTION_NEXT || actionId == EditorInfo.IME_ACTION_DONE || actionId == KeyEvent.KEYCODE_ENTER) { if (actionId == EditorInfo.IME_ACTION_NEXT || actionId == EditorInfo.IME_ACTION_DONE || actionId == KeyEvent.KEYCODE_ENTER) {
addNewEditText() addNewEditText()
true true
@ -67,12 +67,12 @@ class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayLis
false false
} }
} }
titles.add(title_edit_text) titles.add(titleEditText)
view.checklist_holder.addView(this) binding.checklistHolder.addView(this.root)
activity.updateTextColors(view.checklist_holder) activity.updateTextColors(binding.checklistHolder)
view.dialog_holder.post { binding.dialogHolder.post {
view.dialog_holder.fullScroll(View.FOCUS_DOWN) binding.dialogHolder.fullScroll(View.FOCUS_DOWN)
activity.showKeyboard(title_edit_text) activity.showKeyboard(titleEditText)
} }
} }
} }

26
app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewNoteDialog.kt
View File

@ -6,40 +6,40 @@ import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.PROTECTION_NONE import com.simplemobiletools.commons.helpers.PROTECTION_NONE
import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.databinding.DialogNewNoteBinding
import com.simplemobiletools.notes.pro.extensions.config import com.simplemobiletools.notes.pro.extensions.config
import com.simplemobiletools.notes.pro.extensions.notesDB import com.simplemobiletools.notes.pro.extensions.notesDB
import com.simplemobiletools.notes.pro.models.Note import com.simplemobiletools.notes.pro.models.Note
import com.simplemobiletools.notes.pro.models.NoteType import com.simplemobiletools.notes.pro.models.NoteType
import kotlinx.android.synthetic.main.dialog_new_note.view.*
class NewNoteDialog(val activity: Activity, title: String? = null, val setChecklistAsDefault: Boolean, callback: (note: Note) -> Unit) { class NewNoteDialog(val activity: Activity, title: String? = null, val setChecklistAsDefault: Boolean, callback: (note: Note) -> Unit) {
init { init {
val view = activity.layoutInflater.inflate(R.layout.dialog_new_note, null).apply { val binding = DialogNewNoteBinding.inflate(activity.layoutInflater).apply {
val defaultType = when { val defaultType = when {
setChecklistAsDefault -> type_checklist.id setChecklistAsDefault -> typeChecklist.id
activity.config.lastCreatedNoteType == NoteType.TYPE_TEXT.value -> type_text_note.id activity.config.lastCreatedNoteType == NoteType.TYPE_TEXT.value -> typeTextNote.id
else -> type_checklist.id else -> typeChecklist.id
} }
new_note_type.check(defaultType) newNoteType.check(defaultType)
} }
view.locked_note_title.setText(title) binding.lockedNoteTitle.setText(title)
activity.getAlertDialogBuilder() activity.getAlertDialogBuilder()
.setPositiveButton(R.string.ok, null) .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null)
.setNegativeButton(R.string.cancel, null) .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
.apply { .apply {
activity.setupDialogStuff(view, this, R.string.new_note) { alertDialog -> activity.setupDialogStuff(binding.root, this, R.string.new_note) { alertDialog ->
alertDialog.showKeyboard(view.locked_note_title) alertDialog.showKeyboard(binding.lockedNoteTitle)
alertDialog.getButton(BUTTON_POSITIVE).setOnClickListener { alertDialog.getButton(BUTTON_POSITIVE).setOnClickListener {
val newTitle = view.locked_note_title.value val newTitle = binding.lockedNoteTitle.value
ensureBackgroundThread { ensureBackgroundThread {
when { when {
newTitle.isEmpty() -> activity.toast(R.string.no_title) newTitle.isEmpty() -> activity.toast(R.string.no_title)
activity.notesDB.getNoteIdWithTitle(newTitle) != null -> activity.toast(R.string.title_taken) activity.notesDB.getNoteIdWithTitle(newTitle) != null -> activity.toast(R.string.title_taken)
else -> { else -> {
val type = if (view.new_note_type.checkedRadioButtonId == view.type_checklist.id) { val type = if (binding.newNoteType.checkedRadioButtonId == binding.typeChecklist.id) {
NoteType.TYPE_CHECKLIST NoteType.TYPE_CHECKLIST
} else { } else {
NoteType.TYPE_TEXT NoteType.TYPE_TEXT

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

@ -1,6 +1,5 @@
package com.simplemobiletools.notes.pro.dialogs package com.simplemobiletools.notes.pro.dialogs
import android.view.ViewGroup
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import com.simplemobiletools.commons.extensions.getAlertDialogBuilder import com.simplemobiletools.commons.extensions.getAlertDialogBuilder
import com.simplemobiletools.commons.extensions.getFilenameFromPath import com.simplemobiletools.commons.extensions.getFilenameFromPath
@ -9,27 +8,27 @@ import com.simplemobiletools.commons.extensions.setupDialogStuff
import com.simplemobiletools.commons.helpers.PROTECTION_NONE import com.simplemobiletools.commons.helpers.PROTECTION_NONE
import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.activities.SimpleActivity import com.simplemobiletools.notes.pro.activities.SimpleActivity
import com.simplemobiletools.notes.pro.databinding.DialogOpenFileBinding
import com.simplemobiletools.notes.pro.models.Note import com.simplemobiletools.notes.pro.models.Note
import com.simplemobiletools.notes.pro.models.NoteType import com.simplemobiletools.notes.pro.models.NoteType
import kotlinx.android.synthetic.main.dialog_open_file.view.*
import java.io.File import java.io.File
class OpenFileDialog(val activity: SimpleActivity, val path: String, val callback: (note: Note) -> Unit) : AlertDialog.Builder(activity) { class OpenFileDialog(val activity: SimpleActivity, val path: String, val callback: (note: Note) -> Unit) : AlertDialog.Builder(activity) {
private var dialog: AlertDialog? = null private var dialog: AlertDialog? = null
init { init {
val view = (activity.layoutInflater.inflate(R.layout.dialog_open_file, null) as ViewGroup).apply { val binding = DialogOpenFileBinding.inflate(activity.layoutInflater).apply {
open_file_filename.setText(activity.humanizePath(path)) openFileFilename.setText(activity.humanizePath(path))
} }
activity.getAlertDialogBuilder() activity.getAlertDialogBuilder()
.setPositiveButton(R.string.ok, null) .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null)
.setNegativeButton(R.string.cancel, null) .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
.apply { .apply {
activity.setupDialogStuff(view, this, R.string.open_file) { alertDialog -> activity.setupDialogStuff(binding.root, this, R.string.open_file) { alertDialog ->
dialog = alertDialog dialog = alertDialog
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
val updateFileOnEdit = view.open_file_type.checkedRadioButtonId == view.open_file_update_file.id val updateFileOnEdit = binding.openFileType.checkedRadioButtonId == binding.openFileUpdateFile.id
val storePath = if (updateFileOnEdit) path else "" val storePath = if (updateFileOnEdit) path else ""
val storeContent = if (updateFileOnEdit) "" else File(path).readText() val storeContent = if (updateFileOnEdit) "" else File(path).readText()

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

@ -1,6 +1,5 @@
package com.simplemobiletools.notes.pro.dialogs package com.simplemobiletools.notes.pro.dialogs
import android.view.View
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import androidx.recyclerview.widget.StaggeredGridLayoutManager import androidx.recyclerview.widget.StaggeredGridLayoutManager
import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.activities.BaseSimpleActivity
@ -9,33 +8,32 @@ import com.simplemobiletools.commons.extensions.setupDialogStuff
import com.simplemobiletools.commons.views.AutoStaggeredGridLayoutManager import com.simplemobiletools.commons.views.AutoStaggeredGridLayoutManager
import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.adapters.OpenNoteAdapter import com.simplemobiletools.notes.pro.adapters.OpenNoteAdapter
import com.simplemobiletools.notes.pro.databinding.DialogOpenNoteBinding
import com.simplemobiletools.notes.pro.helpers.NotesHelper import com.simplemobiletools.notes.pro.helpers.NotesHelper
import com.simplemobiletools.notes.pro.models.Note import com.simplemobiletools.notes.pro.models.Note
import kotlinx.android.synthetic.main.dialog_open_note.view.dialog_open_note_list
import kotlinx.android.synthetic.main.dialog_open_note.view.new_note_fab
class OpenNoteDialog(val activity: BaseSimpleActivity, val callback: (checkedId: Long, newNote: Note?) -> Unit) { class OpenNoteDialog(val activity: BaseSimpleActivity, val callback: (checkedId: Long, newNote: Note?) -> Unit) {
private var dialog: AlertDialog? = null private var dialog: AlertDialog? = null
init { init {
val view = activity.layoutInflater.inflate(R.layout.dialog_open_note, null) val binding = DialogOpenNoteBinding.inflate(activity.layoutInflater)
val noteItemWidth = activity.resources.getDimensionPixelSize(R.dimen.grid_note_item_width) val noteItemWidth = activity.resources.getDimensionPixelSize(R.dimen.grid_note_item_width)
view.dialog_open_note_list.layoutManager = AutoStaggeredGridLayoutManager(noteItemWidth, StaggeredGridLayoutManager.VERTICAL) binding.dialogOpenNoteList.layoutManager = AutoStaggeredGridLayoutManager(noteItemWidth, StaggeredGridLayoutManager.VERTICAL)
NotesHelper(activity).getNotes { NotesHelper(activity).getNotes {
initDialog(it, view) initDialog(it, binding)
} }
} }
private fun initDialog(notes: List<Note>, view: View) { private fun initDialog(notes: List<Note>, binding: DialogOpenNoteBinding) {
view.dialog_open_note_list.adapter = OpenNoteAdapter(activity, notes, view.dialog_open_note_list) { binding.dialogOpenNoteList.adapter = OpenNoteAdapter(activity, notes, binding.dialogOpenNoteList) {
it as Note it as Note
callback(it.id!!, null) callback(it.id!!, null)
dialog?.dismiss() dialog?.dismiss()
} }
view.new_note_fab.setOnClickListener { binding.newNoteFab.setOnClickListener {
NewNoteDialog(activity, setChecklistAsDefault = false) { NewNoteDialog(activity, setChecklistAsDefault = false) {
callback(0, it) callback(0, it)
dialog?.dismiss() dialog?.dismiss()
@ -43,9 +41,9 @@ class OpenNoteDialog(val activity: BaseSimpleActivity, val callback: (checkedId:
} }
activity.getAlertDialogBuilder() activity.getAlertDialogBuilder()
.setNegativeButton(R.string.cancel, null) .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
.apply { .apply {
activity.setupDialogStuff(view, this, R.string.open_note) { alertDialog -> activity.setupDialogStuff(binding.root, this, R.string.open_note) { alertDialog ->
dialog = alertDialog dialog = alertDialog
} }
} }

19
app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameChecklistItemDialog.kt
View File

@ -3,25 +3,24 @@ package com.simplemobiletools.notes.pro.dialogs
import android.app.Activity import android.app.Activity
import android.content.DialogInterface.BUTTON_POSITIVE import android.content.DialogInterface.BUTTON_POSITIVE
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.databinding.DialogRenameChecklistItemBinding
import kotlinx.android.synthetic.main.dialog_rename_checklist_item.view.*
class RenameChecklistItemDialog(val activity: Activity, val oldTitle: String, callback: (newTitle: String) -> Unit) { class RenameChecklistItemDialog(val activity: Activity, val oldTitle: String, callback: (newTitle: String) -> Unit) {
init { init {
val view = activity.layoutInflater.inflate(R.layout.dialog_rename_checklist_item, null).apply { val binding = DialogRenameChecklistItemBinding.inflate(activity.layoutInflater).apply {
checklist_item_title.setText(oldTitle) checklistItemTitle.setText(oldTitle)
} }
activity.getAlertDialogBuilder() activity.getAlertDialogBuilder()
.setPositiveButton(R.string.ok, null) .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null)
.setNegativeButton(R.string.cancel, null) .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
.apply { .apply {
activity.setupDialogStuff(view, this) { alertDialog -> activity.setupDialogStuff(binding.root, this) { alertDialog ->
alertDialog.showKeyboard(view.checklist_item_title) alertDialog.showKeyboard(binding.checklistItemTitle)
alertDialog.getButton(BUTTON_POSITIVE).setOnClickListener { alertDialog.getButton(BUTTON_POSITIVE).setOnClickListener {
val newTitle = view.checklist_item_title.value val newTitle = binding.checklistItemTitle.value
when { when {
newTitle.isEmpty() -> activity.toast(R.string.empty_name) newTitle.isEmpty() -> activity.toast(com.simplemobiletools.commons.R.string.empty_name)
else -> { else -> {
callback(newTitle) callback(newTitle)
alertDialog.dismiss() alertDialog.dismiss()

21
app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameNoteDialog.kt
View File

@ -6,28 +6,29 @@ import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.activities.SimpleActivity import com.simplemobiletools.notes.pro.activities.SimpleActivity
import com.simplemobiletools.notes.pro.databinding.DialogRenameNoteBinding
import com.simplemobiletools.notes.pro.extensions.config import com.simplemobiletools.notes.pro.extensions.config
import com.simplemobiletools.notes.pro.extensions.notesDB import com.simplemobiletools.notes.pro.extensions.notesDB
import com.simplemobiletools.notes.pro.extensions.updateWidgets import com.simplemobiletools.notes.pro.extensions.updateWidgets
import com.simplemobiletools.notes.pro.helpers.NotesHelper import com.simplemobiletools.notes.pro.helpers.NotesHelper
import com.simplemobiletools.notes.pro.models.Note import com.simplemobiletools.notes.pro.models.Note
import kotlinx.android.synthetic.main.dialog_new_note.view.*
import java.io.File import java.io.File
class RenameNoteDialog(val activity: SimpleActivity, val note: Note, val currentNoteText: String?, val callback: (note: Note) -> Unit) { class RenameNoteDialog(val activity: SimpleActivity, val note: Note, val currentNoteText: String?, val callback: (note: Note) -> Unit) {
init { init {
val view = activity.layoutInflater.inflate(R.layout.dialog_rename_note, null) val binding = DialogRenameNoteBinding.inflate(activity.layoutInflater)
view.locked_note_title.setText(note.title) val view = binding.root
binding.lockedNoteTitle.setText(note.title)
activity.getAlertDialogBuilder() activity.getAlertDialogBuilder()
.setPositiveButton(R.string.ok, null) .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null)
.setNegativeButton(R.string.cancel, null) .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
.apply { .apply {
activity.setupDialogStuff(view, this, R.string.rename_note) { alertDialog -> activity.setupDialogStuff(view, this, R.string.rename_note) { alertDialog ->
alertDialog.showKeyboard(view.locked_note_title) alertDialog.showKeyboard(binding.lockedNoteTitle)
alertDialog.getButton(BUTTON_POSITIVE).setOnClickListener { alertDialog.getButton(BUTTON_POSITIVE).setOnClickListener {
val title = view.locked_note_title.value val title = binding.lockedNoteTitle.value
ensureBackgroundThread { ensureBackgroundThread {
newTitleConfirmed(title, alertDialog) newTitleConfirmed(title, alertDialog)
} }
@ -55,14 +56,14 @@ class RenameNoteDialog(val activity: SimpleActivity, val note: Note, val current
} }
} else { } else {
if (title.isEmpty()) { if (title.isEmpty()) {
activity.toast(R.string.filename_cannot_be_empty) activity.toast(com.simplemobiletools.commons.R.string.filename_cannot_be_empty)
return return
} }
val file = File(path) val file = File(path)
val newFile = File(file.parent, title) val newFile = File(file.parent, title)
if (!newFile.name.isAValidFilename()) { if (!newFile.name.isAValidFilename()) {
activity.toast(R.string.invalid_name) activity.toast(com.simplemobiletools.commons.R.string.invalid_name)
return return
} }
@ -74,7 +75,7 @@ class RenameNoteDialog(val activity: SimpleActivity, val note: Note, val current
callback(note) callback(note)
} }
} else { } else {
activity.toast(R.string.rename_file_error) activity.toast(com.simplemobiletools.commons.R.string.rename_file_error)
return@renameFile return@renameFile
} }
} }

46
app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/SortChecklistDialog.kt
View File

@ -9,11 +9,12 @@ import com.simplemobiletools.commons.helpers.SORT_BY_TITLE
import com.simplemobiletools.commons.helpers.SORT_DESCENDING import com.simplemobiletools.commons.helpers.SORT_DESCENDING
import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.activities.SimpleActivity import com.simplemobiletools.notes.pro.activities.SimpleActivity
import com.simplemobiletools.notes.pro.databinding.DialogSortChecklistBinding
import com.simplemobiletools.notes.pro.extensions.config import com.simplemobiletools.notes.pro.extensions.config
import kotlinx.android.synthetic.main.dialog_sort_checklist.view.*
class SortChecklistDialog(private val activity: SimpleActivity, private val callback: () -> Unit) { class SortChecklistDialog(private val activity: SimpleActivity, private val callback: () -> Unit) {
private val view = activity.layoutInflater.inflate(R.layout.dialog_sort_checklist, null) private val binding = DialogSortChecklistBinding.inflate(activity.layoutInflater)
private val view = binding.root
private val config = activity.config private val config = activity.config
private var currSorting = config.sorting private var currSorting = config.sorting
@ -23,56 +24,55 @@ class SortChecklistDialog(private val activity: SimpleActivity, private val call
setupMoveUndoneChecklistItems() setupMoveUndoneChecklistItems()
activity.getAlertDialogBuilder() activity.getAlertDialogBuilder()
.setPositiveButton(R.string.ok) { _, _ -> dialogConfirmed() } .setPositiveButton(com.simplemobiletools.commons.R.string.ok) { _, _ -> dialogConfirmed() }
.setNegativeButton(R.string.cancel, null) .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
.apply { .apply {
activity.setupDialogStuff(view, this, R.string.sort_by) activity.setupDialogStuff(view, this, com.simplemobiletools.commons.R.string.sort_by)
} }
} }
private fun setupSortRadio() { private fun setupSortRadio() {
val fieldRadio = view.sorting_dialog_radio_sorting val fieldRadio = binding.sortingDialogRadioSorting
fieldRadio.setOnCheckedChangeListener { group, checkedId -> fieldRadio.setOnCheckedChangeListener { group, checkedId ->
val isCustomSorting = checkedId == fieldRadio.sorting_dialog_radio_custom.id val isCustomSorting = checkedId == binding.sortingDialogRadioCustom.id
view.sorting_dialog_radio_order.beGoneIf(isCustomSorting) binding.sortingDialogRadioOrder.beGoneIf(isCustomSorting)
view.sorting_dialog_order_divider.beGoneIf(isCustomSorting) binding.sortingDialogOrderDivider.beGoneIf(isCustomSorting)
view.move_undone_checklist_items_divider.beGoneIf(isCustomSorting) binding.moveUndoneChecklistItemsDivider.beGoneIf(isCustomSorting)
view.settings_move_undone_checklist_items_holder.beGoneIf(isCustomSorting) binding.settingsMoveUndoneChecklistItemsHolder.beGoneIf(isCustomSorting)
} }
var fieldBtn = fieldRadio.sorting_dialog_radio_title var fieldBtn = binding.sortingDialogRadioTitle
if (currSorting and SORT_BY_DATE_CREATED != 0) { if (currSorting and SORT_BY_DATE_CREATED != 0) {
fieldBtn = fieldRadio.sorting_dialog_radio_date_created fieldBtn = binding.sortingDialogRadioDateCreated
} }
if (currSorting and SORT_BY_CUSTOM != 0) { if (currSorting and SORT_BY_CUSTOM != 0) {
fieldBtn = fieldRadio.sorting_dialog_radio_custom fieldBtn = binding.sortingDialogRadioCustom
} }
fieldBtn.isChecked = true fieldBtn.isChecked = true
} }
private fun setupOrderRadio() { private fun setupOrderRadio() {
val orderRadio = view.sorting_dialog_radio_order var orderBtn = binding.sortingDialogRadioAscending
var orderBtn = orderRadio.sorting_dialog_radio_ascending
if (currSorting and SORT_DESCENDING != 0) { if (currSorting and SORT_DESCENDING != 0) {
orderBtn = orderRadio.sorting_dialog_radio_descending orderBtn = binding.sortingDialogRadioDescending
} }
orderBtn.isChecked = true orderBtn.isChecked = true
} }
private fun setupMoveUndoneChecklistItems() { private fun setupMoveUndoneChecklistItems() {
view.settings_move_undone_checklist_items.isChecked = config.moveDoneChecklistItems binding.settingsMoveUndoneChecklistItems.isChecked = config.moveDoneChecklistItems
view.settings_move_undone_checklist_items_holder.setOnClickListener { binding.settingsMoveUndoneChecklistItemsHolder.setOnClickListener {
view.settings_move_undone_checklist_items.toggle() binding.settingsMoveUndoneChecklistItems.toggle()
} }
} }
private fun dialogConfirmed() { private fun dialogConfirmed() {
val sortingRadio = view.sorting_dialog_radio_sorting val sortingRadio = binding.sortingDialogRadioSorting
var sorting = when (sortingRadio.checkedRadioButtonId) { var sorting = when (sortingRadio.checkedRadioButtonId) {
R.id.sorting_dialog_radio_date_created -> SORT_BY_DATE_CREATED R.id.sorting_dialog_radio_date_created -> SORT_BY_DATE_CREATED
R.id.sorting_dialog_radio_custom -> SORT_BY_CUSTOM R.id.sorting_dialog_radio_custom -> SORT_BY_CUSTOM
@ -80,7 +80,7 @@ class SortChecklistDialog(private val activity: SimpleActivity, private val call
} }
if (sortingRadio.checkedRadioButtonId != R.id.sorting_dialog_radio_custom if (sortingRadio.checkedRadioButtonId != R.id.sorting_dialog_radio_custom
&& view.sorting_dialog_radio_order.checkedRadioButtonId == R.id.sorting_dialog_radio_descending && binding.sortingDialogRadioOrder.checkedRadioButtonId == R.id.sorting_dialog_radio_descending
) { ) {
sorting = sorting or SORT_DESCENDING sorting = sorting or SORT_DESCENDING
} }
@ -89,7 +89,7 @@ class SortChecklistDialog(private val activity: SimpleActivity, private val call
config.sorting = sorting config.sorting = sorting
} }
config.moveDoneChecklistItems = view.settings_move_undone_checklist_items.isChecked config.moveDoneChecklistItems = binding.settingsMoveUndoneChecklistItems.isChecked
callback() callback()
} }
} }

38
app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/UnlockNotesDialog.kt
View File

@ -1,20 +1,20 @@
package com.simplemobiletools.notes.pro.dialogs package com.simplemobiletools.notes.pro.dialogs
import android.content.DialogInterface import android.content.DialogInterface
import android.view.ViewGroup
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.activities.BaseSimpleActivity
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.databinding.DialogUnlockNotesBinding
import com.simplemobiletools.notes.pro.databinding.ItemLockedNoteBinding
import com.simplemobiletools.notes.pro.models.Note import com.simplemobiletools.notes.pro.models.Note
import kotlinx.android.synthetic.main.dialog_unlock_notes.view.*
import kotlinx.android.synthetic.main.item_locked_note.view.*
class UnlockNotesDialog(val activity: BaseSimpleActivity, val notes: List<Note>, callback: (unlockedNotes: List<Note>) -> Unit) { class UnlockNotesDialog(val activity: BaseSimpleActivity, val notes: List<Note>, callback: (unlockedNotes: List<Note>) -> Unit) {
private var dialog: AlertDialog? = null private var dialog: AlertDialog? = null
private val view = activity.layoutInflater.inflate(R.layout.dialog_unlock_notes, null) as ViewGroup private val binding = DialogUnlockNotesBinding.inflate(activity.layoutInflater)
private val redColor = activity.getColor(R.color.md_red) private val view = binding.root
private val greenColor = activity.getColor(R.color.md_green) private val redColor = activity.getColor(com.simplemobiletools.commons.R.color.md_red)
private val greenColor = activity.getColor(com.simplemobiletools.commons.R.color.md_green)
private val unlockedNoteIds = mutableListOf<Long>() private val unlockedNoteIds = mutableListOf<Long>()
init { init {
@ -23,8 +23,8 @@ class UnlockNotesDialog(val activity: BaseSimpleActivity, val notes: List<Note>,
} }
activity.getAlertDialogBuilder() activity.getAlertDialogBuilder()
.setPositiveButton(R.string.skip, null) .setPositiveButton(com.simplemobiletools.commons.R.string.skip, null)
.setNegativeButton(R.string.cancel, null) .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
.apply { .apply {
activity.setupDialogStuff(view, this, R.string.unlock_notes, cancelOnTouchOutside = false) { alertDialog -> activity.setupDialogStuff(view, this, R.string.unlock_notes, cancelOnTouchOutside = false) { alertDialog ->
dialog = alertDialog dialog = alertDialog
@ -37,19 +37,19 @@ class UnlockNotesDialog(val activity: BaseSimpleActivity, val notes: List<Note>,
} }
private fun addLockedNoteView(note: Note) { private fun addLockedNoteView(note: Note) {
activity.layoutInflater.inflate(R.layout.item_locked_note, null).apply { ItemLockedNoteBinding.inflate(activity.layoutInflater).apply {
view.notes_holder.addView(this) binding.notesHolder.addView(this.root)
activity.updateTextColors(view.notes_holder) activity.updateTextColors(binding.notesHolder)
locked_note_title.text = note.title lockedNoteTitle.text = note.title
locked_unlocked_image.applyColorFilter(redColor) lockedUnlockedImage.applyColorFilter(redColor)
locked_note_holder.setOnClickListener { lockedNoteHolder.setOnClickListener {
if (note.id !in unlockedNoteIds) { if (note.id !in unlockedNoteIds) {
activity.performSecurityCheck( activity.performSecurityCheck(
protectionType = note.protectionType, protectionType = note.protectionType,
requiredHash = note.protectionHash, requiredHash = note.protectionHash,
successCallback = { _, _ -> successCallback = { _, _ ->
unlockedNoteIds.add(note.id!!) unlockedNoteIds.add(note.id!!)
locked_unlocked_image.apply { lockedUnlockedImage.apply {
setImageResource(R.drawable.ic_lock_open_vector) setImageResource(R.drawable.ic_lock_open_vector)
applyColorFilter(greenColor) applyColorFilter(greenColor)
} }
@ -58,8 +58,8 @@ class UnlockNotesDialog(val activity: BaseSimpleActivity, val notes: List<Note>,
) )
} else { } else {
unlockedNoteIds.remove(note.id) unlockedNoteIds.remove(note.id)
locked_unlocked_image.apply { lockedUnlockedImage.apply {
setImageResource(R.drawable.ic_lock_vector) setImageResource(com.simplemobiletools.commons.R.drawable.ic_lock_vector)
applyColorFilter(redColor) applyColorFilter(redColor)
} }
updatePositiveButton() updatePositiveButton()
@ -70,9 +70,9 @@ class UnlockNotesDialog(val activity: BaseSimpleActivity, val notes: List<Note>,
private fun updatePositiveButton() { private fun updatePositiveButton() {
dialog?.getButton(DialogInterface.BUTTON_POSITIVE)?.text = if (unlockedNoteIds.isNotEmpty()) { dialog?.getButton(DialogInterface.BUTTON_POSITIVE)?.text = if (unlockedNoteIds.isNotEmpty()) {
activity.getString(R.string.ok) activity.getString(com.simplemobiletools.commons.R.string.ok)
} else { } else {
activity.getString(R.string.skip) activity.getString(com.simplemobiletools.commons.R.string.skip)
} }
} }
} }

6
app/src/main/kotlin/com/simplemobiletools/notes/pro/extensions/Context.kt
View File

@ -41,7 +41,7 @@ fun Context.updateWidgets() {
} }
} }
fun Context.getPercentageFontSize() = resources.getDimension(R.dimen.middle_text_size) * (config.fontSizePercentage / 100f) fun Context.getPercentageFontSize() = resources.getDimension(com.simplemobiletools.commons.R.dimen.middle_text_size) * (config.fontSizePercentage / 100f)
fun BaseSimpleActivity.requestUnlockNotes(notes: List<Note>, callback: (unlockedNotes: List<Note>) -> Unit) { fun BaseSimpleActivity.requestUnlockNotes(notes: List<Note>, callback: (unlockedNotes: List<Note>) -> Unit) {
val lockedNotes = notes.filter { it.isLocked() } val lockedNotes = notes.filter { it.isLocked() }
@ -95,7 +95,7 @@ fun Context.backupNotes() {
val config = config val config = config
NotesHelper(this).getNotes { notesToBackup -> NotesHelper(this).getNotes { notesToBackup ->
if (notesToBackup.isEmpty()) { if (notesToBackup.isEmpty()) {
toast(R.string.no_entries_for_exporting) toast(com.simplemobiletools.commons.R.string.no_entries_for_exporting)
config.lastAutoBackupTime = DateTime.now().millis config.lastAutoBackupTime = DateTime.now().millis
scheduleNextAutomaticBackup() scheduleNextAutomaticBackup()
return@getNotes return@getNotes
@ -153,7 +153,7 @@ fun Context.backupNotes() {
} }
if (exportResult == ExportResult.EXPORT_FAIL) { if (exportResult == ExportResult.EXPORT_FAIL) {
toast(R.string.exporting_failed) toast(com.simplemobiletools.commons.R.string.exporting_failed)
} }
config.lastAutoBackupTime = DateTime.now().millis config.lastAutoBackupTime = DateTime.now().millis

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

@ -4,14 +4,16 @@ import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.ImageView
import android.widget.TextView
import com.google.gson.Gson import com.google.gson.Gson
import com.google.gson.reflect.TypeToken import com.google.gson.reflect.TypeToken
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.SORT_BY_CUSTOM import com.simplemobiletools.commons.helpers.SORT_BY_CUSTOM
import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.activities.SimpleActivity import com.simplemobiletools.notes.pro.activities.SimpleActivity
import com.simplemobiletools.notes.pro.adapters.ChecklistAdapter import com.simplemobiletools.notes.pro.adapters.ChecklistAdapter
import com.simplemobiletools.notes.pro.databinding.FragmentChecklistBinding
import com.simplemobiletools.notes.pro.dialogs.NewChecklistItemDialog import com.simplemobiletools.notes.pro.dialogs.NewChecklistItemDialog
import com.simplemobiletools.notes.pro.extensions.config import com.simplemobiletools.notes.pro.extensions.config
import com.simplemobiletools.notes.pro.extensions.updateWidgets import com.simplemobiletools.notes.pro.extensions.updateWidgets
@ -20,22 +22,21 @@ import com.simplemobiletools.notes.pro.helpers.NotesHelper
import com.simplemobiletools.notes.pro.interfaces.ChecklistItemsListener import com.simplemobiletools.notes.pro.interfaces.ChecklistItemsListener
import com.simplemobiletools.notes.pro.models.ChecklistItem import com.simplemobiletools.notes.pro.models.ChecklistItem
import com.simplemobiletools.notes.pro.models.Note import com.simplemobiletools.notes.pro.models.Note
import kotlinx.android.synthetic.main.fragment_checklist.view.*
import java.io.File import java.io.File
class ChecklistFragment : NoteFragment(), ChecklistItemsListener { class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
private var noteId = 0L private var noteId = 0L
lateinit var view: ViewGroup lateinit var binding: FragmentChecklistBinding
var items = mutableListOf<ChecklistItem>() var items = mutableListOf<ChecklistItem>()
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
view = inflater.inflate(R.layout.fragment_checklist, container, false) as ViewGroup binding = FragmentChecklistBinding.inflate(inflater, container, false)
noteId = requireArguments().getLong(NOTE_ID, 0L) noteId = requireArguments().getLong(NOTE_ID, 0L)
setupFragmentColors() setupFragmentColors()
return view return binding.root
} }
override fun onResume() { override fun onResume() {
@ -48,8 +49,8 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
if (menuVisible) { if (menuVisible) {
activity?.hideKeyboard() activity?.hideKeyboard()
} else if (::view.isInitialized) { } else if (::binding.isInitialized) {
(view.checklist_list.adapter as? ChecklistAdapter)?.finishActMode() (binding.checklistList.adapter as? ChecklistAdapter)?.finishActMode()
} }
} }
@ -105,7 +106,7 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
private fun setupFragmentColors() { private fun setupFragmentColors() {
val adjustedPrimaryColor = requireActivity().getProperPrimaryColor() val adjustedPrimaryColor = requireActivity().getProperPrimaryColor()
view.checklist_fab.apply { binding.checklistFab.apply {
setColors( setColors(
requireActivity().getProperTextColor(), requireActivity().getProperTextColor(),
adjustedPrimaryColor, adjustedPrimaryColor,
@ -114,12 +115,12 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
setOnClickListener { setOnClickListener {
showNewItemDialog() showNewItemDialog()
(view.checklist_list.adapter as? ChecklistAdapter)?.finishActMode() (binding.checklistList.adapter as? ChecklistAdapter)?.finishActMode()
} }
} }
view.fragment_placeholder.setTextColor(requireActivity().getProperTextColor()) binding.fragmentPlaceholder.setTextColor(requireActivity().getProperTextColor())
view.fragment_placeholder_2.apply { binding.fragmentPlaceholder2.apply {
setTextColor(adjustedPrimaryColor) setTextColor(adjustedPrimaryColor)
underlineText() underlineText()
setOnClickListener { setOnClickListener {
@ -133,10 +134,10 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
return return
} }
view.apply { binding.apply {
checklist_content_holder.beVisibleIf(!note!!.isLocked() || shouldShowLockedContent) checklistContentHolder.beVisibleIf(!note!!.isLocked() || shouldShowLockedContent)
checklist_fab.beVisibleIf(!note!!.isLocked() || shouldShowLockedContent) checklistFab.beVisibleIf(!note!!.isLocked() || shouldShowLockedContent)
setupLockedViews(this, note!!) setupLockedViews(this.toCommonBinding(), note!!)
} }
} }
@ -176,7 +177,7 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
activity = activity as SimpleActivity, activity = activity as SimpleActivity,
items = items, items = items,
listener = this, listener = this,
recyclerView = view.checklist_list, recyclerView = binding.checklistList,
showIcons = true showIcons = true
) { item -> ) { item ->
val clickedNote = item as ChecklistItem val clickedNote = item as ChecklistItem
@ -185,7 +186,7 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
saveNote(items.indexOfFirst { it.id == clickedNote.id }) saveNote(items.indexOfFirst { it.id == clickedNote.id })
context?.updateWidgets() context?.updateWidgets()
}.apply { }.apply {
view.checklist_list.adapter = this binding.checklistList.adapter = this
} }
} }
@ -204,8 +205,8 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
if (note != null) { if (note != null) {
if (refreshIndex != -1) { if (refreshIndex != -1) {
view.checklist_list.post { binding.checklistList.post {
view.checklist_list.adapter?.notifyItemChanged(refreshIndex) binding.checklistList.adapter?.notifyItemChanged(refreshIndex)
} }
} }
@ -225,10 +226,10 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
} }
private fun updateUIVisibility() { private fun updateUIVisibility() {
view.apply { binding.apply {
fragment_placeholder.beVisibleIf(items.isEmpty()) fragmentPlaceholder.beVisibleIf(items.isEmpty())
fragment_placeholder_2.beVisibleIf(items.isEmpty()) fragmentPlaceholder2.beVisibleIf(items.isEmpty())
checklist_list.beVisibleIf(items.isNotEmpty()) checklistList.beVisibleIf(items.isNotEmpty())
} }
} }
@ -242,4 +243,14 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
loadNoteById(noteId) loadNoteById(noteId)
setupAdapter() setupAdapter()
} }
private fun FragmentChecklistBinding.toCommonBinding(): CommonNoteBinding = this.let {
object : CommonNoteBinding {
override val root: View = it.root
override val noteLockedLayout: View = it.noteLockedLayout
override val noteLockedImage: ImageView = it.noteLockedImage
override val noteLockedLabel: TextView = it.noteLockedLabel
override val noteLockedShow: TextView = it.noteLockedShow
}
}
} }

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

@ -1,7 +1,9 @@
package com.simplemobiletools.notes.pro.fragments package com.simplemobiletools.notes.pro.fragments
import android.util.TypedValue import android.util.TypedValue
import android.view.ViewGroup import android.view.View
import android.widget.ImageView
import android.widget.TextView
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.PROTECTION_NONE import com.simplemobiletools.commons.helpers.PROTECTION_NONE
@ -10,24 +12,23 @@ import com.simplemobiletools.notes.pro.extensions.config
import com.simplemobiletools.notes.pro.extensions.getPercentageFontSize import com.simplemobiletools.notes.pro.extensions.getPercentageFontSize
import com.simplemobiletools.notes.pro.helpers.NotesHelper import com.simplemobiletools.notes.pro.helpers.NotesHelper
import com.simplemobiletools.notes.pro.models.Note import com.simplemobiletools.notes.pro.models.Note
import kotlinx.android.synthetic.main.fragment_checklist.view.*
abstract class NoteFragment : Fragment() { abstract class NoteFragment : Fragment() {
protected var note: Note? = null protected var note: Note? = null
var shouldShowLockedContent = false var shouldShowLockedContent = false
protected fun setupLockedViews(view: ViewGroup, note: Note) { protected fun setupLockedViews(binding: CommonNoteBinding, note: Note) {
view.apply { binding.apply {
note_locked_layout.beVisibleIf(note.isLocked() && !shouldShowLockedContent) noteLockedLayout.beVisibleIf(note.isLocked() && !shouldShowLockedContent)
note_locked_image.applyColorFilter(requireContext().getProperTextColor()) noteLockedImage.applyColorFilter(requireContext().getProperTextColor())
note_locked_label.setTextColor(requireContext().getProperTextColor()) noteLockedLabel.setTextColor(requireContext().getProperTextColor())
note_locked_label.setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getPercentageFontSize()) noteLockedLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX, binding.root.context.getPercentageFontSize())
note_locked_show.underlineText() noteLockedShow.underlineText()
note_locked_show.setTextColor(requireContext().getProperPrimaryColor()) noteLockedShow.setTextColor(requireContext().getProperPrimaryColor())
note_locked_show.setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getPercentageFontSize()) noteLockedShow.setTextSize(TypedValue.COMPLEX_UNIT_PX, binding.root.context.getPercentageFontSize())
note_locked_show.setOnClickListener { noteLockedShow.setOnClickListener {
handleUnlocking() handleUnlocking()
} }
} }
@ -72,4 +73,12 @@ abstract class NoteFragment : Fragment() {
} }
abstract fun checkLockState() abstract fun checkLockState()
interface CommonNoteBinding {
val root: View
val noteLockedLayout: View
val noteLockedImage: ImageView
val noteLockedLabel: TextView
val noteLockedShow: TextView
}
} }

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

@ -16,9 +16,17 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.view.inputmethod.EditorInfo import android.view.inputmethod.EditorInfo
import android.view.inputmethod.InputMethodManager import android.view.inputmethod.InputMethodManager
import android.widget.ImageView
import android.widget.TextView
import androidx.viewbinding.ViewBinding
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.views.MyEditText
import com.simplemobiletools.commons.views.MyTextView
import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.activities.MainActivity import com.simplemobiletools.notes.pro.activities.MainActivity
import com.simplemobiletools.notes.pro.databinding.FragmentTextBinding
import com.simplemobiletools.notes.pro.databinding.NoteViewHorizScrollableBinding
import com.simplemobiletools.notes.pro.databinding.NoteViewStaticBinding
import com.simplemobiletools.notes.pro.extensions.config import com.simplemobiletools.notes.pro.extensions.config
import com.simplemobiletools.notes.pro.extensions.getPercentageFontSize import com.simplemobiletools.notes.pro.extensions.getPercentageFontSize
import com.simplemobiletools.notes.pro.extensions.updateWidgets import com.simplemobiletools.notes.pro.extensions.updateWidgets
@ -27,8 +35,6 @@ import com.simplemobiletools.notes.pro.helpers.NOTE_ID
import com.simplemobiletools.notes.pro.helpers.NotesHelper import com.simplemobiletools.notes.pro.helpers.NotesHelper
import com.simplemobiletools.notes.pro.models.TextHistory import com.simplemobiletools.notes.pro.models.TextHistory
import com.simplemobiletools.notes.pro.models.TextHistoryItem import com.simplemobiletools.notes.pro.models.TextHistoryItem
import kotlinx.android.synthetic.main.fragment_text.view.*
import kotlinx.android.synthetic.main.note_view_horiz_scrollable.view.*
import java.io.File import java.io.File
// text history handling taken from https://gist.github.com/zeleven/0cfa738c1e8b65b23ff7df1fc30c9f7e // text history handling taken from https://gist.github.com/zeleven/0cfa738c1e8b65b23ff7df1fc30c9f7e
@ -42,29 +48,41 @@ class TextFragment : NoteFragment() {
private var touchDownX = 0f private var touchDownX = 0f
private var moveXThreshold = 0 // make sure swiping across notes works well, do not swallow the gestures private var moveXThreshold = 0 // make sure swiping across notes works well, do not swallow the gestures
lateinit var view: ViewGroup private lateinit var binding: FragmentTextBinding
private lateinit var innerBinding: ViewBinding
private lateinit var noteEditText: MyEditText
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
view = inflater.inflate(R.layout.fragment_text, container, false) as ViewGroup binding = FragmentTextBinding.inflate(inflater, container, false)
noteId = requireArguments().getLong(NOTE_ID, 0L) noteId = requireArguments().getLong(NOTE_ID, 0L)
moveXThreshold = resources.getDimension(R.dimen.activity_margin).toInt() moveXThreshold = resources.getDimension(com.simplemobiletools.commons.R.dimen.activity_margin).toInt()
retainInstance = true retainInstance = true
val layoutToInflate = if (config!!.enableLineWrap) R.layout.note_view_static else R.layout.note_view_horiz_scrollable innerBinding = if (config!!.enableLineWrap) {
inflater.inflate(layoutToInflate, view.notes_relative_layout, true) NoteViewStaticBinding.inflate(inflater, binding.notesRelativeLayout, true).apply {
noteEditText = textNoteView
}
} else {
NoteViewHorizScrollableBinding.inflate(inflater, binding.notesRelativeLayout, true).apply {
noteEditText = textNoteView
}
}
if (config!!.clickableLinks) { if (config!!.clickableLinks) {
view.text_note_view.apply { noteEditText.apply {
linksClickable = true linksClickable = true
autoLinkMask = Linkify.WEB_URLS or Linkify.EMAIL_ADDRESSES autoLinkMask = Linkify.WEB_URLS or Linkify.EMAIL_ADDRESSES
movementMethod = MyMovementMethod.getInstance() movementMethod = MyMovementMethod.getInstance()
} }
} }
view.notes_horizontal_scrollview?.onGlobalLayout { if (innerBinding is NoteViewHorizScrollableBinding) {
view.text_note_view.minWidth = view.notes_horizontal_scrollview.width val casted = innerBinding as NoteViewHorizScrollableBinding
casted.notesHorizontalScrollview.onGlobalLayout {
casted.textNoteView.minWidth = casted.notesHorizontalScrollview.width
}
} }
return view return binding.root
} }
override fun onResume() { override fun onResume() {
@ -113,14 +131,14 @@ class TextFragment : NoteFragment() {
if (savedInstanceState != null && note != null && savedInstanceState.containsKey(TEXT)) { if (savedInstanceState != null && note != null && savedInstanceState.containsKey(TEXT)) {
skipTextUpdating = true skipTextUpdating = true
val newText = savedInstanceState.getString(TEXT) ?: "" val newText = savedInstanceState.getString(TEXT) ?: ""
view.text_note_view.setText(newText) innerBinding.root.findViewById<MyTextView>(R.id.text_note_view).text = newText
} }
} }
@SuppressLint("ClickableViewAccessibility") @SuppressLint("ClickableViewAccessibility")
private fun setupFragment() { private fun setupFragment() {
val config = config ?: return val config = config ?: return
view.text_note_view.apply { noteEditText.apply {
typeface = if (config.monospacedFont) Typeface.MONOSPACE else Typeface.DEFAULT typeface = if (config.monospacedFont) Typeface.MONOSPACE else Typeface.DEFAULT
val fileContents = note!!.getNoteStoredValue(context) val fileContents = note!!.getNoteStoredValue(context)
@ -162,13 +180,13 @@ class TextFragment : NoteFragment() {
} }
} }
view.text_note_view.setOnTouchListener { v, event -> noteEditText.setOnTouchListener { v, event ->
when (event.action) { when (event.action) {
MotionEvent.ACTION_DOWN -> touchDownX = event.x MotionEvent.ACTION_DOWN -> touchDownX = event.x
MotionEvent.ACTION_MOVE -> { MotionEvent.ACTION_MOVE -> {
val diffX = Math.abs(event.x - touchDownX) val diffX = Math.abs(event.x - touchDownX)
if (diffX > moveXThreshold) { if (diffX > moveXThreshold) {
view.requestDisallowInterceptTouchEvent(false) binding.root.requestDisallowInterceptTouchEvent(false)
} }
} }
} }
@ -176,8 +194,8 @@ class TextFragment : NoteFragment() {
} }
if (config.showWordCount) { if (config.showWordCount) {
view.notes_counter.setTextColor(requireContext().getProperTextColor()) binding.notesCounter.setTextColor(requireContext().getProperTextColor())
setWordCounter(view.text_note_view.text.toString()) setWordCounter(noteEditText.text.toString())
} }
checkLockState() checkLockState()
@ -185,27 +203,27 @@ class TextFragment : NoteFragment() {
} }
fun setTextWatcher() { fun setTextWatcher() {
view.text_note_view.apply { noteEditText.apply {
removeTextChangedListener(textWatcher) removeTextChangedListener(textWatcher)
addTextChangedListener(textWatcher) addTextChangedListener(textWatcher)
} }
} }
fun removeTextWatcher() = view.text_note_view.removeTextChangedListener(textWatcher) fun removeTextWatcher() = noteEditText.removeTextChangedListener(textWatcher)
override fun checkLockState() { override fun checkLockState() {
if (note == null) { if (note == null) {
return return
} }
view.apply { binding.apply {
notes_counter.beVisibleIf((!note!!.isLocked() || shouldShowLockedContent) && config!!.showWordCount) notesCounter.beVisibleIf((!note!!.isLocked() || shouldShowLockedContent) && config!!.showWordCount)
notes_scrollview.beVisibleIf(!note!!.isLocked() || shouldShowLockedContent) notesScrollview.beVisibleIf(!note!!.isLocked() || shouldShowLockedContent)
setupLockedViews(this, note!!) setupLockedViews(this.toCommonBinding(), note!!)
} }
} }
fun getNotesView() = view.text_note_view fun getNotesView() = noteEditText
fun saveText(force: Boolean) { fun saveText(force: Boolean) {
if (note == null) { if (note == null) {
@ -232,20 +250,20 @@ class TextFragment : NoteFragment() {
fun hasUnsavedChanges() = note != null && getCurrentNoteViewText() != note!!.getNoteStoredValue(requireContext()) fun hasUnsavedChanges() = note != null && getCurrentNoteViewText() != note!!.getNoteStoredValue(requireContext())
fun focusEditText() { fun focusEditText() {
view.text_note_view.requestFocus() noteEditText.requestFocus()
} }
fun getCurrentNoteViewText() = view.text_note_view?.text?.toString() fun getCurrentNoteViewText() = noteEditText.text?.toString()
private fun setWordCounter(text: String) { private fun setWordCounter(text: String) {
val words = text.replace("\n", " ").split(" ") val words = text.replace("\n", " ").split(" ")
view.notes_counter.text = words.count { it.isNotEmpty() }.toString() binding.notesCounter.text = words.count { it.isNotEmpty() }.toString()
} }
fun undo() { fun undo() {
val edit = textHistory.getPrevious() ?: return val edit = textHistory.getPrevious() ?: return
val text = view.text_note_view.editableText val text = noteEditText.editableText
val start = edit.start val start = edit.start
val end = start + if (edit.after != null) edit.after.length else 0 val end = start + if (edit.after != null) edit.after.length else 0
@ -275,7 +293,7 @@ class TextFragment : NoteFragment() {
fun redo() { fun redo() {
val edit = textHistory.getNext() ?: return val edit = textHistory.getNext() ?: return
val text = view.text_note_view.editableText val text = noteEditText.editableText
val start = edit.start val start = edit.start
val end = start + if (edit.before != null) edit.before.length else 0 val end = start + if (edit.before != null) edit.before.length else 0
@ -323,4 +341,14 @@ class TextFragment : NoteFragment() {
(activity as MainActivity).currentNoteTextChanged(text, isUndoAvailable(), isRedoAvailable()) (activity as MainActivity).currentNoteTextChanged(text, isUndoAvailable(), isRedoAvailable())
} }
} }
private fun FragmentTextBinding.toCommonBinding(): CommonNoteBinding = this.let {
object : CommonNoteBinding {
override val root: View = it.root
override val noteLockedLayout: View = it.noteLockedLayout
override val noteLockedImage: ImageView = it.noteLockedImage
override val noteLockedLabel: TextView = it.noteLockedLabel
override val noteLockedShow: TextView = it.noteLockedShow
}
}
} }

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

@ -348,7 +348,7 @@
</RelativeLayout> </RelativeLayout>
<include <include
android:id="@+id/settings_general_settings_divider" android:id="@+id/settings_saving_divider"
layout="@layout/divider" /> layout="@layout/divider" />
<TextView <TextView

30
build.gradle
View File

@ -1,30 +0,0 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.7.10'
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}
allprojects {
repositories {
google()
mavenCentral()
maven { url "https://jitpack.io" }
}
}
task clean(type: Delete) {
delete rootProject.buildDir
}

6
build.gradle.kts Normal file
View File

@ -0,0 +1,6 @@
plugins {
alias(libs.plugins.android).apply(false)
alias(libs.plugins.kotlinAndroid).apply(false)
alias(libs.plugins.ksp).apply(false)
alias(libs.plugins.kotlinSerialization).apply(false)
}

1
gradle.properties
View File

@ -1,2 +1,3 @@
android.enableJetifier=true android.enableJetifier=true
android.useAndroidX=true android.useAndroidX=true
android.nonTransitiveRClass=true

47
gradle/libs.versions.toml Normal file
View File

@ -0,0 +1,47 @@
[versions]
#jetbrains
kotlin = "1.9.0"
#KSP
kotlinxSerializationJson = "1.5.1"
ksp = "1.9.0-1.0.12"
#AndroidX
androidx-constraintlayout = "2.1.4"
androidx-documentfile = "1.0.1"
#Room
room = "2.6.0-alpha02"
#Simple tools
simple-commons = "595d11d19d"
#Gradle
gradlePlugins-agp = "8.1.0"
#build
app-build-compileSDKVersion = "34"
app-build-targetSDK = "34"
app-build-minimumSDK = "23"
app-build-javaVersion = "VERSION_17"
app-build-kotlinJVMTarget = "17"
#versioning
app-version-appId = "com.simplemobiletools.notes.pro"
app-version-versionCode = "109"
app-version-versionName = "6.16.1"
[libraries]
#AndroidX
androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraintlayout" }
androidx-documentfile = { module = "androidx.documentfile:documentfile", version.ref = "androidx-documentfile" }
#Room
androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" }
androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" }
androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
#Simple Mobile Tools
simple-tools-commons = { module = "com.github.SimpleMobileTools:Simple-Commons", version.ref = "simple-commons" }
#Kotlin
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
[bundles]
room = [
"androidx-room-ktx",
"androidx-room-runtime",
]
[plugins]
android = { id = "com.android.application", version.ref = "gradlePlugins-agp" }
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip

1
settings.gradle
View File

@ -1 +0,0 @@
include ':app'

16
settings.gradle.kts Normal file
View File

@ -0,0 +1,16 @@
pluginManagement {
repositories {
gradlePluginPortal()
google()
mavenCentral()
}
}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
maven { setUrl("https://jitpack.io") }
}
}
include(":app")