diff --git a/.travis.yml b/.travis.yml index 1c121252b..59a245ad2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,27 +1,32 @@ language: android + jdk: +- openjdk8 - oraclejdk8 + android: components: - tools - - build-tools-27.0.3 - - android-27 + - build-tools-28.0.0 + - android-28 - extra-google-m2repository - extra-android-m2repository licenses: - ".+" + script: - "./gradlew clean assembleDebug" + notifications: email: false - slack: - rooms: - secure: nzWsLhpkL9Fyw8X4SqdemmeIfG3v56ljoUSKNEffgHZPes0StVRa5oO3f8KseJeuI1CmbzzI2cek8H+7PU7kWTZ4CN7uFrcEOyJyju2co8/aK4vF+Q5/k0Q9J+11l345VTpz1diIlxj8cFoiP50S3gjMTFGuxEmRC6JqNQGwQ7G3NMcPts2bErFdsXsPfP6zzMbhlvMZUdiDDxG2OrW0mJFudIpZJNFxmyiMQLXUlBqjaF6T01VSgCGkx5J+EOnc07J1RGpdwSzGscT4cPuS2EvWpSMObOdVFCL4K96qk2ajYTq5IDr5bbdvWB7niZcbg9WUOu+voHKKxJzJc1mX4y33l+yQLbvL6kvE1gn/NxtRMOaOsu6YTb/Q1D708ZqlqJk20BNoZe3l9LVOIWk3jktXOTcRhyHkGYfqwuYki7zcHHbKAStdhSzC+SU/r8XDLaz4HCviIRupXHUVI9Bp7qr2VmbE/L5TuRdJQ7pRTDMxJQ+nP37vCcoQTwDOojhfjzmTaxUua3w80ZtT4BapmsYDt7WSGtmKMKCxIwN1luWoLVAKLzSN6I5mpwufqOS2rxdOfb0oguZll5W3xIZSKBX5BL9KBFchpPPh7s+7lBTfyVHmpjjOXJ4Jy+tWqd8YEoDbPQrP696684yy1grM6NhmfMVxO+iPMwrHbD7QUXI= + sudo: false + cache: directories: - "$HOME/.m2" - "$HOME/.gradle" - "$ANDROID_HOME" + before_install: - - yes | sdkmanager "platforms;android-27" \ No newline at end of file + - yes | sdkmanager "platforms;android-28" \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index bde6c615a..861457502 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,22 +1,12 @@ /* - * Copyright (c) 2016-2017 Projekt Substratum + * Copyright (c) 2016-2018 Projekt Substratum * This file is part of Substratum. * - * Substratum is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Substratum is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Substratum. If not, see . + * SPDX-License-Identifier: GPL-3.0-Or-Later */ apply plugin: 'com.android.application' +apply plugin: 'io.fabric' final def gitHash = { -> final def stdout = new ByteArrayOutputStream() @@ -34,8 +24,11 @@ final def keystorePropertiesFile = rootProject.file("keystore.properties") android { compileSdkVersion 28 lintOptions { - checkReleaseBuilds false abortOnError false + checkAllWarnings false + checkReleaseBuilds false + ignoreWarnings true + quiet true } dataBinding.enabled true android.applicationVariants.all { final variant -> @@ -47,10 +40,11 @@ android { applicationId "projekt.substratum" minSdkVersion 24 targetSdkVersion 28 - versionCode 997 - versionName "nine hundred ninety seven" + versionCode 1001 + versionName "one thousand one" buildConfigField "java.util.Date", "buildTime", "new java.util.Date(" + System.currentTimeMillis() + "L)" buildConfigField "String", "GIT_HASH", "\"${gitHash()}\"" + buildConfigField "boolean", "ENHANCED_LOGGING", "false" } // If the keystore file exists @@ -99,29 +93,34 @@ android { } ext { - supportLibsVersion = '27.1.1' + databindingVersion = '3.3.0-alpha05' + androidXVersion = '1.0.0-rc01' firebaseVersion = '16.0.1' + crashlyticsVersion = '2.9.4' glideVersion = '4.7.1' } + dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - testImplementation 'junit:junit:4.12' // Android Support Libraries - implementation "com.android.support:appcompat-v7:$supportLibsVersion" - implementation "com.android.support:exifinterface:$supportLibsVersion" - implementation "com.android.support:cardview-v7:$supportLibsVersion" - implementation "com.android.support:recyclerview-v7:$supportLibsVersion" - implementation "com.android.support:support-v13:$supportLibsVersion" - implementation "com.android.support:design:$supportLibsVersion" - implementation "com.android.support:palette-v7:$supportLibsVersion" - implementation "com.android.support:preference-v14:$supportLibsVersion" + implementation "androidx.databinding:databinding-runtime:$databindingVersion" + implementation "androidx.appcompat:appcompat:$androidXVersion" + implementation "androidx.exifinterface:exifinterface:$androidXVersion" + implementation "androidx.cardview:cardview:$androidXVersion" + implementation "androidx.recyclerview:recyclerview:$androidXVersion" + implementation "androidx.legacy:legacy-support-v13:$androidXVersion" + implementation "com.google.android.material:material:$androidXVersion" + implementation "androidx.palette:palette:$androidXVersion" + implementation "androidx.legacy:legacy-preference-v14:$androidXVersion" // Firebase implementation "com.google.firebase:firebase-core:$firebaseVersion" - implementation "com.google.firebase:firebase-crash:$firebaseVersion" implementation "com.google.firebase:firebase-database:$firebaseVersion" + // Crashlytics + implementation "com.crashlytics.sdk.android:crashlytics:$crashlyticsVersion" + // Image Downloading and Caching implementation "com.github.bumptech.glide:glide:$glideVersion" annotationProcessor "com.github.bumptech.glide:compiler:$glideVersion" @@ -131,7 +130,7 @@ dependencies { implementation 'commons-io:commons-io:2.5' // APK Signer - implementation 'com.android.tools.build:apksig:3.1.3' + implementation 'com.android.tools.build:apksig:3.1.4' // App Intro implementation 'com.stephentuso:welcome:1.4.1' diff --git a/app/libs/libsubstratum.jar b/app/libs/libsubstratum.jar index 66746983c..5a8aec8da 100644 Binary files a/app/libs/libsubstratum.jar and b/app/libs/libsubstratum.jar differ diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index d621ae4e9..9749a55bb 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -19,7 +19,7 @@ -keep class com.stephentuso.welcome.** { *; } # About libraries --keep class .R +-keep class **.R -keep class **.R$* { ; } @@ -44,6 +44,10 @@ -dontwarn org.slf4j.impl.** -dontwarn junit.textui.TestRunner +# Crashlytics +-keep public class com.crashlytics.android.Crashlytics { *; } +-keep public class io.fabric.sdk.android.Fabric { *; } + # Android support libraries -keep public class android.support.v7.widget.** { *; } -keep public class android.support.v7.internal.widget.** { *; } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 80c9aa12a..2aa824e81 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,20 +1,9 @@ + + + + @@ -243,7 +236,7 @@ diff --git a/app/src/main/assets/fonts.xml b/app/src/main/assets/fonts.xml index 192af58e7..69a791671 100644 --- a/app/src/main/assets/fonts.xml +++ b/app/src/main/assets/fonts.xml @@ -1,4 +1,11 @@ + + + + diff --git a/app/src/main/res/drawable/about_substratum_contributors.xml b/app/src/main/res/drawable/about_substratum_contributors.xml index aba6a085a..3ee36ecbb 100644 --- a/app/src/main/res/drawable/about_substratum_contributors.xml +++ b/app/src/main/res/drawable/about_substratum_contributors.xml @@ -1,19 +1,8 @@ . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> + + . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> diff --git a/app/src/main/res/drawable/floating_trash_base.xml b/app/src/main/res/drawable/floating_trash_base.xml index da3708bdd..807480eb6 100644 --- a/app/src/main/res/drawable/floating_trash_base.xml +++ b/app/src/main/res/drawable/floating_trash_base.xml @@ -1,19 +1,8 @@ . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> + + + + + . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> diff --git a/app/src/main/res/drawable/nav_drawer_settings.xml b/app/src/main/res/drawable/nav_drawer_settings.xml index a86b4b62d..5ea9d312c 100644 --- a/app/src/main/res/drawable/nav_drawer_settings.xml +++ b/app/src/main/res/drawable/nav_drawer_settings.xml @@ -1,19 +1,8 @@ . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> + . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> + diff --git a/app/src/main/res/drawable/showcase_card_gradient.xml b/app/src/main/res/drawable/showcase_card_gradient.xml index ffbb22048..0202bf366 100644 --- a/app/src/main/res/drawable/showcase_card_gradient.xml +++ b/app/src/main/res/drawable/showcase_card_gradient.xml @@ -1,19 +1,8 @@ + + diff --git a/app/src/main/res/drawable/showcase_info.xml b/app/src/main/res/drawable/showcase_info.xml index b2ca79c9a..a8224409b 100644 --- a/app/src/main/res/drawable/showcase_info.xml +++ b/app/src/main/res/drawable/showcase_info.xml @@ -1,19 +1,8 @@ . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> + app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> + app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> diff --git a/app/src/main/res/layout/crash_dialog.xml b/app/src/main/res/layout/crash_dialog.xml index 4466372d7..b697eb38c 100644 --- a/app/src/main/res/layout/crash_dialog.xml +++ b/app/src/main/res/layout/crash_dialog.xml @@ -1,19 +1,8 @@ . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> - . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> @@ -23,12 +12,12 @@ android:layout_height="match_parent" android:fitsSystemWindows="true"> - - - - - - + - - + - + - - @@ -188,8 +177,8 @@ android:text="@string/fab_menu_enable_disable" /> - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/information_activity_changelog_sheet_dialog.xml b/app/src/main/res/layout/information_activity_changelog_sheet_dialog.xml index 9c3d589df..0774307e9 100644 --- a/app/src/main/res/layout/information_activity_changelog_sheet_dialog.xml +++ b/app/src/main/res/layout/information_activity_changelog_sheet_dialog.xml @@ -1,19 +1,8 @@ + app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> - - + - - + - . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> - - - + - - + - - + - - + . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> - @@ -114,7 +103,7 @@ android:textSize="16sp" /> - - - + @@ -165,7 +154,7 @@ android:gravity="end|bottom" android:orientation="vertical"> - @@ -199,8 +188,8 @@ android:drawableStart="@drawable/fab_menu_enable" android:text="@string/fab_menu_enable" /> - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/manager_item.xml b/app/src/main/res/layout/manager_item.xml index 78b05abd3..216881e7b 100644 --- a/app/src/main/res/layout/manager_item.xml +++ b/app/src/main/res/layout/manager_item.xml @@ -1,19 +1,8 @@ - - + \ No newline at end of file diff --git a/app/src/main/res/layout/priority_item.xml b/app/src/main/res/layout/priority_item.xml index 16abbdf2c..63b09b29e 100644 --- a/app/src/main/res/layout/priority_item.xml +++ b/app/src/main/res/layout/priority_item.xml @@ -1,19 +1,8 @@ . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/priority_loader_fragment.xml b/app/src/main/res/layout/priority_loader_fragment.xml index e33b7c881..54b61ee74 100644 --- a/app/src/main/res/layout/priority_loader_fragment.xml +++ b/app/src/main/res/layout/priority_loader_fragment.xml @@ -1,19 +1,8 @@ @@ -27,7 +16,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/priority_overlay_item.xml b/app/src/main/res/layout/priority_overlay_item.xml index 29f2e9aaa..d1c53135c 100644 --- a/app/src/main/res/layout/priority_overlay_item.xml +++ b/app/src/main/res/layout/priority_overlay_item.xml @@ -1,22 +1,11 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/profile_fragment.xml b/app/src/main/res/layout/profile_fragment.xml index 3bb99593a..4c0743b2a 100644 --- a/app/src/main/res/layout/profile_fragment.xml +++ b/app/src/main/res/layout/profile_fragment.xml @@ -1,19 +1,8 @@ @@ -40,7 +29,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - + - - + - - + diff --git a/app/src/main/res/layout/restore_sheet_dialog.xml b/app/src/main/res/layout/restore_sheet_dialog.xml index a3c1f4f6d..409ac9ea3 100644 --- a/app/src/main/res/layout/restore_sheet_dialog.xml +++ b/app/src/main/res/layout/restore_sheet_dialog.xml @@ -1,19 +1,8 @@ + app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"> - - @@ -79,7 +68,7 @@ - - + diff --git a/app/src/main/res/layout/showcase_info.xml b/app/src/main/res/layout/showcase_info.xml index 109899b4e..433d68075 100644 --- a/app/src/main/res/layout/showcase_info.xml +++ b/app/src/main/res/layout/showcase_info.xml @@ -1,19 +1,8 @@ . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> - - + \ No newline at end of file diff --git a/app/src/main/res/layout/showcase_tab.xml b/app/src/main/res/layout/showcase_tab.xml index e2dc00eef..59bc33925 100644 --- a/app/src/main/res/layout/showcase_tab.xml +++ b/app/src/main/res/layout/showcase_tab.xml @@ -1,24 +1,13 @@ - @@ -33,7 +22,7 @@ android:indeterminate="true" android:paddingTop="50dp" /> - - + \ No newline at end of file diff --git a/app/src/main/res/layout/splashscreen_activity.xml b/app/src/main/res/layout/splashscreen_activity.xml index 8a6439462..f9287d23d 100644 --- a/app/src/main/res/layout/splashscreen_activity.xml +++ b/app/src/main/res/layout/splashscreen_activity.xml @@ -1,19 +1,8 @@ diff --git a/app/src/main/res/layout/tab_bootanimations.xml b/app/src/main/res/layout/tab_bootanimations.xml index 822f3cc84..c060e8595 100644 --- a/app/src/main/res/layout/tab_bootanimations.xml +++ b/app/src/main/res/layout/tab_bootanimations.xml @@ -1,24 +1,13 @@ - - + \ No newline at end of file diff --git a/app/src/main/res/layout/tab_fonts.xml b/app/src/main/res/layout/tab_fonts.xml index 42bd8b5c9..87f80800a 100644 --- a/app/src/main/res/layout/tab_fonts.xml +++ b/app/src/main/res/layout/tab_fonts.xml @@ -1,24 +1,13 @@ - - + \ No newline at end of file diff --git a/app/src/main/res/layout/tab_overlays.xml b/app/src/main/res/layout/tab_overlays.xml index 12af2517b..129466963 100644 --- a/app/src/main/res/layout/tab_overlays.xml +++ b/app/src/main/res/layout/tab_overlays.xml @@ -1,24 +1,13 @@ - - - - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/tab_overlays_attention_sheet_dialog.xml b/app/src/main/res/layout/tab_overlays_attention_sheet_dialog.xml index 07072ea1d..c3393075d 100644 --- a/app/src/main/res/layout/tab_overlays_attention_sheet_dialog.xml +++ b/app/src/main/res/layout/tab_overlays_attention_sheet_dialog.xml @@ -1,19 +1,8 @@ + app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> + app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"> . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> - - + \ No newline at end of file diff --git a/app/src/main/res/layout/tab_overlays_preview_item.xml b/app/src/main/res/layout/tab_overlays_preview_item.xml index ea5b3ba09..0b148b994 100644 --- a/app/src/main/res/layout/tab_overlays_preview_item.xml +++ b/app/src/main/res/layout/tab_overlays_preview_item.xml @@ -1,19 +1,8 @@ diff --git a/app/src/main/res/layout/tab_sounds.xml b/app/src/main/res/layout/tab_sounds.xml index 7f3b408bd..55091428b 100644 --- a/app/src/main/res/layout/tab_sounds.xml +++ b/app/src/main/res/layout/tab_sounds.xml @@ -1,24 +1,13 @@ - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/tab_sounds_item.xml b/app/src/main/res/layout/tab_sounds_item.xml index d8545ba00..b0b21d72b 100644 --- a/app/src/main/res/layout/tab_sounds_item.xml +++ b/app/src/main/res/layout/tab_sounds_item.xml @@ -1,19 +1,8 @@ diff --git a/app/src/main/res/layout/tab_wallpaper_dialog.xml b/app/src/main/res/layout/tab_wallpaper_dialog.xml index 4dbd81b43..00800f0cb 100644 --- a/app/src/main/res/layout/tab_wallpaper_dialog.xml +++ b/app/src/main/res/layout/tab_wallpaper_dialog.xml @@ -1,19 +1,8 @@ . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> - - + \ No newline at end of file diff --git a/app/src/main/res/layout/tab_wallpapers.xml b/app/src/main/res/layout/tab_wallpapers.xml index 131bf9961..66513eea9 100644 --- a/app/src/main/res/layout/tab_wallpapers.xml +++ b/app/src/main/res/layout/tab_wallpapers.xml @@ -1,25 +1,14 @@ - - - - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/team_dialog.xml b/app/src/main/res/layout/team_dialog.xml index 63aa539c8..749495a47 100644 --- a/app/src/main/res/layout/team_dialog.xml +++ b/app/src/main/res/layout/team_dialog.xml @@ -1,19 +1,8 @@ - - + - - + @@ -165,7 +154,7 @@ android:layout_marginTop="10dp" android:baselineAligned="false"> - - + - - + @@ -279,7 +268,7 @@ android:layout_marginTop="10dp" android:baselineAligned="false"> - - + - - + @@ -393,7 +382,7 @@ android:layout_marginTop="10dp" android:baselineAligned="false"> - - + - - + \ No newline at end of file diff --git a/app/src/main/res/layout/theme_entry_card.xml b/app/src/main/res/layout/theme_entry_card.xml index dcae10a4d..cbf2df4c3 100644 --- a/app/src/main/res/layout/theme_entry_card.xml +++ b/app/src/main/res/layout/theme_entry_card.xml @@ -1,19 +1,8 @@ - - + \ No newline at end of file diff --git a/app/src/main/res/layout/theme_entry_long_press_sheet_dialog.xml b/app/src/main/res/layout/theme_entry_long_press_sheet_dialog.xml index 40113c6a5..bd5eb94e2 100644 --- a/app/src/main/res/layout/theme_entry_long_press_sheet_dialog.xml +++ b/app/src/main/res/layout/theme_entry_long_press_sheet_dialog.xml @@ -1,19 +1,8 @@ @@ -23,7 +12,7 @@ android:layout_height="wrap_content" android:background="@color/bottom_sheet_dialog_background" android:orientation="vertical" - app:layout_behavior="android.support.design.widget.BottomSheetBehavior"> + app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"> + android:id="@+id/icons" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:layout_marginEnd="5dp" + android:layout_marginBottom="3dp" + android:clickable="false" /> diff --git a/app/src/main/res/layout/theme_fragment.xml b/app/src/main/res/layout/theme_fragment.xml index 3af6915ef..5b8fd861a 100644 --- a/app/src/main/res/layout/theme_fragment.xml +++ b/app/src/main/res/layout/theme_fragment.xml @@ -1,19 +1,8 @@ @@ -23,7 +12,7 @@ android:layout_height="match_parent" tools:context="MainActivity"> - @@ -80,7 +69,7 @@ - - + \ No newline at end of file diff --git a/app/src/main/res/layout/validator_dialog.xml b/app/src/main/res/layout/validator_dialog.xml index 47a6e4233..5d4f40d02 100644 --- a/app/src/main/res/layout/validator_dialog.xml +++ b/app/src/main/res/layout/validator_dialog.xml @@ -1,19 +1,8 @@ . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> - - + \ No newline at end of file diff --git a/app/src/main/res/layout/validator_dialog_inner.xml b/app/src/main/res/layout/validator_dialog_inner.xml index aa7e9137a..faec58b64 100644 --- a/app/src/main/res/layout/validator_dialog_inner.xml +++ b/app/src/main/res/layout/validator_dialog_inner.xml @@ -1,26 +1,15 @@ - - + - - - + \ No newline at end of file diff --git a/app/src/main/res/menu/bottombar_tabs.xml b/app/src/main/res/menu/bottombar_tabs.xml index 45d1fa056..b4e9457fc 100644 --- a/app/src/main/res/menu/bottombar_tabs.xml +++ b/app/src/main/res/menu/bottombar_tabs.xml @@ -1,4 +1,11 @@ + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/main_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/main_launcher_round.xml index de3c7f106..79516356b 100644 --- a/app/src/main/res/mipmap-anydpi-v26/main_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/main_launcher_round.xml @@ -1,4 +1,11 @@ + + diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index cc9332b86..a385c93ba 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -1,22 +1,11 @@ - - - + + каталог Версія Android: diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index de36d180a..bdd164a8c 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1,22 +1,11 @@ - - - + + каталог Версия на Android: diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 134e54905..26e5944f8 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1,22 +1,11 @@ - - - + + ukázka Verze systému Android: diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 6725ade17..e3a58edde 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,22 +1,11 @@ - - - + + showcase Android-Version: diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 3522f087c..5d04b7eb6 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -1,22 +1,11 @@ - - - + + Mostrador Versión de Android: diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 3522f087c..5d04b7eb6 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,22 +1,11 @@ - - - + + Mostrador Versión de Android: diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index d43145b57..7269edcd9 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1,22 +1,11 @@ - - - + + näyteikkuna Android-versio: diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index fc7c8e8f0..90161069f 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,22 +1,11 @@ - - - + + Version Android : Modèle : diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index b0c4682cd..5a0ab1b26 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1,22 +1,11 @@ - - - + + bemutatóterem Android verzió: diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index e115d123c..39e101a68 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -1,22 +1,11 @@ - - - + + pamerkan Versi android: diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index e115d123c..39e101a68 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1,22 +1,11 @@ - - - + + pamerkan Versi android: diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 9ced68cae..169e07d75 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1,22 +1,11 @@ - - - + + vetrina Versione Android: diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index dc77ef7e2..63874b8f1 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1,22 +1,11 @@ - - - + + ショーケース Androidバージョン: diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 7ad5abe17..d782f574d 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1,22 +1,11 @@ - - - + + 쇼케이스 Android 버전: diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml index 33e09138c..096971cce 100644 --- a/app/src/main/res/values-land/dimens.xml +++ b/app/src/main/res/values-land/dimens.xml @@ -2,18 +2,7 @@ ~ Copyright (c) 2016-2018 Projekt Substratum ~ This file is part of Substratum. ~ - ~ Substratum is free software: you can redistribute it and/or modify - ~ it under the terms of the GNU General Public License as published by - ~ the Free Software Foundation, either version 3 of the License, or - ~ (at your option) any later version. - ~ - ~ Substratum is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - ~ GNU General Public License for more details. - ~ - ~ You should have received a copy of the GNU General Public License - ~ along with Substratum. If not, see . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 8eb8b69a2..68569feb9 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -1,22 +1,11 @@ - - - + + vitrina \"Android\" versija: diff --git a/app/src/main/res/values-night/bools.xml b/app/src/main/res/values-night/bools.xml index 80a5eb6f6..108c20fff 100644 --- a/app/src/main/res/values-night/bools.xml +++ b/app/src/main/res/values-night/bools.xml @@ -1,19 +1,8 @@ diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index a06e22b65..048c99ade 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -1,19 +1,8 @@ diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index cf7569773..443a7f524 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1,22 +1,11 @@ - - - + + showcase Android versie: diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 374ce23eb..0c4f5a3aa 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1,22 +1,11 @@ - - - + + prezentacje Wersja systemu Android: diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 2e730a211..f334d90ca 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1,22 +1,11 @@ - - - + + mostruário Versão do Android: diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index ca5bf1a5a..2d8e9e828 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1,22 +1,11 @@ - - - + + expositor Versão Android: diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 3c46ba987..de551da5e 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1,22 +1,11 @@ - - - + + каталог Версия Android: diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index a03036251..84b6d150f 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -1,22 +1,11 @@ - - - + + Ukážka Verzia Androidu: diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 7e27bbc17..31dabe2e5 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1,22 +1,11 @@ - - - + + vitrin Android sürümü: diff --git a/app/src/main/res/values-v27/colors.xml b/app/src/main/res/values-v27/colors.xml index fb3990edd..8290a2525 100644 --- a/app/src/main/res/values-v27/colors.xml +++ b/app/src/main/res/values-v27/colors.xml @@ -1,4 +1,11 @@ + + @color/colorPrimary #ffe0e0e0 diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml index b82c85f60..9e5259df2 100644 --- a/app/src/main/res/values-v27/styles.xml +++ b/app/src/main/res/values-v27/styles.xml @@ -1,19 +1,8 @@ diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 1504bef5e..b4efaa3a5 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1,22 +1,11 @@ - - - + + giới thiệu Phiên bản Android: diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml index 400c5e8d3..d98d70db6 100644 --- a/app/src/main/res/values-w820dp/dimens.xml +++ b/app/src/main/res/values-w820dp/dimens.xml @@ -1,19 +1,8 @@ diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index e1e95ef0a..1f0bd2623 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1,22 +1,11 @@ - - - + + 展示 安卓版本： diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index ad6a68e23..03424243a 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1,22 +1,11 @@ - - - + + 展示 Android 版本︰ diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 77ae2a265..910470668 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1,22 +1,11 @@ - - - + + 展示 Android 版本︰ diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 68948d06c..4821f30e0 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -4,18 +4,7 @@ ~ Copyright (c) 2016-2018 Projekt Substratum ~ This file is part of Substratum. ~ - ~ Substratum is free software: you can redistribute it and/or modify - ~ it under the terms of the GNU General Public License as published by - ~ the Free Software Foundation, either version 3 of the License, or - ~ (at your option) any later version. - ~ - ~ Substratum is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - ~ GNU General Public License for more details. - ~ - ~ You should have received a copy of the GNU General Public License - ~ along with Substratum. If not, see . + ~ SPDX-License-Identifier: GPL-3.0-Or-Later --> diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml index a38ef2eb6..ad15329b3 100644 --- a/app/src/main/res/values/bools.xml +++ b/app/src/main/res/values/bools.xml @@ -1,19 +1,8 @@ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index beaccb9ea..3ce1ca4c5 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,19 +1,8 @@ diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 8537938f5..ffc5ac477 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,19 +1,8 @@ diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml index 79bf393f6..bcdc10da8 100644 --- a/app/src/main/res/values/integers.xml +++ b/app/src/main/res/values/integers.xml @@ -1,19 +1,8 @@ diff --git a/app/src/main/res/values/library_strings.xml b/app/src/main/res/values/library_strings.xml index 2148804f2..46903c71c 100644 --- a/app/src/main/res/values/library_strings.xml +++ b/app/src/main/res/values/library_strings.xml @@ -1,19 +1,8 @@ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8d7b71df1..723caea96 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,19 +1,8 @@ @@ -138,6 +127,7 @@ Substratum debug build not authorized! To use this build of substratum with your custom ROM, please enable \'Force authorize every theme app\' in Developer options.\n\nIf it is not there, please contact your ROM dev for missing commits! + Please enable development settings and enable \'Force authorize every theme app\'! "%s" has no available resources for theming! @@ -342,13 +332,13 @@ Target application/overlay outdated or mismatched configuration selected… LogChar Debug Report Successfully copied error log to clipboard! - + %s: Theme Bug Report - + Hey %s,\n\nI have an issue with %s, and would like to see if you could help me resolve this issue. - + Theme Name:\n%s\n\nDevice:\n%s\n\nROM:\n%s\n\nSubstratum Version:\n%s\n\nTheme Version:\n%s\n\nTarget Package(s):\n%s\nReport:\n%s Send @@ -371,14 +361,14 @@ no overlays installed compile one overlay to be able to use me! - Backup Card + Backup This function makes a copy of your currently enabled overlays list and places it in \"/storage/emulated/0/substratum/profiles/\" for safekeeping. Delete Delete profile Are you sure you want to delete \"%s\"? - Restore Card + Restore When a profile is loaded, your current setup is completely wiped and \"restore theme\" would take on the updated changes. diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index f0af31aaf..adf9d47fe 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,19 +1,8 @@ diff --git a/app/src/main/res/xml/preference_fragment.xml b/app/src/main/res/xml/preference_fragment.xml index 9c94bb6cd..45d4796b8 100644 --- a/app/src/main/res/xml/preference_fragment.xml +++ b/app/src/main/res/xml/preference_fragment.xml @@ -1,21 +1,10 @@ diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml index 7d4b964f5..4e2b80e36 100644 --- a/app/src/main/res/xml/shortcuts.xml +++ b/app/src/main/res/xml/shortcuts.xml @@ -1,19 +1,8 @@