From 3a194e14e490e970c05ebb927ae796dd7cd3daeb Mon Sep 17 00:00:00 2001 From: Billy Brawner Date: Mon, 29 Apr 2019 19:57:55 -0700 Subject: [PATCH] Update dependencies and clean up more files --- app/build.gradle | 15 ++++++--------- app/src/main/assets/Privacy Policy.md | 16 ++++++++-------- app/src/main/res/layout/fragment_edit.xml | 1 + app/src/main/res/xml/pref_general.xml | 10 +++++----- app/src/samsung/AndroidManifest.xml | 6 ------ 5 files changed, 20 insertions(+), 28 deletions(-) delete mode 100644 app/src/samsung/AndroidManifest.xml diff --git a/app/build.gradle b/app/build.gradle index 1bee29a..ee9cc27 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,8 +27,8 @@ android { minSdkVersion 19 targetSdkVersion 28 multiDexEnabled true - versionCode 17 - versionName "0.6.0-beta2" + versionCode 18 + versionName "0.6.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } signingConfigs { @@ -47,9 +47,6 @@ android { } } flavorDimensions "platform" - productFlavors { - standard {} - } dexOptions { jumboMode true } @@ -66,7 +63,7 @@ ext { } dependencies { - annotationProcessor 'com.google.dagger:dagger-compiler:2.16' + annotationProcessor 'com.google.dagger:dagger-compiler:2.21' annotationProcessor 'com.jakewharton:butterknife-compiler:8.7.0' testImplementation 'junit:junit:4.12' testImplementation 'org.robolectric:robolectric:4.2' @@ -83,12 +80,12 @@ dependencies { implementation "com.android.support:design:$support_version" implementation "com.android.support:support-v13:$support_version" implementation 'com.commonsware.cwac:anddown:0.3.0' - implementation 'com.google.dagger:dagger:2.16' + implementation 'com.google.dagger:dagger:2.21' implementation 'com.jakewharton:butterknife:8.8.1' implementation 'com.jakewharton.rxbinding2:rxbinding:2.0.0' implementation 'com.jakewharton.rxbinding2:rxbinding-design:2.0.0' - implementation 'io.reactivex.rxjava2:rxandroid:2.1.0' - implementation 'io.reactivex.rxjava2:rxjava:2.2.6' + implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' + implementation 'io.reactivex.rxjava2:rxjava:2.2.7' implementation 'com.google.firebase:firebase-core:16.0.8' implementation 'com.android.billingclient:billing:1.2' implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9' diff --git a/app/src/main/assets/Privacy Policy.md b/app/src/main/assets/Privacy Policy.md index 49ce062..a542f31 100644 --- a/app/src/main/assets/Privacy Policy.md +++ b/app/src/main/assets/Privacy Policy.md @@ -3,11 +3,11 @@ First and foremost, Simple Markdown DOES NOT collect any personally identifiable information. The internet access permission is requested primarily for retrieving images from the internet in case you embed them in your markdown, but it also allows me to send automated error and crash - reports to myself whenever the app runs into an issue. These error reports are powered by - [Firebase Crashlytics] (https://firebase.google.com/docs/crashlytics/), which is a free error - reporting solution provided by Google. These error reports are used exclusively for fixing - problems that occur while you're using the app, along with some analytics info like how long you - use the app for, how often, and which features of the app you use. This helps me to determine - how to spend my very limited time on building out new features. I'll have to defer to [Google's - Privacy Policy](https://policies.google.com/privacy) to explain how they handle the data. As - for me, I don't knowingly or willingly sell or trade your data. + reports to myself whenever the app runs into an issue. These error reports are opt-out, and are + powered by [Firebase Crashlytics] (https://firebase.google.com/docs/crashlytics/), which is a + free error reporting solution provided by Google. These error reports are used exclusively for + fixing problems that occur while you're using the app, along with some analytics info like how + long you use the app for, how often, and which features of the app you use. This helps me to + determine how to spend my very limited time on building out new features. I'll have to defer to + [Google's Privacy Policy](https://policies.google.com/privacy) to explain how they handle the + data. As for me, I don't knowingly or willingly sell or trade your data. diff --git a/app/src/main/res/layout/fragment_edit.xml b/app/src/main/res/layout/fragment_edit.xml index 8cab01f..a6b1468 100644 --- a/app/src/main/res/layout/fragment_edit.xml +++ b/app/src/main/res/layout/fragment_edit.xml @@ -11,6 +11,7 @@ android:layout_height="wrap_content" android:background="@null" android:gravity="top" + android:fontFamily="monospace" android:hint="@string/markdown_here" android:imeOptions="flagNoExtractUi" android:inputType="textMultiLine|textCapSentences" diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml index f381a78..b02fb14 100644 --- a/app/src/main/res/xml/pref_general.xml +++ b/app/src/main/res/xml/pref_general.xml @@ -21,10 +21,10 @@ android:summaryOff="@string/pref_error_reports_off" android:summaryOn="@string/pref_error_reports_on" android:title="@string/pref_title_error_reports" /> - + + + + + diff --git a/app/src/samsung/AndroidManifest.xml b/app/src/samsung/AndroidManifest.xml deleted file mode 100644 index 8d2f382..0000000 --- a/app/src/samsung/AndroidManifest.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file