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

Release branch #102

Merged
merged 5 commits into from
Apr 25, 2022
Merged

Release branch #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d26ce34
Text changes for #431 and updated dependencies
Apr 14, 2022
12318ed
release changes for all platforms 1.0.6.38
Apr 14, 2022
735f070
added fontWeight to textStyle to pick up custom font
Apr 15, 2022
670d4d3
Merge branch 'trunk' into release-branch
Apr 22, 2022
74aff5f
release changes for ios, android and macos 1.0.6.39
Apr 22, 2022
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
24 changes: 12 additions & 12 deletions ios/Runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_ENTITLEMENTS = "Share Extension/Share Extension.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 37;
CURRENT_PROJECT_VERSION = 39;
DEVELOPMENT_TEAM = 5XUSS6C2DF;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = "Share Extension/Info.plist";
Expand All @@ -425,7 +425,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 1.0.5;
MARKETING_VERSION = 1.0.6;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.atsign.atmosphere-pro.ShareExtension";
Expand All @@ -448,7 +448,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_ENTITLEMENTS = "Share Extension/Share Extension.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 37;
CURRENT_PROJECT_VERSION = 39;
DEVELOPMENT_TEAM = 5XUSS6C2DF;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = "Share Extension/Info.plist";
Expand All @@ -458,7 +458,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 1.0.5;
MARKETING_VERSION = 1.0.6;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.atsign.atmosphere-pro.ShareExtension";
PRODUCT_NAME = "@mosphere-pro";
Expand All @@ -478,7 +478,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_ENTITLEMENTS = "Share Extension/Share Extension.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 37;
CURRENT_PROJECT_VERSION = 39;
DEVELOPMENT_TEAM = 5XUSS6C2DF;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = "Share Extension/Info.plist";
Expand All @@ -488,7 +488,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 1.0.5;
MARKETING_VERSION = 1.0.6;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.atsign.atmosphere-pro.ShareExtension";
PRODUCT_NAME = "@mosphere-pro";
Expand Down Expand Up @@ -558,7 +558,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 37;
CURRENT_PROJECT_VERSION = 39;
DEVELOPMENT_TEAM = 5XUSS6C2DF;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -575,7 +575,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 1.0.5;
MARKETING_VERSION = 1.0.6;
PRODUCT_BUNDLE_IDENTIFIER = "com.atsign.atmosphere-pro";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Atmosphere Pro dev provision profile";
Expand Down Expand Up @@ -703,7 +703,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 37;
CURRENT_PROJECT_VERSION = 39;
DEVELOPMENT_TEAM = 5XUSS6C2DF;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -720,7 +720,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 1.0.5;
MARKETING_VERSION = 1.0.6;
PRODUCT_BUNDLE_IDENTIFIER = "com.atsign.atmosphere-pro";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Atmosphere Pro dev provision profile";
Expand All @@ -742,7 +742,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 37;
CURRENT_PROJECT_VERSION = 39;
DEVELOPMENT_TEAM = 5XUSS6C2DF;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -759,7 +759,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 1.0.5;
MARKETING_VERSION = 1.0.6;
PRODUCT_BUNDLE_IDENTIFIER = "com.atsign.atmosphere-pro";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Atmosphere Pro dev provision profile";
Expand Down
6 changes: 5 additions & 1 deletion lib/desktop_screens/desktop_common_widgets/desktop_custom_input_field.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,17 @@ class DesktopCustomInputField extends StatelessWidget {
readOnly: isReadOnly,
style: TextStyle(
fontSize: 15.toFont,
fontWeight: FontWeight.normal,
),
decoration: InputDecoration(
hintText: hintText,
enabledBorder: InputBorder.none,
border: InputBorder.none,
hintStyle: TextStyle(
color: ColorConstants.light_grey, fontSize: 15.toFont),
color: ColorConstants.light_grey,
fontSize: 15.toFont,
fontWeight: FontWeight.normal,
),
),
onTap: onTap as void Function()? ?? () {},
onChanged: (val) {
Expand Down
5 changes: 4 additions & 1 deletion lib/desktop_screens/desktop_common_widgets/desktop_selected_files.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ class _DesktopSelectedFilesState extends State<DesktopSelectedFiles> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(TextStrings().selectedFiles, style: CustomTextStyles.desktopPrimaryBold18),
Text(TextStrings().selectedFiles,
style: CustomTextStyles.desktopPrimaryBold18),
SizedBox(
height: 30,
),
Expand Down Expand Up @@ -88,6 +89,7 @@ class _DesktopSelectedFilesState extends State<DesktopSelectedFiles> {
style: TextStyle(
color: Colors.black,
fontSize: 14.toFont,
fontWeight: FontWeight.normal,
),
maxLines: 1,
),
Expand All @@ -102,6 +104,7 @@ class _DesktopSelectedFilesState extends State<DesktopSelectedFiles> {
style: TextStyle(
color: ColorConstants.fadedText,
fontSize: 14.toFont,
fontWeight: FontWeight.normal,
),
),
leading: CommonUtilityFunctions().thumbnail(
Expand Down
1 change: 1 addition & 0 deletions lib/desktop_screens/desktop_common_widgets/desktop_switch_atsign.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ class _DesktopSwitchAtsignState extends State<DesktopSwitchAtsign> {
color: ColorConstants.fadedText,
letterSpacing: 0.1,
fontSize: 14,
fontWeight: FontWeight.normal,
),
),
)
Expand Down
15 changes: 12 additions & 3 deletions lib/desktop_screens/desktop_download_all_files/desktop_download_all_file.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,10 @@ class _DesktopDownloadAllFilesState extends State<DesktopDownloadAllFiles> {
onPressed: _setDownloadFolder,
child: const Text(
TextStrings.selectDownloadFolder,
style: TextStyle(fontSize: 16),
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.normal,
),
),
),
SizedBox(height: 10.toHeight),
Expand All @@ -70,7 +73,10 @@ class _DesktopDownloadAllFilesState extends State<DesktopDownloadAllFiles> {
isDownloading
? TextStrings().downloadingFiles
: TextStrings().downloadAllFiles,
style: TextStyle(fontSize: 16),
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.normal,
),
),
),
isDownloading
Expand All @@ -88,7 +94,10 @@ class _DesktopDownloadAllFilesState extends State<DesktopDownloadAllFiles> {
child: Row(
children: [
Text(TextStrings().downloadComplete,
style: TextStyle(color: Colors.green)),
style: TextStyle(
color: Colors.green,
fontWeight: FontWeight.normal,
)),
Icon(
Icons.download_done,
color: Colors.green,
Expand Down
24 changes: 18 additions & 6 deletions lib/desktop_screens/desktop_history/desktop_history.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,19 @@ class _DesktopHistoryScreenState extends State<DesktopHistoryScreen>
tabs: [
Text(
TextStrings().sent,
style:
TextStyle(letterSpacing: 0.1, fontSize: 20),
style: TextStyle(
letterSpacing: 0.1,
fontSize: 20,
fontWeight: FontWeight.normal,
),
),
Text(
TextStrings().received,
style:
TextStyle(letterSpacing: 0.1, fontSize: 20),
style: TextStyle(
letterSpacing: 0.1,
fontSize: 20,
fontWeight: FontWeight.normal,
),
)
],
),
Expand All @@ -131,7 +137,10 @@ class _DesktopHistoryScreenState extends State<DesktopHistoryScreen>
return (provider.sentHistory.isEmpty)
? Center(
child: Text(TextStrings().noFilesSent,
style: TextStyle(fontSize: 15.toFont)),
style: TextStyle(
fontSize: 15.toFont,
fontWeight: FontWeight.normal,
)),
)
: ListView.separated(
padding:
Expand Down Expand Up @@ -191,7 +200,10 @@ class _DesktopHistoryScreenState extends State<DesktopHistoryScreen>
? Center(
child: Text(
TextStrings().noFilesRecieved,
style: TextStyle(fontSize: 15.toFont),
style: TextStyle(
fontSize: 15.toFont,
fontWeight: FontWeight.normal,
),
),
)
: ListView.separated(
Expand Down
40 changes: 32 additions & 8 deletions 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 @@ -140,8 +140,11 @@ class _DesktopReceivedFileDetailsState
Icon(Icons.save_alt_outlined, color: Colors.black),
SizedBox(width: 10),
Text(TextStrings().downloadsFolder,
style:
TextStyle(color: Colors.black, fontSize: 12)),
style: TextStyle(
color: Colors.black,
fontSize: 12,
fontWeight: FontWeight.normal,
)),
],
),
),
Expand Down Expand Up @@ -208,6 +211,7 @@ class _DesktopReceivedFileDetailsState
style: TextStyle(
color: Colors.black,
fontSize: 14.toFont,
fontWeight: FontWeight.normal,
),
),
subtitle: Text(
Expand All @@ -222,6 +226,7 @@ class _DesktopReceivedFileDetailsState
style: TextStyle(
color: ColorConstants.fadedText,
fontSize: 14.toFont,
fontWeight: FontWeight.normal,
),
),
leading: FutureBuilder(
Expand Down Expand Up @@ -338,7 +343,10 @@ class _DesktopReceivedFileDetailsState
Navigator.of(context).pop();
},
child: Text(TextStrings().buttonCancel,
style: TextStyle(fontSize: 16.toFont)))
style: TextStyle(
fontSize: 16.toFont,
fontWeight: FontWeight.normal,
)))
],
)
],
Expand Down Expand Up @@ -366,7 +374,11 @@ class _DesktopReceivedFileDetailsState
children: [
TextSpan(
text: TextStrings().fileNamed,
style: TextStyle(color: Colors.black, fontSize: 15.toFont)),
style: TextStyle(
color: Colors.black,
fontSize: 15.toFont,
fontWeight: FontWeight.normal,
)),
TextSpan(
text: '${existingFileNamesToOverwrite[0]}',
style: TextStyle(
Expand All @@ -375,14 +387,22 @@ class _DesktopReceivedFileDetailsState
fontWeight: FontWeight.bold)),
TextSpan(
text: TextStrings().alreadyExistsMsg,
style: TextStyle(color: Colors.black, fontSize: 15.toFont)),
style: TextStyle(
color: Colors.black,
fontSize: 15.toFont,
fontWeight: FontWeight.normal,
)),
],
),
);
} else if (existingFileNamesToOverwrite.length > 1) {
textSpansMessage.add(TextSpan(
text: TextStrings().fileExists,
style: TextStyle(color: Colors.black, fontSize: 15.toFont),
style: TextStyle(
color: Colors.black,
fontSize: 15.toFont,
fontWeight: FontWeight.normal,
),
));

existingFileNamesToOverwrite.forEach((element) {
Expand All @@ -401,8 +421,12 @@ class _DesktopReceivedFileDetailsState
textSpansMessage.add(
TextSpan(
text: TextStrings().overWriteMsg,
style:
TextStyle(color: Colors.black, fontSize: 15.toFont, height: 2)),
style: TextStyle(
color: Colors.black,
fontSize: 15.toFont,
height: 2,
fontWeight: FontWeight.normal,
)),
);
}
return textSpansMessage;
Expand Down
2 changes: 2 additions & 0 deletions lib/desktop_screens/desktop_history/widgets/desktop_sent_file_details.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ class _DesktopSentFileDetailsState extends State<DesktopSentFileDetails> {
style: TextStyle(
color: Colors.black,
fontSize: 14.toFont,
fontWeight: FontWeight.normal,
),
maxLines: 3,
overflow: TextOverflow.ellipsis,
Expand All @@ -96,6 +97,7 @@ class _DesktopSentFileDetailsState extends State<DesktopSentFileDetails> {
style: TextStyle(
color: ColorConstants.fadedText,
fontSize: 14.toFont,
fontWeight: FontWeight.normal,
),
),
leading: InkWell(
Expand Down
Loading