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

update commons to 4.6.5

Browse Source
This commit is contained in:
tibbi
2018-08-10 20:23:00 +02:00
parent 4d59fc8363
commit 11ef37fe54
4 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -45,7 +45,7 @@ ext {
}
dependencies {
implementation 'com.simplemobiletools:commons:4.5.0'
implementation 'com.simplemobiletools:commons:4.6.5'
implementation 'com.facebook.stetho:stetho:1.5.0'
debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion"

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

@@ -278,12 +278,15 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
}
private fun launchAbout() {
val licenses = LICENSE_STETHO or LICENSE_RTL or LICENSE_LEAK_CANARY
val faqItems = arrayListOf(
FAQItem(R.string.faq_1_title_commons, R.string.faq_1_text_commons),
FAQItem(R.string.faq_4_title_commons, R.string.faq_4_text_commons),
FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons)
)
startAboutActivity(R.string.app_name, LICENSE_STETHO or LICENSE_RTL or LICENSE_LEAK_CANARY, BuildConfig.VERSION_NAME, faqItems)
startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true)
}
private fun tryOpenFile() {

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

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/settings_scrollview"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -74,7 +75,8 @@
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
android:text="@string/use_english_language"/>
android:text="@string/use_english_language"
app:switchPadding="@dimen/medium_margin"/>
</RelativeLayout>
@@ -115,7 +117,8 @@
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
android:text="@string/show_word_count"/>
android:text="@string/show_word_count"
app:switchPadding="@dimen/medium_margin"/>
</RelativeLayout>
@@ -138,7 +141,8 @@
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
android:text="@string/links_and_emails_clickable"/>
android:text="@string/links_and_emails_clickable"
app:switchPadding="@dimen/medium_margin"/>
</RelativeLayout>
@@ -161,7 +165,8 @@
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
android:text="@string/monospaced_font"/>
android:text="@string/monospaced_font"
app:switchPadding="@dimen/medium_margin"/>
</RelativeLayout>
@@ -184,7 +189,8 @@
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
android:text="@string/enable_line_wrap"/>
android:text="@string/enable_line_wrap"
app:switchPadding="@dimen/medium_margin"/>
</RelativeLayout>
@@ -295,7 +301,8 @@
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
android:text="@string/avoid_whats_new"/>
android:text="@string/avoid_whats_new"
app:switchPadding="@dimen/medium_margin"/>
</RelativeLayout>
@@ -318,7 +325,8 @@
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
android:text="@string/place_cursor_end"/>
android:text="@string/place_cursor_end"
app:switchPadding="@dimen/medium_margin"/>
</RelativeLayout>
@@ -341,7 +349,8 @@
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
android:text="@string/show_keyboard"/>
android:text="@string/show_keyboard"
app:switchPadding="@dimen/medium_margin"/>
</RelativeLayout>
@@ -364,7 +373,8 @@
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
android:text="@string/show_note_picker"/>
android:text="@string/show_note_picker"
app:switchPadding="@dimen/medium_margin"/>
</RelativeLayout>
@@ -405,7 +415,8 @@
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
android:text="@string/autosave_notes"/>
android:text="@string/autosave_notes"
app:switchPadding="@dimen/medium_margin"/>
</RelativeLayout>
@@ -428,7 +439,8 @@
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
android:text="@string/display_success_message"/>
android:text="@string/display_success_message"
app:switchPadding="@dimen/medium_margin"/>
</RelativeLayout>

4
build.gradle
View File

@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.2.51'
ext.kotlin_version = '1.2.60'
repositories {
jcenter()
@@ -9,7 +9,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.android.tools.build:gradle:3.1.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong