Skip to content

Commit 11ef37f

Browse files
tibbitibbi
committed
update commons to 4.6.5
1 parent 4d59fc8 commit 11ef37f

File tree

4 files changed

+30
-15
lines changed

4 files changed

+30
-15
lines changed

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ext {
4545
}
4646

4747
dependencies {
48-
implementation 'com.simplemobiletools:commons:4.5.0'
48+
implementation 'com.simplemobiletools:commons:4.6.5'
4949
implementation 'com.facebook.stetho:stetho:1.5.0'
5050

5151
debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion"

‎app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,12 +278,15 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
278278
}
279279

280280
private fun launchAbout() {
281+
val licenses = LICENSE_STETHO or LICENSE_RTL or LICENSE_LEAK_CANARY
282+
281283
val faqItems = arrayListOf(
282284
FAQItem(R.string.faq_1_title_commons, R.string.faq_1_text_commons),
283285
FAQItem(R.string.faq_4_title_commons, R.string.faq_4_text_commons),
284286
FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons)
285287
)
286-
startAboutActivity(R.string.app_name, LICENSE_STETHO or LICENSE_RTL or LICENSE_LEAK_CANARY, BuildConfig.VERSION_NAME, faqItems)
288+
289+
startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true)
287290
}
288291

289292
private fun tryOpenFile() {

‎app/src/main/res/layout/activity_settings.xml‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<ScrollView
33
xmlns:android="http://schemas.android.com/apk/res/android"
4+
xmlns:app="http://schemas.android.com/apk/res-auto"
45
android:id="@+id/settings_scrollview"
56
android:layout_width="match_parent"
67
android:layout_height="wrap_content">
@@ -74,7 +75,8 @@
7475
android:clickable="false"
7576
android:paddingLeft="@dimen/medium_margin"
7677
android:paddingStart="@dimen/medium_margin"
77-
android:text="@string/use_english_language"/>
78+
android:text="@string/use_english_language"
79+
app:switchPadding="@dimen/medium_margin"/>
7880

7981
</RelativeLayout>
8082

@@ -115,7 +117,8 @@
115117
android:clickable="false"
116118
android:paddingLeft="@dimen/medium_margin"
117119
android:paddingStart="@dimen/medium_margin"
118-
android:text="@string/show_word_count"/>
120+
android:text="@string/show_word_count"
121+
app:switchPadding="@dimen/medium_margin"/>
119122

120123
</RelativeLayout>
121124

@@ -138,7 +141,8 @@
138141
android:clickable="false"
139142
android:paddingLeft="@dimen/medium_margin"
140143
android:paddingStart="@dimen/medium_margin"
141-
android:text="@string/links_and_emails_clickable"/>
144+
android:text="@string/links_and_emails_clickable"
145+
app:switchPadding="@dimen/medium_margin"/>
142146

143147
</RelativeLayout>
144148

@@ -161,7 +165,8 @@
161165
android:clickable="false"
162166
android:paddingLeft="@dimen/medium_margin"
163167
android:paddingStart="@dimen/medium_margin"
164-
android:text="@string/monospaced_font"/>
168+
android:text="@string/monospaced_font"
169+
app:switchPadding="@dimen/medium_margin"/>
165170

166171
</RelativeLayout>
167172

@@ -184,7 +189,8 @@
184189
android:clickable="false"
185190
android:paddingLeft="@dimen/medium_margin"
186191
android:paddingStart="@dimen/medium_margin"
187-
android:text="@string/enable_line_wrap"/>
192+
android:text="@string/enable_line_wrap"
193+
app:switchPadding="@dimen/medium_margin"/>
188194

189195
</RelativeLayout>
190196

@@ -295,7 +301,8 @@
295301
android:clickable="false"
296302
android:paddingLeft="@dimen/medium_margin"
297303
android:paddingStart="@dimen/medium_margin"
298-
android:text="@string/avoid_whats_new"/>
304+
android:text="@string/avoid_whats_new"
305+
app:switchPadding="@dimen/medium_margin"/>
299306

300307
</RelativeLayout>
301308

@@ -318,7 +325,8 @@
318325
android:clickable="false"
319326
android:paddingLeft="@dimen/medium_margin"
320327
android:paddingStart="@dimen/medium_margin"
321-
android:text="@string/place_cursor_end"/>
328+
android:text="@string/place_cursor_end"
329+
app:switchPadding="@dimen/medium_margin"/>
322330

323331
</RelativeLayout>
324332

@@ -341,7 +349,8 @@
341349
android:clickable="false"
342350
android:paddingLeft="@dimen/medium_margin"
343351
android:paddingStart="@dimen/medium_margin"
344-
android:text="@string/show_keyboard"/>
352+
android:text="@string/show_keyboard"
353+
app:switchPadding="@dimen/medium_margin"/>
345354

346355
</RelativeLayout>
347356

@@ -364,7 +373,8 @@
364373
android:clickable="false"
365374
android:paddingLeft="@dimen/medium_margin"
366375
android:paddingStart="@dimen/medium_margin"
367-
android:text="@string/show_note_picker"/>
376+
android:text="@string/show_note_picker"
377+
app:switchPadding="@dimen/medium_margin"/>
368378

369379
</RelativeLayout>
370380

@@ -405,7 +415,8 @@
405415
android:clickable="false"
406416
android:paddingLeft="@dimen/medium_margin"
407417
android:paddingStart="@dimen/medium_margin"
408-
android:text="@string/autosave_notes"/>
418+
android:text="@string/autosave_notes"
419+
app:switchPadding="@dimen/medium_margin"/>
409420

410421
</RelativeLayout>
411422

@@ -428,7 +439,8 @@
428439
android:clickable="false"
429440
android:paddingLeft="@dimen/medium_margin"
430441
android:paddingStart="@dimen/medium_margin"
431-
android:text="@string/display_success_message"/>
442+
android:text="@string/display_success_message"
443+
app:switchPadding="@dimen/medium_margin"/>
432444

433445
</RelativeLayout>
434446

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.2.51'
4+
ext.kotlin_version = '1.2.60'
55

66
repositories {
77
jcenter()
88
google()
99
}
1010

1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:3.1.3'
12+
classpath 'com.android.tools.build:gradle:3.1.4'
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1414

1515
// NOTE: Do not place your application dependencies here; they belong

0 commit comments

Comments
 (0)