GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-11-23 20:49:26 +01:00
Code Issues Projects Releases Wiki Activity

fix: Minor design

Browse Source
This commit is contained in:
Christian Pauly 2021-05-29 09:56:52 +02:00
parent 00087399f7
commit 035d045d30
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ios/Runner.xcodeproj/project.pbxproj
View File

@ -483,7 +483,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/Flutter",
); );
MARKETING_VERSION = 0.31.0; MARKETING_VERSION = 0.31.2;
PRODUCT_BUNDLE_IDENTIFIER = im.fluffychat.app; PRODUCT_BUNDLE_IDENTIFIER = im.fluffychat.app;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@ -623,7 +623,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/Flutter",
); );
MARKETING_VERSION = 0.31.0; MARKETING_VERSION = 0.31.2;
PRODUCT_BUNDLE_IDENTIFIER = im.fluffychat.app; PRODUCT_BUNDLE_IDENTIFIER = im.fluffychat.app;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@ -657,7 +657,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/Flutter",
); );
MARKETING_VERSION = 0.31.0; MARKETING_VERSION = 0.31.2;
PRODUCT_BUNDLE_IDENTIFIER = im.fluffychat.app; PRODUCT_BUNDLE_IDENTIFIER = im.fluffychat.app;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@ -687,7 +687,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 0.31.0; MARKETING_VERSION = 0.31.2;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "im.fluffychat.app.FluffyChat-Share"; PRODUCT_BUNDLE_IDENTIFIER = "im.fluffychat.app.FluffyChat-Share";
@ -721,7 +721,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 0.31.0; MARKETING_VERSION = 0.31.2;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "im.fluffychat.app.FluffyChat-Share"; PRODUCT_BUNDLE_IDENTIFIER = "im.fluffychat.app.FluffyChat-Share";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
@ -752,7 +752,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 0.31.0; MARKETING_VERSION = 0.31.2;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "im.fluffychat.app.FluffyChat-Share"; PRODUCT_BUNDLE_IDENTIFIER = "im.fluffychat.app.FluffyChat-Share";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";

2
lib/pages/views/homeserver_picker_view.dart
View File

@ -70,7 +70,7 @@ class HomeserverPickerView extends StatelessWidget {
child: controller.isLoading child: controller.isLoading
? LinearProgressIndicator() ? LinearProgressIndicator()
: Text( : Text(
L10n.of(context).connect.toUpperCase(), L10n.of(context).connect,
style: TextStyle(color: Colors.white, fontSize: 16), style: TextStyle(color: Colors.white, fontSize: 16),
), ),
), ),

2
lib/pages/views/login_view.dart
View File

@ -82,7 +82,7 @@ class LoginView extends StatelessWidget {
child: controller.loading child: controller.loading
? LinearProgressIndicator() ? LinearProgressIndicator()
: Text( : Text(
L10n.of(context).login.toUpperCase(), L10n.of(context).login,
style: TextStyle(color: Colors.white, fontSize: 16), style: TextStyle(color: Colors.white, fontSize: 16),
), ),
), ),

2
lib/pages/views/sign_up_password_view.dart
View File

@ -73,7 +73,7 @@ class SignUpPasswordView extends StatelessWidget {
child: controller.loading child: controller.loading
? LinearProgressIndicator() ? LinearProgressIndicator()
: Text( : Text(
L10n.of(context).createAccountNow.toUpperCase(), L10n.of(context).createAccountNow,
style: TextStyle(color: Colors.white, fontSize: 16), style: TextStyle(color: Colors.white, fontSize: 16),
), ),
), ),

6
lib/pages/views/sign_up_view.dart
View File

@ -108,7 +108,7 @@ class SignUpView extends StatelessWidget {
child: controller.loading child: controller.loading
? LinearProgressIndicator() ? LinearProgressIndicator()
: Text( : Text(
L10n.of(context).signUp.toUpperCase(), L10n.of(context).signUp,
style: TextStyle( style: TextStyle(
color: Colors.white, fontSize: 16), color: Colors.white, fontSize: 16),
), ),
@ -147,7 +147,7 @@ class SignUpView extends StatelessWidget {
//elevation: 1, //elevation: 1,
), ),
onPressed: () => context.vRouter.push('/login'), onPressed: () => context.vRouter.push('/login'),
child: Text(L10n.of(context).login.toUpperCase()), child: Text(L10n.of(context).login),
), ),
), ),
if (controller.passwordLoginSupported && if (controller.passwordLoginSupported &&
@ -162,7 +162,7 @@ class SignUpView extends StatelessWidget {
Theme.of(context).textTheme.bodyText1.color, Theme.of(context).textTheme.bodyText1.color,
), ),
onPressed: controller.ssoLoginAction, onPressed: controller.ssoLoginAction,
child: Text(L10n.of(context).useSSO.toUpperCase()), child: Text(L10n.of(context).useSSO),
), ),
), ),
]), ]),

8
lib/widgets/layouts/one_page_card.dart
View File

@ -1,5 +1,6 @@
import 'dart:math'; import 'dart:math';
import 'package:fluffychat/config/themes.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class OnePageCard extends StatelessWidget { class OnePageCard extends StatelessWidget {
@ -8,11 +9,10 @@ class OnePageCard extends StatelessWidget {
const OnePageCard({Key key, this.child}) : super(key: key); const OnePageCard({Key key, this.child}) : super(key: key);
static const int alpha = 12; static const int alpha = 12;
static const int breakpoint = 600; static num breakpoint = FluffyThemes.columnWidth * 2;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return MediaQuery.of(context).size.width <= breakpoint || return MediaQuery.of(context).size.width <= breakpoint
MediaQuery.of(context).size.height <= breakpoint
? child ? child
: Material( : Material(
color: Theme.of(context).backgroundColor, color: Theme.of(context).backgroundColor,
@ -41,7 +41,7 @@ class OnePageCard extends StatelessWidget {
vertical: vertical:
max((MediaQuery.of(context).size.height - 800) / 2, 12), max((MediaQuery.of(context).size.height - 800) / 2, 12),
), ),
child: SafeArea(child: Card(child: child)), child: SafeArea(child: Card(elevation: 1, child: child)),
), ),
); );
} }