From 7dee5738c9c26419a21486a4ecac6684ded8c2d3 Mon Sep 17 00:00:00 2001 From: Stonegate Date: Thu, 28 Jan 2021 00:30:59 +0800 Subject: [PATCH] Fdroid pub configuration. --- .github/workflows/flutter_build.yml | 4 ++-- android/app/build.gradle | 20 ++++++++++++++++++++ lib/home/pocast_discovery.dart | 4 +++- lib/home/search_podcast.dart | 2 ++ lib/settings/layouts.dart | 6 ++++++ 5 files changed, 33 insertions(+), 3 deletions(-) diff --git a/.github/workflows/flutter_build.yml b/.github/workflows/flutter_build.yml index e6f0010..a49e2e5 100644 --- a/.github/workflows/flutter_build.yml +++ b/.github/workflows/flutter_build.yml @@ -23,13 +23,13 @@ jobs: API_KEY: ${{ secrets.API_KEY }} PI_API_SECRET: ${{ secrets.PI_API_SECRET}} PI_API_KEY: ${{ secrets.PI_API_KEY}} - - run: flutter build apk --split-per-abi --obfuscate --split-debug-info=debug/ + - run: flutter build apk --split-per-abi --obfuscate --split-debug-info=debug/ --flavor=fdroid env: KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD}} - - run: flutter build appbundle --obfuscate --split-debug-info=debug/ + - run: flutter build appbundle --obfuscate --split-debug-info=debug/ --flavor=fdroid env: KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEY_ALIAS: ${{ secrets.KEY_ALIAS }} diff --git a/android/app/build.gradle b/android/app/build.gradle index 6111fc1..554bcde 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -72,6 +72,26 @@ android { } } + flavorDimensions "deploy" + + productFlavors { + play { + dimension "deploy" + signingConfig signingConfigs.release + } + fdroid { + dimension "deploy" + signingConfig null + } + } + + android.applicationVariants.all { variant -> + if (variant.flavorName == "fdroid") { + variant.outputs.all { output -> + output.outputFileName = "app-fdroid-release.apk" + } + } + } } flutter { diff --git a/lib/home/pocast_discovery.dart b/lib/home/pocast_discovery.dart index ed78f5c..4b9159b 100644 --- a/lib/home/pocast_discovery.dart +++ b/lib/home/pocast_discovery.dart @@ -9,6 +9,7 @@ import '../type/search_api/search_genre.dart'; import '../type/search_api/searchpodcast.dart'; import '../util/extension_helper.dart'; import '../widgets/custom_widget.dart'; +import '../.env.dart'; import 'search_podcast.dart'; class DiscoveryPage extends StatefulWidget { @@ -171,7 +172,8 @@ class DiscoveryPageState extends State { return FutureBuilder( future: _getHideDiscovery(), initialData: true, - builder: (context, snapshot) => snapshot.data + builder: (context, snapshot) => snapshot.data || + environment['apiKey'] == '' ? ScrollConfiguration( behavior: NoGrowBehavior(), child: SingleChildScrollView( diff --git a/lib/home/search_podcast.dart b/lib/home/search_podcast.dart index 0c19c14..58c8e75 100644 --- a/lib/home/search_podcast.dart +++ b/lib/home/search_podcast.dart @@ -18,6 +18,7 @@ import '../type/search_api/searchepisodes.dart'; import '../type/search_api/searchpodcast.dart'; import '../util/extension_helper.dart'; import '../widgets/custom_widget.dart'; +import '../.env.dart'; import 'pocast_discovery.dart'; class MyHomePageDelegate extends SearchDelegate { @@ -162,6 +163,7 @@ class MyHomePageDelegate extends SearchDelegate { ), ), ), + if(environment['apiKey'] != '') PopupMenuItem( value: SearchEngine.listenNotes, child: Container( diff --git a/lib/settings/layouts.dart b/lib/settings/layouts.dart index dbd48cb..1a720b1 100644 --- a/lib/settings/layouts.dart +++ b/lib/settings/layouts.dart @@ -10,6 +10,7 @@ import '../util/extension_helper.dart'; import '../widgets/custom_dropdown.dart'; import '../widgets/custom_widget.dart'; import '../widgets/episodegrid.dart'; +import '../.env.dart'; import 'popup_menu.dart'; class LayoutSetting extends StatefulWidget { @@ -260,10 +261,13 @@ class _LayoutSettingState extends State { audio.setPlayerHeight = PlayerHeight.values[index]), ), ), + if(environment['apiKey'] != '') Divider(height: 1), + if(environment['apiKey'] != '') Padding( padding: EdgeInsets.all(10.0), ), + if(environment['apiKey'] != '') Container( height: 30.0, padding: EdgeInsets.symmetric(horizontal: 70), @@ -272,6 +276,7 @@ class _LayoutSettingState extends State { style: context.textTheme.bodyText1 .copyWith(color: context.accentColor)), ), + if(environment['apiKey'] != '') FutureBuilder( future: _getHideDiscovery(), initialData: false, @@ -287,6 +292,7 @@ class _LayoutSettingState extends State { ), ), ), + if(environment['apiKey'] != '') FutureBuilder( future: _getSearchEngine(), initialData: SearchEngine.listenNotes,