Fixed incorrect background colours

ImranR98 · Sep 17, 2022 · 3ddf9ea · 3ddf9ea
1 parent 2272f8b
commit 3ddf9ea
Show file tree

Hide file tree

Showing 5 changed files with 544 additions and 513 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -12,7 +12,7 @@ import 'package:dynamic_color/dynamic_color.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 
 const String currentReleaseTag =
- 'v0.2.2-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
+ 'v0.2.3-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 
 @pragma('vm:entry-point')
 void bgTaskCallback() {

diff --git a/lib/pages/add_app.dart b/lib/pages/add_app.dart
@@ -23,125 +23,136 @@ class _AddAppPageState extends State<AddAppPage> {
  @override
  Widget build(BuildContext context) {
  SourceProvider sourceProvider = SourceProvider();
- return CustomScrollView(slivers: <Widget>[
- const CustomAppBar(title: 'Add App'),
- SliverFillRemaining(
- hasScrollBody: false,
- child: Center(
- child: Form(
- key: _formKey,
- child: Column(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- crossAxisAlignment: CrossAxisAlignment.stretch,
- children: [
- Container(),
- Padding(
- padding: const EdgeInsets.all(16),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.stretch,
- children: [
- TextFormField(
- decoration: const InputDecoration(
- hintText: 'https://github.com/Author/Project',
- helperText: 'Enter the App source URL'),
- controller: urlInputController,
- validator: (value) {
- if (value == null ||
- value.isEmpty ||
- Uri.tryParse(value) == null) {
- return 'Please enter a supported source URL';
- }
- return null;
- },
- ),
- Padding(
- padding: const EdgeInsets.symmetric(vertical: 16.0),
- child: ElevatedButton(
- onPressed: gettingAppInfo
- ? null
- : () {
- HapticFeedback.selectionClick();
- if (_formKey.currentState!.validate()) {
- setState(() {
- gettingAppInfo = true;
- });
- sourceProvider
- .getApp(
- urlInputController.value.text)
- .then((app) {
- var appsProvider =
- context.read<AppsProvider>();
- var settingsProvider =
- context.read<SettingsProvider>();
- if (appsProvider.apps
- .containsKey(app.id)) {
- throw 'App already added';
- }
- settingsProvider
- .getInstallPermission()
- .then((_) {
- appsProvider.saveApp(app).then((_) {
- urlInputController.clear();
- Navigator.push(
- context,
- MaterialPageRoute(
- builder: (context) =>
- AppPage(
- appId: app.id)));
+ return Scaffold(
+ backgroundColor: Theme.of(context).colorScheme.surface,
+ body: CustomScrollView(slivers: <Widget>[
+ const CustomAppBar(title: 'Add App'),
+ SliverFillRemaining(
+ hasScrollBody: false,
+ child: Center(
+ child: Form(
+ key: _formKey,
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ crossAxisAlignment: CrossAxisAlignment.stretch,
+ children: [
+ Container(),
+ Padding(
+ padding: const EdgeInsets.all(16),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.stretch,
+ children: [
+ TextFormField(
+ decoration: const InputDecoration(
+ hintText:
+ 'https://github.com/Author/Project',
+ helperText: 'Enter the App source URL'),
+ controller: urlInputController,
+ validator: (value) {
+ if (value == null ||
+ value.isEmpty ||
+ Uri.tryParse(value) == null) {
+ return 'Please enter a supported source URL';
+ }
+ return null;
+ },
+ ),
+ Padding(
+ padding:
+ const EdgeInsets.symmetric(vertical: 16.0),
+ child: ElevatedButton(
+ onPressed: gettingAppInfo
+ ? null
+ : () {
+ HapticFeedback.selectionClick();
+ if (_formKey.currentState!
+ .validate()) {
+ setState(() {
+ gettingAppInfo = true;
  });
- });
- }).catchError((e) {
- ScaffoldMessenger.of(context)
- .showSnackBar(
- SnackBar(
- content: Text(e.toString())),
- );
- }).whenComplete(() {
- setState(() {
- gettingAppInfo = false;
- });
- });
- }
- },
- child: const Text('Add'),
- ),
- ),
- ],
- ),
- ),
- Column(
- crossAxisAlignment: CrossAxisAlignment.center,
- children: [
- const Text(
- 'Supported Sources:',
- // style: TextStyle(fontWeight: FontWeight.bold),
- // style: Theme.of(context).textTheme.bodySmall,
- ),
- const SizedBox(
- height: 8,
+ sourceProvider
+ .getApp(urlInputController
+ .value.text)
+ .then((app) {
+ var appsProvider =
+ context.read<AppsProvider>();
+ var settingsProvider = context
+ .read<SettingsProvider>();
+ if (appsProvider.apps
+ .containsKey(app.id)) {
+ throw 'App already added';
+ }
+ settingsProvider
+ .getInstallPermission()
+ .then((_) {
+ appsProvider
+ .saveApp(app)
+ .then((_) {
+ urlInputController.clear();
+ Navigator.push(
+ context,
+ MaterialPageRoute(
+ builder: (context) =>
+ AppPage(
+ appId:
+ app.id)));
+ });
+ });
+ }).catchError((e) {
+ ScaffoldMessenger.of(context)
+ .showSnackBar(
+ SnackBar(
+ content:
+ Text(e.toString())),
+ );
+ }).whenComplete(() {
+ setState(() {
+ gettingAppInfo = false;
+ });
+ });
+ }
+ },
+ child: const Text('Add'),
+ ),
+ ),
+ ],
  ),
- ...sourceProvider
- .getSourceHosts()
- .map((e) => GestureDetector(
- onTap: () {
- launchUrlString('https://$e',
- mode: LaunchMode.externalApplication);
- },
- child: Text(
- e,
- style: const TextStyle(
- decoration: TextDecoration.underline,
- fontStyle: FontStyle.italic),
- )))
- .toList()
- ]),
- if (gettingAppInfo)
- const LinearProgressIndicator()
- else
- Container(),
- ],
- )),
- ))
- ]);
+ ),
+ Column(
+ crossAxisAlignment: CrossAxisAlignment.center,
+ children: [
+ const Text(
+ 'Supported Sources:',
+ // style: TextStyle(fontWeight: FontWeight.bold),
+ // style: Theme.of(context).textTheme.bodySmall,
+ ),
+ const SizedBox(
+ height: 8,
+ ),
+ ...sourceProvider
+ .getSourceHosts()
+ .map((e) => GestureDetector(
+ onTap: () {
+ launchUrlString('https://$e',
+ mode:
+ LaunchMode.externalApplication);
+ },
+ child: Text(
+ e,
+ style: const TextStyle(
+ decoration:
+ TextDecoration.underline,
+ fontStyle: FontStyle.italic),
+ )))
+ .toList()
+ ]),
+ if (gettingAppInfo)
+ const LinearProgressIndicator()
+ else
+ Container(),
+ ],
+ )),
+ ))
+ ]));
  }
 }