Skip to content

Commit

Permalink
💄 Improve UI
Browse files Browse the repository at this point in the history
  • Loading branch information
redDwarf03 committed Dec 10, 2023
1 parent 290a65a commit 49afdd9
Show file tree
Hide file tree
Showing 34 changed files with 911 additions and 714 deletions.
55 changes: 28 additions & 27 deletions assets/images/AELogo-Public Blockchain-White.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 7 additions & 6 deletions assets/images/AELogo.svg
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/background-welcome-gradient.png
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/logo_crystal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 0 additions & 4 deletions lib/l10n/intl_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,6 @@
"btn_decline": "I decline",
"betaVersionMaxFiles": "During the beta phase, please note that the maximum file upload size should not exceed 3 MB.",
"logout": "Logout",
"archethicDashboardMenuBridgeItem": "Bridge 2 ways",
"archethicDashboardMenuBridgeDesc": "The portal allowing seamless assets deposits & withdrawals",
"archethicDashboardMenuDEXItem": "DEX",
"archethicDashboardMenuDEXDesc": "SWAP assets on-chain, add liquidity & access LP staking",
"archethicDashboardMenuWalletOnWayItem": "Archethic Wallet",
"archethicDashboardMenuWalletOnWayDesc": "Securely store, transfer and swap tokens and collectibles",
"addWebsite": "Add a website",
Expand Down
3 changes: 0 additions & 3 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ class MyApp extends ConsumerWidget {

@override
Widget build(BuildContext context, WidgetRef ref) {
// TODO(reddwarf03): use LanguageProviders
//const language = AvailableLanguage.english;

// GoRouter configuration
final _router = GoRouter(
routes: RoutesPath().aeWebRoutes(ref),
Expand Down
9 changes: 9 additions & 0 deletions lib/ui/themes/aeweb_theme_base.dart
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,15 @@ class AeWebThemeBase {
stops: [0, 1],
);

static Gradient gradientWelcomeTxt = LinearGradient(
colors: [
const Color(0xFF562FED).withOpacity(0.8),
const Color(0xFFD55CFF).withOpacity(0.8),
],
begin: Alignment.topLeft,
end: Alignment.bottomRight,
);

static Gradient gradientBtn = LinearGradient(
colors: <Color>[
ArchethicThemeBase.blue500,
Expand Down
44 changes: 34 additions & 10 deletions lib/ui/views/add_website/layouts/add_website_sheet.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/// SPDX-License-Identifier: AGPL-3.0-or-later
import 'dart:async';
import 'dart:ui';

import 'package:aeweb/application/session/provider.dart';
import 'package:aeweb/domain/repositories/features_flags.dart';
import 'package:aeweb/ui/themes/aeweb_theme_base.dart';
import 'package:aeweb/ui/views/add_website/bloc/provider.dart';
import 'package:aeweb/ui/views/add_website/bloc/state.dart';
import 'package:aeweb/ui/views/add_website/layouts/components/add_website_form_sheet.dart';
Expand Down Expand Up @@ -75,17 +77,39 @@ class AddWebsiteSheet extends ConsumerWidget {
);

return Scaffold(
appBar: AppBar(
centerTitle: true,
title: Text(
AppLocalizations.of(context)!.addWebSiteFormTitle,
),
actions: const [
ConnectionToWalletStatus(),
SizedBox(
width: 10,
extendBodyBehindAppBar: true,
extendBody: true,
appBar: PreferredSize(
preferredSize: const Size.fromHeight(70),
child: ClipRRect(
child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 10, sigmaY: 10),
child: Padding(
padding: const EdgeInsets.only(top: 8),
child: AppBar(
bottom: PreferredSize(
preferredSize: const Size.fromHeight(1),
child: Container(
color: ArchethicThemeBase.neutral0.withOpacity(0.2),
height: 1,
),
),
centerTitle: true,
backgroundColor: Colors.transparent,
elevation: 0,
title: Text(
AppLocalizations.of(context)!.addWebSiteFormTitle,
),
actions: const [
ConnectionToWalletStatus(),
SizedBox(
width: 10,
),
],
),
),
),
],
),
),
body: const AddWebsiteFormSheet(),
floatingActionButton: session.isConnected
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'package:aeweb/ui/views/add_website/layouts/components/add_website_select
import 'package:aeweb/ui/views/add_website/layouts/components/add_website_select_zip_file.dart';
import 'package:aeweb/ui/views/add_website/layouts/components/add_website_switch_gitignore.dart';
import 'package:aeweb/ui/views/add_website/layouts/components/add_website_textfield_name.dart';
import 'package:aeweb/ui/views/util/components/main_background.dart';
import 'package:aeweb/ui/views/util/components/aeweb_background.dart';
import 'package:aeweb/ui/views/util/components/scrollbar.dart';
import 'package:aeweb/ui/views/util/iconsax.dart';
import 'package:aeweb/ui/views/util/warning_size_label.dart';
Expand All @@ -26,7 +26,7 @@ class AddWebsiteFormSheet extends ConsumerWidget {

return Stack(
children: [
const MainBackground(),
const AEWebBackground(),
ArchethicScrollbar(
child: Padding(
padding: const EdgeInsets.symmetric(
Expand All @@ -35,6 +35,7 @@ class AddWebsiteFormSheet extends ConsumerWidget {
),
child: Center(
child: Container(
padding: const EdgeInsets.only(top: 100),
constraints: const BoxConstraints(maxWidth: 820),
child: Column(
children: [
Expand Down
38 changes: 32 additions & 6 deletions lib/ui/views/display_website/explorer_files.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
/// SPDX-License-Identifier: AGPL-3.0-or-later
import 'dart:ui';

import 'package:aeweb/ui/themes/aeweb_theme_base.dart';
import 'package:aeweb/ui/views/util/components/aeweb_background.dart';
import 'package:aeweb/ui/views/util/components/icon_animated.dart';
import 'package:aeweb/ui/views/util/components/main_background.dart';
import 'package:aeweb/ui/views/util/iconsax.dart';
import 'package:aeweb/util/generic/get_it_instance.dart';
import 'package:archethic_lib_dart/archethic_lib_dart.dart' as archethic;
Expand Down Expand Up @@ -133,15 +136,37 @@ class ExplorerFilesScreenState extends ConsumerState<ExplorerFilesScreen> {
);

return Scaffold(
appBar: AppBar(
centerTitle: true,
title: Text(
AppLocalizations.of(context)!.explorerTitle,
extendBodyBehindAppBar: true,
extendBody: true,
appBar: PreferredSize(
preferredSize: const Size.fromHeight(70),
child: ClipRRect(
child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 10, sigmaY: 10),
child: Padding(
padding: const EdgeInsets.only(top: 8),
child: AppBar(
bottom: PreferredSize(
preferredSize: const Size.fromHeight(1),
child: Container(
color: ArchethicThemeBase.neutral0.withOpacity(0.2),
height: 1,
),
),
centerTitle: true,
backgroundColor: Colors.transparent,
elevation: 0,
title: Text(
AppLocalizations.of(context)!.explorerTitle,
),
),
),
),
),
),
body: Stack(
children: [
const MainBackground(),
const AEWebBackground(),
Padding(
padding: const EdgeInsets.only(
left: 30,
Expand All @@ -151,6 +176,7 @@ class ExplorerFilesScreenState extends ConsumerState<ExplorerFilesScreen> {
),
child: Center(
child: Container(
padding: const EdgeInsets.only(top: 100),
constraints: const BoxConstraints(maxWidth: 820),
child: TreeView(
controller: treeViewController,
Expand Down
Loading

0 comments on commit 49afdd9

Please sign in to comment.