diff options
8 files changed, 73 insertions, 9 deletions
diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle index cce34e7d..7ffaf523 100755 --- a/org.fox.ttrss/build.gradle +++ b/org.fox.ttrss/build.gradle @@ -16,6 +16,9 @@ android { versionCode getGitVersionCode() versionName getVersion() vectorDrawables.useSupportLibrary = true + manifestPlaceholders = [ + appIcon: "@mipmap/ic_launcher" + ] } signingConfigs { @@ -36,8 +39,20 @@ android { } buildTypes { + debug { + minifyEnabled false + versionNameSuffix "-debug" + applicationIdSuffix ".debug" + debuggable true + resValue "string", "app_name", "Tiny Tiny RSS (debug)" + manifestPlaceholders = [ + appIcon: "@mipmap/ic_launcher_variant" + ] + } + release { minifyEnabled false + versionNameSuffix "-release-unsigned" proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } @@ -46,16 +61,18 @@ android { versionNameSuffix "-signed" proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' signingConfig signingConfigs.signed - matchingFallbacks = ['release'] } - signedBranch { + branch { minifyEnabled false versionNameSuffix "-signed-branch" proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' signingConfig signingConfigs.signed - matchingFallbacks = ['release'] applicationIdSuffix ".branch" + resValue "string", "app_name", "Tiny Tiny RSS (branch)" + manifestPlaceholders = [ + appIcon: "@mipmap/ic_launcher_variant" + ] } } namespace 'org.fox.ttrss' diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index feb8a2e1..3388d515 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -17,7 +17,7 @@ android:name=".Application" android:allowBackup="true" android:hardwareAccelerated="true" - android:icon="@mipmap/ic_launcher" + android:icon="${appIcon}" android:label="@string/app_name" android:networkSecurityConfig="@xml/network_security_config" > @@ -217,7 +217,7 @@ <provider android:name="androidx.core.content.FileProvider" - android:authorities="org.fox.ttrss.SharedFileProvider" + android:authorities="${applicationId}.SharedFileProvider" android:exported="false" android:grantUriPermissions="true"> <meta-data diff --git a/org.fox.ttrss/src/main/res/drawable/ic_launcher_background_variant.xml b/org.fox.ttrss/src/main/res/drawable/ic_launcher_background_variant.xml new file mode 100644 index 00000000..749ffa26 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/ic_launcher_background_variant.xml @@ -0,0 +1,42 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="108dp" + android:height="108dp" + android:viewportWidth="51.06383" + android:viewportHeight="51.06383"> + <group android:translateX="-10.468085" + android:translateY="-10.468085"> + <path + android:pathData="M-9.8995,-7.7102h94.3666v92.4381h-94.3666z" + android:fillColor="#5c5c5c" + android:strokeColor="#00000000" + android:fillAlpha="1"/> + <path + android:pathData="M5.668,58.0128a8.3196,8.3198 0,1 0,16.6393 0a8.3196,8.3198 0,1 0,-16.6393 0z" + android:strokeAlpha="1" + android:strokeWidth="0.69765961" + android:fillColor="#808080" + android:strokeColor="#00000000" + android:fillAlpha="1"/> + <path + android:pathData="m45.8796,66.3326 l-11.7862,0A28.4254,28.426 0,0 0,5.668 37.9066l0,-11.7864A40.2116,40.2124 0,0 1,45.8796 66.3326Z" + android:strokeAlpha="1" + android:strokeWidth="0.69765961" + android:fillColor="#808080" + android:strokeColor="#00000000" + android:fillAlpha="1"/> + <path + android:pathData="M54.1992,66.3326A48.5312,48.5322 0,0 0,5.668 17.8004l0,-12.1331a60.6653,60.6641 90,0 1,60.6641 60.6653z" + android:strokeAlpha="1" + android:strokeWidth="2.01254654" + android:fillColor="#808080" + android:strokeColor="#00000000" + android:fillAlpha="1"/> + <path + android:pathData="M54.1992,66.3326A48.5312,48.5322 0,0 0,5.668 17.8004l0,-12.1331a60.6653,60.6641 90,0 1,60.6641 60.6653z" + android:strokeAlpha="1" + android:strokeWidth="2.01254654" + android:fillColor="#808080" + android:strokeColor="#00000000" + android:fillAlpha="1"/> + </group> +</vector> diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml index 59c1b086..823afb9b 100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml @@ -54,7 +54,7 @@ <FrameLayout android:layout_width="match_parent" android:id="@+id/article_fragment" - app:layout_behavior=".util.DetailActivityScrollingViewBehavior" + app:layout_behavior="org.fox.ttrss.util.DetailActivityScrollingViewBehavior" android:layout_height="match_parent"/> <com.google.android.material.bottomappbar.BottomAppBar diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml index b6a6f19d..63b8c3e2 100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml @@ -61,7 +61,7 @@ android:id="@+id/headlines_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" - app:layout_behavior=".util.FabAwareScrollingViewBehavior" /> + app:layout_behavior="org.fox.ttrss.util.FabAwareScrollingViewBehavior" /> <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/master_fab" diff --git a/org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml b/org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml index 55a6ba77..4e75d44b 100644 --- a/org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml +++ b/org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml @@ -14,7 +14,7 @@ <FrameLayout android:id="@+id/article_fragment" - app:layout_behavior=".util.DetailActivityScrollingViewBehavior" + app:layout_behavior="org.fox.ttrss.util.DetailActivityScrollingViewBehavior" android:layout_width="match_parent" android:layout_height="match_parent"> </FrameLayout> diff --git a/org.fox.ttrss/src/main/res/layout/layout_master_phone.xml b/org.fox.ttrss/src/main/res/layout/layout_master_phone.xml index b4cb6b59..e32d5fbe 100644 --- a/org.fox.ttrss/src/main/res/layout/layout_master_phone.xml +++ b/org.fox.ttrss/src/main/res/layout/layout_master_phone.xml @@ -29,7 +29,7 @@ <FrameLayout android:id="@+id/headlines_fragment" - app:layout_behavior=".util.FabAwareScrollingViewBehavior" + app:layout_behavior="org.fox.ttrss.util.FabAwareScrollingViewBehavior" android:layout_width="match_parent" android:layout_height="wrap_content"/> diff --git a/org.fox.ttrss/src/main/res/mipmap-anydpi-v26/ic_launcher_variant.xml b/org.fox.ttrss/src/main/res/mipmap-anydpi-v26/ic_launcher_variant.xml new file mode 100644 index 00000000..d49922f9 --- /dev/null +++ b/org.fox.ttrss/src/main/res/mipmap-anydpi-v26/ic_launcher_variant.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@drawable/ic_launcher_background_variant"/> + <foreground android:drawable="@drawable/ic_launcher_foreground"/> +</adaptive-icon>
\ No newline at end of file |