copilot/frosty
1
0
Fork 0
Code Issues Pull requests Projects Releases 11 Packages Wiki Activity Actions

Update to Material 3/You and other changes/fixes (#280)

Browse source 
* Use adaptive refresh indicators

* Add new message count indicator in chat

* Sync pubspec.lock

* Initial migration to material 3

* Restore default bottom sheet style

* Remove FrostyListTile and reset styles

* Use "Clear" button for all search history

* Add `require_trailing_commas` lint rule

* Exclude generated files from linter

* Use ListView for safe area support in bottom sheet

* Add initial dark theme

* Make sizing and units consistent

* Update onbaording spacings & copy

* Migrate to default material 3 buttons

* Add headers to chat details bottom sheet

* Simplify token log in method

* Use bottom sheet for account options

* Remove `AnimateScale` widget

* Tweak search paddings

* Update message spacing divisions

* Upgrade packages

* Update message spacing divisions

* Regenerate splash screens

* Update Inter & add google fonts

* Add initial material 3 themes

* Use adaptive alert dialogs

* Revert to oultined inputs

* Fix tooltip message

* Revert add google_fonts

* Improve themes and various styling

* Convert categories grid to list

* Tweak stream card thumbnail radii

* Tweak settings headers

* Left align floating snackbars

* Tweak search header padding

* Fix profile pics occasionally not rounded

* Use profile pic for settings button if logged in

* Redesign sleep timer

* Use divider theme and reduce thickness

* Use 0 letter spacing for tab bar titles

* Redesign category streams list

* Add border to tooltips

* Increase category card font weight

* Use outlined icon btton for chat user modal

* Reduce profile pic radius in search results

* Fix scrolll to top button safe area

* Add support for reply threads

* Reduce tooltip and snackbar border thickness

* Rebuild reply threads on new messages

* Upgrade packages (iOS)

* Reduce font weight for all chat alerts

* Use tabbars for pageview

* Add dividers everywhere

* Revert "Add dividers everywhere"

This reverts commit 5f0d349fdb.

* Remove fill from inputs

* Add dividers to settings

* Use segmented button for settings list

* Add scrollbar to lists with scrollcontroller

* Redesign badge/emote tooltip

* Remove outline from chat user modal buttons

* Remove divider from reply thread

* Use tap for chatters list and increase font weight

* Constrain emote tooltip width
This commit is contained in:
Tommy Chow 2023-10-22 18:38:32 -04:00 • committed by GitHub
parent 06d71a593b
commit 9a6892746d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
93 changed files with 2331 additions and 2372 deletions
Download patch file Download diff file Expand all files Collapse all files

112
lib/screens/settings/account/widgets/profile_card.dart
View file

@ -1,14 +1,10 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:frosty/screens/settings/account/account_options.dart';
import 'package:frosty/screens/settings/stores/auth_store.dart';
import 'package:frosty/screens/settings/widgets/settings_tile_route.dart';
import 'package:frosty/widgets/app_bar.dart';
import 'package:frosty/widgets/button.dart';
import 'package:frosty/widgets/dialog.dart';
import 'package:frosty/widgets/list_tile.dart';
import 'package:frosty/widgets/profile_picture.dart';
import 'package:simple_icons/simple_icons.dart';
import 'package:webview_flutter/webview_flutter.dart';
class ProfileCard extends StatelessWidget {
@ -16,63 +12,12 @@ class ProfileCard extends StatelessWidget {
const ProfileCard({Key? key, required this.authStore}) : super(key: key);
Future<void> _showLoginDialog(BuildContext context) {
return showDialog(
Future<void> _showAccountOptionsModalBottomSheet(BuildContext context) {
return showModalBottomSheet(
context: context,
builder: (context) => FrostyDialog(
title: 'Log In',
content: Column(
children: [
Button(
padding:
const EdgeInsets.symmetric(horizontal: 30.0, vertical: 15.0),
onPressed: () => Navigator.push(
context,
MaterialPageRoute(
builder: (context) {
return Scaffold(
appBar: const FrostyAppBar(
title: Text('Connect with Twitch'),
),
body: WebViewWidget(
controller: authStore.createAuthWebViewController(),
),
);
},
),
),
icon: const Icon(SimpleIcons.twitch),
child: const Text(
'Connect with Twitch',
style: TextStyle(
fontSize: 16,
color: Colors.white,
fontWeight: FontWeight.w600,
),
),
),
const SizedBox(height: 20.0),
const Center(
child: Text(
'Or',
style: TextStyle(fontWeight: FontWeight.w600),
),
),
const SizedBox(height: 20.0),
TextField(
autocorrect: false,
textAlign: TextAlign.center,
decoration: const InputDecoration(
hintText: 'Token',
),
onSubmitted: (token) {
authStore.login(token: token);
Navigator.pop(context);
},
)
],
),
),
builder: (context) {
return AccountOptions(authStore: authStore);
},
);
}
@ -81,39 +26,62 @@ class ProfileCard extends StatelessWidget {
return Observer(
builder: (context) {
if (authStore.error != null) {
return FrostyListTile(
return ListTile(
leading: const Icon(
Icons.error_outline_rounded,
color: Colors.red,
),
title: 'Failed to connect',
trailing: Button(
title: const Text('Failed to connect'),
trailing: FilledButton.tonal(
onPressed: authStore.init,
padding: const EdgeInsets.symmetric(horizontal: 15.0),
child: const Text('Reconnect'),
),
);
}
if (authStore.isLoggedIn && authStore.user.details != null) {
return SettingsTileRoute(
return ListTile(
leading: ProfilePicture(
userLogin: authStore.user.details!.login,
radius: 12,
),
title: authStore.user.details!.displayName,
child: AccountOptions(authStore: authStore),
title: Text(authStore.user.details!.displayName),
trailing: const Icon(Icons.chevron_right_rounded),
onTap: () => _showAccountOptionsModalBottomSheet(context),
);
}
return FrostyListTile(
return ListTile(
leading: const Icon(Icons.no_accounts_rounded),
title: 'Anonymous',
title: const Text('Anonymous'),
subtitle: const Text(
'Tap to log in and enable the ability to chat, view followed streams, and more.'),
'Log in to enable the ability to chat, view followed streams, and more.',
),
trailing: const SizedBox(
height: double.infinity,
child: Icon(Icons.chevron_right_rounded),
),
onTap: () => _showLoginDialog(context),
onTap: () => Navigator.push(
context,
MaterialPageRoute(
builder: (context) {
return Scaffold(
appBar: const FrostyAppBar(
title: Text('Connect with Twitch'),
),
body: WebViewWidget(
controller: authStore.createAuthWebViewController(),
),
);
},
),
),
onLongPress: () async {
final clipboardText =
(await Clipboard.getData(Clipboard.kTextPlain))?.text;
if (clipboardText == null) return;
authStore.login(token: clipboardText);
},
);
},
);