Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix/fix 1.0.10 (55) notes #285

Merged
merged 3 commits into from
Jun 5, 2023
Merged

Hotfix/fix 1.0.10 (55) notes #285

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e1e5a5
fix: resolve related problems and migrate to Dart 3.0
sonle-geekyants May 31, 2023
5e2ec94
feat: adjust history filter and add onTap for items in File screen St…
sonle-geekyants Jun 5, 2023
3e26b50
feat: replace InkWell with AbsorbPointer
sonle-geekyants Jun 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added assets/fonts/Poppins/Poppins-Bold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/Poppins/Poppins-Light.ttf
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/Poppins/Poppins-Medium.ttf
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/Poppins/Poppins-Regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/Poppins/Poppins-SemiBold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/Poppins/Poppins-Thin.ttf
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion lib/app.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class _MyAppState extends State<MyApp> {
initialRoute: initialRoute,
navigatorKey: NavService.navKey,
theme: ThemeData(
fontFamily: 'Inter',
fontFamily: 'Poppins',
scaffoldBackgroundColor: Colors.white,
primaryColor: Color.fromARGB(255, 240, 94, 62),
appBarTheme: AppBarTheme(
Expand Down
6 changes: 5 additions & 1 deletion lib/desktop_screens/desktop_history/widgets/desktop_received_file_details.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,11 @@ class _DesktopReceivedFileDetailsState
}

Widget getDownloadStatus(FileTransferProgress? fileTransferProgress) {
Widget spinner = CircularProgressIndicator();
Widget spinner = CircularProgressIndicator(
valueColor: AlwaysStoppedAnimation<Color>(
ColorConstants.orange,
),
);

if (fileTransferProgress == null) {
return spinner;
Expand Down
7 changes: 6 additions & 1 deletion lib/desktop_screens/desktop_my_files/desktop_my_files.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,12 @@ class _DesktopMyFilesState extends State<DesktopMyFiles>
children: [
SingleChildScrollView(
child: (isLoading)
? Center(child: CircularProgressIndicator())
? Center(
child: CircularProgressIndicator(
valueColor: AlwaysStoppedAnimation<Color>(
ColorConstants.orange,
),
))
: Container(
// reducing size by 75 , so that last list item will be shown
height: SizeConfig().screenHeight,
Expand Down
7 changes: 6 additions & 1 deletion lib/screens/common_widgets/add_contact.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import 'package:at_common_flutter/services/size_config.dart';
import 'package:at_common_flutter/widgets/custom_button.dart';
import 'package:at_contacts_flutter/services/contact_service.dart';
import 'package:atsign_atmosphere_pro/screens/common_widgets/custom_circle_avatar.dart';
import 'package:atsign_atmosphere_pro/utils/colors.dart';
import 'package:atsign_atmosphere_pro/utils/text_styles.dart';
import 'package:flutter/material.dart';

Expand Down Expand Up @@ -107,7 +108,11 @@ class _AddContactState extends State<AddContact> {
),
isContactAdding
? Center(
child: CircularProgressIndicator(),
child: CircularProgressIndicator(
valueColor: AlwaysStoppedAnimation<Color>(
ColorConstants.orange,
),
),
)
: Container(
alignment: Alignment.center,
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/common_widgets/app_bar_custom.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class AppBarCustom extends StatelessWidget implements PreferredSizeWidget {
textAlign: TextAlign.left,
style: titleStyle ??
TextStyle(
fontSize: 25.toFont,
fontSize: 20.toFont,
fontWeight: FontWeight.w500,
),
maxLines: 1,
Expand Down
7 changes: 6 additions & 1 deletion lib/screens/common_widgets/labelled_circular_progress.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@ class LabelledCircularProgressIndicator extends StatelessWidget {
return SizedBox(
child: Stack(
children: [
CircularProgressIndicator(value: value),
CircularProgressIndicator(
value: value,
valueColor: AlwaysStoppedAnimation<Color>(
ColorConstants.orange,
),
),
value != null
? Positioned(
top: 10,
Expand Down
6 changes: 5 additions & 1 deletion lib/screens/common_widgets/loading_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ class LoadingDialog {
return Center(
child: (text != null)
? onlyText(text)
: CircularProgressIndicator(),
: CircularProgressIndicator(
valueColor: AlwaysStoppedAnimation<Color>(
ColorConstants.orange,
),
),
);
},
barrierDismissible: false))
Expand Down
13 changes: 11 additions & 2 deletions lib/screens/common_widgets/provider_handler.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/// [Status.Loading] renders a CircularProgressIndicator whereas
/// [Status.Error] renders [errorBuilder]
import 'package:atsign_atmosphere_pro/screens/common_widgets/error_dialog.dart';
import 'package:atsign_atmosphere_pro/utils/colors.dart';
import 'package:atsign_atmosphere_pro/view_models/base_model.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
Expand Down Expand Up @@ -32,7 +33,11 @@ class ProviderHandler<T extends BaseModel> extends StatelessWidget {
child: Container(
height: 50.toHeight,
width: 50.toHeight,
child: CircularProgressIndicator(),
child: CircularProgressIndicator(
valueColor: AlwaysStoppedAnimation<Color>(
ColorConstants.orange,
),
),
),
);
} else if (_provider.status[functionName!] == Status.Error) {
Expand All @@ -56,7 +61,11 @@ class ProviderHandler<T extends BaseModel> extends StatelessWidget {
child: Container(
height: 50.toHeight,
width: 50.toHeight,
child: CircularProgressIndicator(),
child: CircularProgressIndicator(
valueColor: AlwaysStoppedAnimation<Color>(
ColorConstants.orange,
),
),
),
);
}
Expand Down
32 changes: 15 additions & 17 deletions lib/screens/contact_new_version/add_contact_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'package:at_common_flutter/services/size_config.dart';
import 'package:atsign_atmosphere_pro/screens/common_widgets/gradient_text_field_widget.dart';
import 'package:atsign_atmosphere_pro/screens/common_widgets/input_widget.dart';
import 'package:atsign_atmosphere_pro/utils/colors.dart';
import 'package:atsign_atmosphere_pro/utils/vectors.dart';
Expand Down Expand Up @@ -100,8 +99,8 @@ class _AddContactScreenState extends State<AddContactScreen> {
fontSize: 14.toFont,
color: Colors.black,
),
onSubmitted: (value) {
_checkValid();
onSubmitted: (value) async {
await state.checkValid(atSignController.text);
},
),
Visibility(
Expand All @@ -122,8 +121,8 @@ class _AddContactScreenState extends State<AddContactScreen> {
InputWidget(
hintText: 'Enter nickname',
controller: nicknameController,
onSubmitted: (value) {
_checkValid();
onSubmitted: (value) async {
await state.checkValid(atSignController.text);
},
),
const SizedBox(height: 30),
Expand Down Expand Up @@ -161,10 +160,17 @@ class _AddContactScreenState extends State<AddContactScreen> {
),
),
state.status['add_contact_status'] == Status.Loading
? Center(
child: CircularProgressIndicator(
valueColor: AlwaysStoppedAnimation<Color>(
ColorConstants.orange,
? InkWell(
onTap: () {},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this InkWell required ?

child: SizedBox(
width: double.infinity,
height: double.infinity,
child: Center(
child: CircularProgressIndicator(
valueColor: AlwaysStoppedAnimation<Color>(
ColorConstants.orange,
),
),
),
),
)
Expand Down Expand Up @@ -217,12 +223,4 @@ class _AddContactScreenState extends State<AddContactScreen> {
},
);
}

void _checkValid() {
if (atSignController.text.isNotEmpty) {
addContactProvider.changeVerifyStatus(true);
} else {
addContactProvider.changeVerifyStatus(false);
}
}
}
1 change: 1 addition & 0 deletions lib/screens/contact_new_version/blocked_contact_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ class _BlockedContactScreenState extends State<BlockedContactScreen> {
return Scrollbar(
radius: const Radius.circular(11),
child: RefreshIndicator(
color: ColorConstants.orange,
onRefresh: () async {},
child: ListView.builder(
physics: const ClampingScrollPhysics(),
Expand Down
1 change: 1 addition & 0 deletions lib/screens/contact_new_version/widget/contacts_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class _ContactsWidgetState extends State<ContactsWidget> {
@override
Widget build(BuildContext context) {
return RefreshIndicator(
color: ColorConstants.orange,
onRefresh: () async {
widget.onRefresh?.call();
setState(() {});
Expand Down
2 changes: 2 additions & 0 deletions lib/screens/history/history_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ class _HistoryScreenState extends State<HistoryScreen>
controller: _controller,
children: [
RefreshIndicator(
color: ColorConstants.orange,
onRefresh: () async {
if (historyProvider!
.status[historyProvider!.PERIODIC_REFRESH] !=
Expand Down Expand Up @@ -191,6 +192,7 @@ class _HistoryScreenState extends State<HistoryScreen>
),
),
RefreshIndicator(
color: ColorConstants.orange,
onRefresh: () async {
if (historyProvider!
.status[historyProvider!.PERIODIC_REFRESH] !=
Expand Down
1 change: 1 addition & 0 deletions lib/screens/history/transfer_history_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ class _TransferHistoryScreenState extends State<TransferHistoryScreen> {
),
Expanded(
child: RefreshIndicator(
color: ColorConstants.orange,
onRefresh: () async {
if (historyProvider.status[historyProvider.PERIODIC_REFRESH] !=
Status.Loading) {
Expand Down
16 changes: 9 additions & 7 deletions lib/screens/history/widgets/filter_option_item.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ class FilterOptionItem extends StatelessWidget {
this.isCheck = false,
this.onTap,
this.isAllOption = false,
this.allOptionOnTap, this.isShowOptional,
this.allOptionOnTap,
this.isShowOptional,
}) : super(key: key);

@override
Expand All @@ -32,11 +33,12 @@ class FilterOptionItem extends StatelessWidget {
? Colors.black
: Colors.white
: isOptional
? ColorConstants.lightSliver
? ColorConstants.unselectedFilterOptionColor
: Colors.black;

Color backgroundColor =
isOptional ? ColorConstants.disableBackgroundColor : Colors.white;
Color backgroundColor = isOptional
? ColorConstants.unselectedFilterOptionBackgroundColor
: Colors.white;

Color checkedBackgroundColor = isOptional
? ColorConstants.optionalFilterBackgroundColor
Expand All @@ -47,7 +49,7 @@ class FilterOptionItem extends StatelessWidget {
isAllOption ? allOptionOnTap?.call() : onTap?.call();
},
child: Container(
height: 36,
height: 44,
padding: EdgeInsets.symmetric(horizontal: 20),
decoration: BoxDecoration(
color: isCheck ? checkedBackgroundColor : backgroundColor,
Expand Down Expand Up @@ -99,8 +101,8 @@ class FilterOptionItem extends StatelessWidget {
},
child: SvgPicture.asset(
isCheck ? AppVectors.icChecked : AppVectors.icUnchecked,
width: 16,
height: 16,
width: 24,
height: 24,
color: color,
fit: BoxFit.cover,
),
Expand Down
8 changes: 6 additions & 2 deletions lib/screens/history/widgets/received_file_list_tile.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class _ReceivedFilesListTileState extends State<ReceivedFilesListTile> {
isDownloadAvailable = false,
isFilesAvailableOfline = true,
isOverwrite = false;

DateTime? sendTime;
Uint8List? videoThumbnail, image;
int fileSize = 0;
Expand Down Expand Up @@ -965,7 +965,11 @@ class _ReceivedFilesListTileState extends State<ReceivedFilesListTile> {
}

Widget getDownloadStatus(FileTransferProgress? fileTransferProgress) {
Widget spinner = CircularProgressIndicator();
Widget spinner = CircularProgressIndicator(
valueColor: AlwaysStoppedAnimation<Color>(
ColorConstants.orange,
),
);

if (fileTransferProgress == null) {
return spinner;
Expand Down
Loading