From ee4b8a1eacbdfd3e470a5989cb46726d7e5af389 Mon Sep 17 00:00:00 2001 From: lutsenko-yuriy Date: Mon, 5 Mar 2018 22:26:05 +0300 Subject: [PATCH] Lint fixes --- app-kotlin/src/main/AndroidManifest.xml | 6 +- .../com/gun0912/app_kotlin/MainActivity.kt | 2 +- .../drawable-v24/ic_launcher_foreground.xml | 34 ---- .../res/drawable/ic_launcher_background.xml | 170 ------------------ .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 - .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 - app-kotlin/src/main/res/values/strings.xml | 3 +- .../src/main/res/values-v11/styles.xml | 20 +++ tedpermission/src/main/res/values/styles.xml | 1 - 9 files changed, 28 insertions(+), 218 deletions(-) delete mode 100644 app-kotlin/src/main/res/drawable-v24/ic_launcher_foreground.xml delete mode 100644 app-kotlin/src/main/res/drawable/ic_launcher_background.xml delete mode 100644 app-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml delete mode 100644 app-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 tedpermission/src/main/res/values-v11/styles.xml diff --git a/app-kotlin/src/main/AndroidManifest.xml b/app-kotlin/src/main/AndroidManifest.xml index 5558c1e..da1f413 100644 --- a/app-kotlin/src/main/AndroidManifest.xml +++ b/app-kotlin/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -8,13 +9,16 @@ + + android:theme="@style/AppTheme" + android:fullBackupContent="true" + tools:ignore="GoogleAppIndexingWarning"> diff --git a/app-kotlin/src/main/java/com/gun0912/app_kotlin/MainActivity.kt b/app-kotlin/src/main/java/com/gun0912/app_kotlin/MainActivity.kt index 4f1f34d..42f4227 100644 --- a/app-kotlin/src/main/java/com/gun0912/app_kotlin/MainActivity.kt +++ b/app-kotlin/src/main/java/com/gun0912/app_kotlin/MainActivity.kt @@ -43,7 +43,7 @@ class MainActivity : AppCompatActivity() { } onProceedingToSettings { - closeButtonText("Go to settings") + closeButtonText(R.string.custom_close_text) } } diff --git a/app-kotlin/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app-kotlin/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index c7bd21d..0000000 --- a/app-kotlin/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - diff --git a/app-kotlin/src/main/res/drawable/ic_launcher_background.xml b/app-kotlin/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index d5fccc5..0000000 --- a/app-kotlin/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cf..0000000 --- a/app-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cf..0000000 --- a/app-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app-kotlin/src/main/res/values/strings.xml b/app-kotlin/src/main/res/values/strings.xml index 9c57a20..97ac42a 100644 --- a/app-kotlin/src/main/res/values/strings.xml +++ b/app-kotlin/src/main/res/values/strings.xml @@ -1,4 +1,5 @@ - + TedPermissionDemoKotlinDsl diff --git a/tedpermission/src/main/res/values-v11/styles.xml b/tedpermission/src/main/res/values-v11/styles.xml new file mode 100644 index 0000000..b90ef1f --- /dev/null +++ b/tedpermission/src/main/res/values-v11/styles.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/tedpermission/src/main/res/values/styles.xml b/tedpermission/src/main/res/values/styles.xml index 2160304..34c26d9 100644 --- a/tedpermission/src/main/res/values/styles.xml +++ b/tedpermission/src/main/res/values/styles.xml @@ -10,7 +10,6 @@ true false - false true true false