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

UI Redesign - Mobile - Trusted Senders #234

Closed
wants to merge 9 commits into from
Closed

UI Redesign - Mobile - Trusted Senders #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a9b879f
fix: sharing intent problem on android
Sardar1208 Sep 11, 2022
5bf1dae
Merge pull request #191 from atsign-foundation/fix/sharing_intent
sachins-geekyants Sep 26, 2022
67b8d99
build: release 1.0.8.49
sachins-geekyants Sep 26, 2022
2cf2e01
Merge pull request #210 from atsign-foundation/release_1.0.8.49
sachins-geekyants Sep 27, 2022
a98cf4b
chore: made width constant for adding contacts
Pritam-deb Sep 27, 2022
bc44b94
chore: adjusted the height of add contact
Pritam-deb Sep 27, 2022
faf501d
Merge pull request #223 from atsign-foundation/fix/add_unknown_contact
nitesh2599 Sep 29, 2022
dffed1d
UI Redesign - Mobile - Trusted Senders Screen
Jainakin Oct 6, 2022
6220eb1
UI Redesign - Mobile - Blocked atSign Screen
Jainakin Oct 6, 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
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
android:icon="@mipmap/ic_launcher">
<activity
android:name=".MainActivity"
android:launchMode="singleTop"
android:launchMode="singleTask"
android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true"
Expand Down
Binary file added assets/fonts/Inter/Inter-Black.ttf
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/Inter/Inter-Bold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/Inter/Inter-ExtraBold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/Inter/Inter-ExtraLight.ttf
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/Inter/Inter-Light.ttf
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/Inter/Inter-Medium.ttf
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/Inter/Inter-Regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/Inter/Inter-SemiBold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/Inter/Inter-Thin.ttf
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/Montserrat/Montserrat-Medium.ttf
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/Montserrat/Montserrat-SemiBold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added assets/images/add_icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/block_icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/confirm_icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/path_icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/refresh_icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/search_icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/verified_icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ios/Flutter/AppFrameworkInfo.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>9.0</string>
<string>13.0</string>
</dict>
</plist>
10 changes: 2 additions & 8 deletions ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ PODS:
- Flutter
- flutter_local_notifications (0.0.1):
- Flutter
- flutter_qr_reader (0.0.1):
- Flutter
- fluttertoast (0.0.2):
- Flutter
- Toast
Expand Down Expand Up @@ -123,7 +121,6 @@ DEPENDENCIES:
- flutter_image_compress (from `.symlinks/plugins/flutter_image_compress/ios`)
- flutter_keychain (from `.symlinks/plugins/flutter_keychain/ios`)
- flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
- flutter_qr_reader (from `.symlinks/plugins/flutter_qr_reader/ios`)
- fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
- open_file (from `.symlinks/plugins/open_file/ios`)
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
Expand Down Expand Up @@ -175,8 +172,6 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/flutter_keychain/ios"
flutter_local_notifications:
:path: ".symlinks/plugins/flutter_local_notifications/ios"
flutter_qr_reader:
:path: ".symlinks/plugins/flutter_qr_reader/ios"
fluttertoast:
:path: ".symlinks/plugins/fluttertoast/ios"
open_file:
Expand Down Expand Up @@ -215,11 +210,10 @@ SPEC CHECKSUMS:
DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
emoji_picker_flutter: df19dac03a2b39ac667dc8d1da939ef3a9e21347
file_picker: 817ab1d8cd2da9d2da412a417162deee3500fc95
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
flutter_image_compress: 5a5e9aee05b6553048b8df1c3bc456d0afaac433
flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452
flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
flutter_qr_reader: d930dde3b2cfe2b3d0bb7d66e5ff3e514300a5e5
fluttertoast: 16fbe6039d06a763f3533670197d01fc73459037
libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc
Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
Expand All @@ -241,6 +235,6 @@ SPEC CHECKSUMS:
video_thumbnail: c4e2a3c539e247d4de13cd545344fd2d26ffafd1
webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f

PODFILE CHECKSUM: db8a7794fb1b0bee1e3803fed876c7cf9577099b
PODFILE CHECKSUM: db1b3d34103b9bca35e1d0bca266af8024bec0bc

COCOAPODS: 1.11.3
12 changes: 6 additions & 6 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 = 48;
CURRENT_PROJECT_VERSION = 49;
DEVELOPMENT_TEAM = 5XUSS6C2DF;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = "Share Extension/Info.plist";
Expand Down Expand Up @@ -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 = 48;
CURRENT_PROJECT_VERSION = 49;
DEVELOPMENT_TEAM = 5XUSS6C2DF;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = "Share Extension/Info.plist";
Expand Down Expand Up @@ -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 = 48;
CURRENT_PROJECT_VERSION = 49;
DEVELOPMENT_TEAM = 5XUSS6C2DF;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = "Share Extension/Info.plist";
Expand Down Expand Up @@ -560,7 +560,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 48;
CURRENT_PROJECT_VERSION = 49;
DEVELOPMENT_TEAM = 5XUSS6C2DF;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -708,7 +708,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 48;
CURRENT_PROJECT_VERSION = 49;
DEVELOPMENT_TEAM = 5XUSS6C2DF;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -747,7 +747,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 48;
CURRENT_PROJECT_VERSION = 49;
DEVELOPMENT_TEAM = 5XUSS6C2DF;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand Down
227 changes: 227 additions & 0 deletions lib/screens/blocked_atSing_screen/blocked_atSigns_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,227 @@
import 'package:flutter/material.dart';
import 'components/unblock_button.dart';
import 'components/close_pill_button.dart';
import 'components/search_field.dart';

class BlockedAtSignsScreen extends StatelessWidget {
const BlockedAtSignsScreen({Key? key}) : super(key: key);

@override
Widget build(BuildContext context) {
final blockedData = [
'@airplanes45',
'@bikes13',
'@cars69',
];

return Container(
color: Colors.transparent,
child: Container(
height: 780.0,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: const BorderRadius.only(
topLeft: Radius.circular(20.0),
topRight: Radius.circular(20.0),
),
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.25),
blurRadius: 61,
offset: const Offset(0, -2),
),
],
),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 27, vertical: 0),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Padding(
padding: const EdgeInsets.only(top: 38),
child: Container(
height: 2.0,
width: 45,
color: Colors.black,
),
),
const Padding(
padding: EdgeInsets.only(top: 30),
child: ClosePillButton(),
),
],
),
const Padding(
padding: EdgeInsets.only(top: 20),
child: Text(
'Blocked atSigns',
style: TextStyle(
color: Colors.black,
fontFamily: 'Inter',
fontWeight: FontWeight.w700,
fontSize: 25,
),
),
),
const SizedBox(height: 30.0),
Container(
height: 95,
width: double.infinity,
decoration: BoxDecoration(
color: const Color(0xFFF2F2F2),
borderRadius: BorderRadius.circular(8.0),
),
child: Padding(
padding: const EdgeInsets.only(left: 14.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: const [
Text(
'Refresh',
style: TextStyle(
color: Color(0xFFA4A4A5),
fontFamily: 'Montserrat',
fontWeight: FontWeight.w600,
fontSize: 14,
),
),
SizedBox(width: 10.58),
Text(
'Search',
style: TextStyle(
color: Color(0xFFA4A4A5),
fontFamily: 'Montserrat',
fontWeight: FontWeight.w600,
fontSize: 14,
),
),
],
),
const SizedBox(height: 5.0),
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
GestureDetector(
onTap: () {
// tap function here
},
child: Container(
height: 48.0,
width: 48.0,
decoration: BoxDecoration(
color: Colors.white,
border: Border.all(
color: const Color(0xFF939393),
width: 1.0,
),
borderRadius: BorderRadius.circular(10.0),
),
child: const ImageIcon(
AssetImage("assets/images/confirm_icon.png"),
color: Color(0xFF939393),
size: 16.68,
),
),
),
const SizedBox(width: 23.0),
const SearchField(
height: 48.0,
width: 265.0,
label: 'Search History by atSign')
],
),
],
),
),
),
const SizedBox(height: 27.0),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 4.5),
child: Container(
height: 37.0,
decoration: const BoxDecoration(
color: Color(0xFFF2F2F2),
borderRadius: BorderRadius.only(
topLeft: Radius.circular(10.0),
topRight: Radius.circular(10.0),
),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
const SizedBox(width: 24.0),
const Text(
'atSign',
style: TextStyle(
color: Color(0xFFA4A4A5),
fontFamily: 'Inter',
fontWeight: FontWeight.w500,
fontSize: 15,
),
),
const SizedBox(width: 5.67),
GestureDetector(
onTap: () {
// tap function here
},
child: const ImageIcon(
AssetImage("assets/images/path_icon.png"),
color: Color(0xFFA4A4A5),
size: 13.33,
),
),
],
),
),
),
ListView.builder(
scrollDirection: Axis.vertical,
shrinkWrap: true,
itemCount: blockedData.length,
itemBuilder: (BuildContext context, int index) {
final blocked = blockedData[index];
return Container(
height: 50.0,
padding: const EdgeInsets.only(left: 19.0, right: 48.0),
decoration: const BoxDecoration(
border: Border(
bottom: BorderSide(
width: 1.0,
color: Color(0xFFF2F2F2),
)
)
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
blocked,
style: const TextStyle(
color: Color(0xFF414141),
fontFamily: 'Montserrat',
fontWeight: FontWeight.w500,
fontSize: 13,
),
),
UnblockButton(atSign: blocked),
],
),
);
},
),
],
),
),
),
);
}
}
36 changes: 36 additions & 0 deletions lib/screens/blocked_atSing_screen/components/close_pill_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import 'package:flutter/material.dart';

class ClosePillButton extends StatelessWidget {
const ClosePillButton({Key? key}) : super(key: key);

@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: () {
Navigator.pop(context);
},
child: Container(
height: 31.0,
width: 106.0,
decoration: BoxDecoration(
border: Border.all(
color: const Color(0xFF939393),
width: 1.0,
),
borderRadius: BorderRadius.circular(20),
),
child: const Center(
child: Text(
'close',
style: TextStyle(
color: Color(0xFF939393),
fontFamily: 'Inter',
fontWeight: FontWeight.w600,
fontSize: 17.0,
),
),
),
),
);
}
}
Loading