Merge pull request #878 from ImranR98/dev

Fix Codeberg not finding APKs (#877), Make touch highlight visible in dark theme (#860)
This commit is contained in:
Imran Remtulla
2023-09-10 14:03:48 -04:00
committed by GitHub
4 changed files with 13 additions and 9 deletions

View File

@@ -252,8 +252,10 @@ class GitHub extends AppSource {
List<MapEntry<String, String>> getReleaseAPKUrls(dynamic release) => List<MapEntry<String, String>> getReleaseAPKUrls(dynamic release) =>
(release['assets'] as List<dynamic>?) (release['assets'] as List<dynamic>?)
?.map((e) { ?.map((e) {
return e['name'] != null && e['url'] != null return (e['name'] != null) &&
? MapEntry(e['name'] as String, e['url'] as String) ((e['url'] ?? e['browser_download_url']) != null)
? MapEntry(e['name'] as String,
(e['url'] ?? e['browser_download_url']) as String)
: const MapEntry('', ''); : const MapEntry('', '');
}) })
.where((element) => element.key.toLowerCase().endsWith('.apk')) .where((element) => element.key.toLowerCase().endsWith('.apk'))

View File

@@ -19,7 +19,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
// ignore: implementation_imports // ignore: implementation_imports
import 'package:easy_localization/src/localization.dart'; import 'package:easy_localization/src/localization.dart';
const String currentVersion = '0.14.11'; const String currentVersion = '0.14.12';
const String currentReleaseTag = const String currentReleaseTag =
'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES 'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES

View File

@@ -452,11 +452,13 @@ class AppsPageState extends State<AppsPage> {
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
color: Theme.of(context).primaryColor.withAlpha( color: settingsProvider.highlightTouchTargets &&
(settingsProvider.highlightTouchTargets && showChangesFn != null
showChangesFn != null) ? (Theme.of(context).brightness == Brightness.light
? 20 ? Theme.of(context).primaryColor
: 0)), : Theme.of(context).primaryColorLight)
.withAlpha(20)
: null),
padding: const EdgeInsets.fromLTRB(12, 0, 12, 0), padding: const EdgeInsets.fromLTRB(12, 0, 12, 0),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,

View File

@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts # In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix. # of the product and file versions while build-number is used as the build suffix.
version: 0.14.11+203 # When changing this, update the tag in main() accordingly version: 0.14.12+204 # When changing this, update the tag in main() accordingly
environment: environment:
sdk: '>=3.0.0 <4.0.0' sdk: '>=3.0.0 <4.0.0'