Fdroid pub configuration.

This commit is contained in:
Stonegate 2021-01-28 00:30:59 +08:00
parent f378382aa1
commit 7dee5738c9
5 changed files with 33 additions and 3 deletions

View File

@ -23,13 +23,13 @@ jobs:
API_KEY: ${{ secrets.API_KEY }} API_KEY: ${{ secrets.API_KEY }}
PI_API_SECRET: ${{ secrets.PI_API_SECRET}} PI_API_SECRET: ${{ secrets.PI_API_SECRET}}
PI_API_KEY: ${{ secrets.PI_API_KEY}} 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: env:
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD}} 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: env:
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_ALIAS: ${{ secrets.KEY_ALIAS }}

View File

@ -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 { flutter {

View File

@ -9,6 +9,7 @@ import '../type/search_api/search_genre.dart';
import '../type/search_api/searchpodcast.dart'; import '../type/search_api/searchpodcast.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../widgets/custom_widget.dart'; import '../widgets/custom_widget.dart';
import '../.env.dart';
import 'search_podcast.dart'; import 'search_podcast.dart';
class DiscoveryPage extends StatefulWidget { class DiscoveryPage extends StatefulWidget {
@ -171,7 +172,8 @@ class DiscoveryPageState extends State<DiscoveryPage> {
return FutureBuilder<bool>( return FutureBuilder<bool>(
future: _getHideDiscovery(), future: _getHideDiscovery(),
initialData: true, initialData: true,
builder: (context, snapshot) => snapshot.data builder: (context, snapshot) => snapshot.data ||
environment['apiKey'] == ''
? ScrollConfiguration( ? ScrollConfiguration(
behavior: NoGrowBehavior(), behavior: NoGrowBehavior(),
child: SingleChildScrollView( child: SingleChildScrollView(

View File

@ -18,6 +18,7 @@ import '../type/search_api/searchepisodes.dart';
import '../type/search_api/searchpodcast.dart'; import '../type/search_api/searchpodcast.dart';
import '../util/extension_helper.dart'; import '../util/extension_helper.dart';
import '../widgets/custom_widget.dart'; import '../widgets/custom_widget.dart';
import '../.env.dart';
import 'pocast_discovery.dart'; import 'pocast_discovery.dart';
class MyHomePageDelegate extends SearchDelegate<int> { class MyHomePageDelegate extends SearchDelegate<int> {
@ -162,6 +163,7 @@ class MyHomePageDelegate extends SearchDelegate<int> {
), ),
), ),
), ),
if(environment['apiKey'] != '')
PopupMenuItem( PopupMenuItem(
value: SearchEngine.listenNotes, value: SearchEngine.listenNotes,
child: Container( child: Container(

View File

@ -10,6 +10,7 @@ import '../util/extension_helper.dart';
import '../widgets/custom_dropdown.dart'; import '../widgets/custom_dropdown.dart';
import '../widgets/custom_widget.dart'; import '../widgets/custom_widget.dart';
import '../widgets/episodegrid.dart'; import '../widgets/episodegrid.dart';
import '../.env.dart';
import 'popup_menu.dart'; import 'popup_menu.dart';
class LayoutSetting extends StatefulWidget { class LayoutSetting extends StatefulWidget {
@ -260,10 +261,13 @@ class _LayoutSettingState extends State<LayoutSetting> {
audio.setPlayerHeight = PlayerHeight.values[index]), audio.setPlayerHeight = PlayerHeight.values[index]),
), ),
), ),
if(environment['apiKey'] != '')
Divider(height: 1), Divider(height: 1),
if(environment['apiKey'] != '')
Padding( Padding(
padding: EdgeInsets.all(10.0), padding: EdgeInsets.all(10.0),
), ),
if(environment['apiKey'] != '')
Container( Container(
height: 30.0, height: 30.0,
padding: EdgeInsets.symmetric(horizontal: 70), padding: EdgeInsets.symmetric(horizontal: 70),
@ -272,6 +276,7 @@ class _LayoutSettingState extends State<LayoutSetting> {
style: context.textTheme.bodyText1 style: context.textTheme.bodyText1
.copyWith(color: context.accentColor)), .copyWith(color: context.accentColor)),
), ),
if(environment['apiKey'] != '')
FutureBuilder<bool>( FutureBuilder<bool>(
future: _getHideDiscovery(), future: _getHideDiscovery(),
initialData: false, initialData: false,
@ -287,6 +292,7 @@ class _LayoutSettingState extends State<LayoutSetting> {
), ),
), ),
), ),
if(environment['apiKey'] != '')
FutureBuilder( FutureBuilder(
future: _getSearchEngine(), future: _getSearchEngine(),
initialData: SearchEngine.listenNotes, initialData: SearchEngine.listenNotes,