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

updating Commons to 5.1.4, min required Android OS to 5

Browse Source
This commit is contained in:
tibbi 2018-10-18 17:51:00 +02:00
parent 62e48481c5
commit e264bad268
17 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,7 +1,6 @@
*.iml *.iml
.gradle .gradle
/local.properties /local.properties
/gradle.properties
/.idea/ /.idea/
.DS_Store .DS_Store
/build /build

6
app/build.gradle
View File

@ -4,11 +4,11 @@ apply plugin: 'kotlin-android-extensions'
android { android {
compileSdkVersion 28 compileSdkVersion 28
buildToolsVersion "28.0.2" buildToolsVersion "28.0.3"
defaultConfig { defaultConfig {
applicationId "com.simplemobiletools.notes" applicationId "com.simplemobiletools.notes"
minSdkVersion 16 minSdkVersion 21
targetSdkVersion 28 targetSdkVersion 28
versionCode 51 versionCode 51
versionName "4.3.0" versionName "4.3.0"
@ -41,7 +41,7 @@ android {
} }
dependencies { dependencies {
implementation 'com.simplemobiletools:commons:4.7.5' implementation 'com.simplemobiletools:commons:5.1.4'
implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.facebook.stetho:stetho:1.5.0'
} }

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

@ -3,7 +3,6 @@ package com.simplemobiletools.notes.activities
import android.content.Intent import android.content.Intent
import android.net.Uri import android.net.Uri
import android.os.Bundle import android.os.Bundle
import android.support.v4.view.ViewPager
import android.text.method.ArrowKeyMovementMethod import android.text.method.ArrowKeyMovementMethod
import android.text.method.LinkMovementMethod import android.text.method.LinkMovementMethod
import android.util.TypedValue import android.util.TypedValue
@ -37,7 +36,7 @@ import kotlinx.android.synthetic.main.activity_main.*
import java.io.File import java.io.File
import java.nio.charset.Charset import java.nio.charset.Charset
class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener { class MainActivity : SimpleActivity(), androidx.viewpager.widget.ViewPager.OnPageChangeListener {
private var mAdapter: NotesPagerAdapter? = null private var mAdapter: NotesPagerAdapter? = null
private lateinit var mCurrentNote: Note private lateinit var mCurrentNote: Note
@ -459,8 +458,9 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
handleSAFDialog(path) { handleSAFDialog(path) {
var document = getDocumentFile(path) ?: return@handleSAFDialog var document = getDocumentFile(path) ?: return@handleSAFDialog
if (!getDoesFilePathExist(path)) { if (!getDoesFilePathExist(path)) {
document = document.createFile("", path.getFilenameFromPath()) document = document.createFile("", path.getFilenameFromPath())!!
} }
contentResolver.openOutputStream(document.uri).apply { contentResolver.openOutputStream(document.uri).apply {
write(content.toByteArray(Charset.forName("UTF-8")), 0, content.length) write(content.toByteArray(Charset.forName("UTF-8")), 0, content.length)
flush() flush()

4
app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt
View File

@ -2,15 +2,13 @@ package com.simplemobiletools.notes.adapters
import android.app.Activity import android.app.Activity
import android.os.Bundle import android.os.Bundle
import android.support.v4.app.FragmentManager
import android.support.v4.app.FragmentStatePagerAdapter
import android.view.ViewGroup import android.view.ViewGroup
import com.simplemobiletools.commons.extensions.showErrorToast import com.simplemobiletools.commons.extensions.showErrorToast
import com.simplemobiletools.notes.fragments.NoteFragment import com.simplemobiletools.notes.fragments.NoteFragment
import com.simplemobiletools.notes.helpers.NOTE_ID import com.simplemobiletools.notes.helpers.NOTE_ID
import com.simplemobiletools.notes.models.Note import com.simplemobiletools.notes.models.Note
class NotesPagerAdapter(fm: FragmentManager, val notes: List<Note>, val activity: Activity) : FragmentStatePagerAdapter(fm) { class NotesPagerAdapter(fm: androidx.fragment.app.FragmentManager, val notes: List<Note>, val activity: Activity) : androidx.fragment.app.FragmentStatePagerAdapter(fm) {
private var fragments: HashMap<Int, NoteFragment> = LinkedHashMap() private var fragments: HashMap<Int, NoteFragment> = LinkedHashMap()
override fun getCount() = notes.size override fun getCount() = notes.size

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

@ -1,6 +1,6 @@
package com.simplemobiletools.notes.dialogs package com.simplemobiletools.notes.dialogs
import android.support.v7.app.AlertDialog import androidx.appcompat.app.AlertDialog
import com.simplemobiletools.commons.extensions.beVisible import com.simplemobiletools.commons.extensions.beVisible
import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.setupDialogStuff
import com.simplemobiletools.notes.R import com.simplemobiletools.notes.R
@ -22,7 +22,7 @@ class DeleteNoteDialog(val activity: SimpleActivity, val note: Note, val callbac
} }
AlertDialog.Builder(activity) AlertDialog.Builder(activity)
.setPositiveButton(R.string.ok, { dialog, which -> dialogConfirmed(view.delete_note_checkbox.isChecked) }) .setPositiveButton(R.string.ok) { dialog, which -> dialogConfirmed(view.delete_note_checkbox.isChecked) }
.setNegativeButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, null)
.create().apply { .create().apply {
activity.setupDialogStuff(view, this) activity.setupDialogStuff(view, this)

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

@ -1,6 +1,6 @@
package com.simplemobiletools.notes.dialogs package com.simplemobiletools.notes.dialogs
import android.support.v7.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.notes.R import com.simplemobiletools.notes.R

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

@ -1,6 +1,6 @@
package com.simplemobiletools.notes.dialogs package com.simplemobiletools.notes.dialogs
import android.support.v7.app.AlertDialog import androidx.appcompat.app.AlertDialog
import com.simplemobiletools.commons.dialogs.FilePickerDialog import com.simplemobiletools.commons.dialogs.FilePickerDialog
import com.simplemobiletools.commons.extensions.humanizePath import com.simplemobiletools.commons.extensions.humanizePath
import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.setupDialogStuff

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

@ -1,7 +1,7 @@
package com.simplemobiletools.notes.dialogs package com.simplemobiletools.notes.dialogs
import android.support.v7.app.AlertDialog
import android.view.ViewGroup import android.view.ViewGroup
import androidx.appcompat.app.AlertDialog
import com.simplemobiletools.commons.extensions.getFilenameFromPath import com.simplemobiletools.commons.extensions.getFilenameFromPath
import com.simplemobiletools.commons.extensions.humanizePath import com.simplemobiletools.commons.extensions.humanizePath
import com.simplemobiletools.commons.extensions.isMediaFile import com.simplemobiletools.commons.extensions.isMediaFile

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

@ -2,7 +2,7 @@ package com.simplemobiletools.notes.dialogs
import android.app.Activity import android.app.Activity
import android.content.DialogInterface.BUTTON_POSITIVE import android.content.DialogInterface.BUTTON_POSITIVE
import android.support.v7.app.AlertDialog import androidx.appcompat.app.AlertDialog
import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.setupDialogStuff
import com.simplemobiletools.commons.extensions.showKeyboard import com.simplemobiletools.commons.extensions.showKeyboard
import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.extensions.toast

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

@ -1,7 +1,7 @@
package com.simplemobiletools.notes.dialogs package com.simplemobiletools.notes.dialogs
import android.support.v7.app.AlertDialog
import android.view.ViewGroup import android.view.ViewGroup
import androidx.appcompat.app.AlertDialog
import com.simplemobiletools.commons.extensions.getFilenameFromPath import com.simplemobiletools.commons.extensions.getFilenameFromPath
import com.simplemobiletools.commons.extensions.humanizePath import com.simplemobiletools.commons.extensions.humanizePath
import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.setupDialogStuff

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

@ -1,9 +1,9 @@
package com.simplemobiletools.notes.dialogs package com.simplemobiletools.notes.dialogs
import android.app.Activity import android.app.Activity
import android.support.v7.app.AlertDialog
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.RadioGroup import android.widget.RadioGroup
import androidx.appcompat.app.AlertDialog
import com.simplemobiletools.commons.extensions.applyColorFilter import com.simplemobiletools.commons.extensions.applyColorFilter
import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.extensions.beVisibleIf
import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.setupDialogStuff

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

@ -1,7 +1,7 @@
package com.simplemobiletools.notes.dialogs package com.simplemobiletools.notes.dialogs
import android.content.DialogInterface.BUTTON_POSITIVE import android.content.DialogInterface.BUTTON_POSITIVE
import android.support.v7.app.AlertDialog import androidx.appcompat.app.AlertDialog
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.notes.R import com.simplemobiletools.notes.R
import com.simplemobiletools.notes.activities.SimpleActivity import com.simplemobiletools.notes.activities.SimpleActivity

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

@ -3,7 +3,7 @@ package com.simplemobiletools.notes.fragments
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.graphics.Typeface import android.graphics.Typeface
import android.os.Bundle import android.os.Bundle
import android.support.v4.app.Fragment import androidx.fragment.app.Fragment
import android.text.Editable import android.text.Editable
import android.text.Selection import android.text.Selection
import android.text.TextWatcher import android.text.TextWatcher
@ -33,7 +33,7 @@ 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
class NoteFragment : Fragment() { class NoteFragment : androidx.fragment.app.Fragment() {
private val TEXT = "text" private val TEXT = "text"
private var textHistory = TextHistory() private var textHistory = TextHistory()

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

@ -5,7 +5,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<android.support.v4.view.PagerTitleStrip <androidx.viewpager.widget.PagerTitleStrip
android:id="@+id/pager_title_strip" android:id="@+id/pager_title_strip"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

8
build.gradle
View File

@ -1,15 +1,15 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlin_version = '1.2.70' ext.kotlin_version = '1.2.71'
repositories { repositories {
jcenter()
google() google()
jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.1.4' classpath 'com.android.tools.build:gradle:3.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
@ -19,8 +19,8 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
jcenter()
google() google()
jcenter()
maven { url "https://jitpack.io" } maven { url "https://jitpack.io" }
} }
} }

2
gradle.properties Normal file
View File

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

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

@ -1,6 +1,6 @@
#Fri Nov 10 15:12:09 CET 2017 #Thu Oct 18 14:57:45 CEST 2018
distributionBase=GRADLE_USER_HOME 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-4.4.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip