Skip to content

Commit 945e9b8

Browse files
authored
Mobile appearance foundation (#1366)
1 parent 325b3fd commit 945e9b8

35 files changed

Lines changed: 322 additions & 147 deletions
Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
Copyright (c) 2016 The Inter Project Authors (https://github.com/rsms/inter)
2+
3+
This Font Software is licensed under the SIL Open Font License, Version 1.1.
4+
This license is copied below, and is also available with a FAQ at:
5+
http://scripts.sil.org/OFL
6+
7+
-----------------------------------------------------------
8+
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
9+
-----------------------------------------------------------
10+
11+
PREAMBLE
12+
The goals of the Open Font License (OFL) are to stimulate worldwide
13+
development of collaborative font projects, to support the font creation
14+
efforts of academic and linguistic communities, and to provide a free and
15+
open framework in which fonts may be shared and improved in partnership
16+
with others.
17+
18+
The OFL allows the licensed fonts to be used, studied, modified and
19+
redistributed freely as long as they are not sold by themselves. The
20+
fonts, including any derivative works, can be bundled, embedded,
21+
redistributed and/or sold with any software provided that any reserved
22+
names are not used by derivative works. The fonts and derivatives,
23+
however, cannot be released under any other type of license. The
24+
requirement for fonts to remain under this license does not apply
25+
to any document created using the fonts or their derivatives.
26+
27+
DEFINITIONS
28+
"Font Software" refers to the set of files released by the Copyright
29+
Holder(s) under this license and clearly marked as such. This may
30+
include source files, build scripts and documentation.
31+
32+
"Reserved Font Name" refers to any names specified as such after the
33+
copyright statement(s).
34+
35+
"Original Version" refers to the collection of Font Software components as
36+
distributed by the Copyright Holder(s).
37+
38+
"Modified Version" refers to any derivative made by adding to, deleting,
39+
or substituting -- in part or in whole -- any of the components of the
40+
Original Version, by changing formats or by porting the Font Software to a
41+
new environment.
42+
43+
"Author" refers to any designer, engineer, programmer, technical
44+
writer or other person who contributed to the Font Software.
45+
46+
PERMISSION AND CONDITIONS
47+
Permission is hereby granted, free of charge, to any person obtaining
48+
a copy of the Font Software, to use, study, copy, merge, embed, modify,
49+
redistribute, and sell modified and unmodified copies of the Font
50+
Software, subject to the following conditions:
51+
52+
1) Neither the Font Software nor any of its individual components,
53+
in Original or Modified Versions, may be sold by itself.
54+
55+
2) Original or Modified Versions of the Font Software may be bundled,
56+
redistributed and/or sold with any software, provided that each copy
57+
contains the above copyright notice and this license. These can be
58+
included either as stand-alone text files, human-readable headers or
59+
in the appropriate machine-readable metadata fields within text or
60+
binary files as long as those fields can be easily viewed by the user.
61+
62+
3) No Modified Version of the Font Software may use the Reserved Font
63+
Name(s) unless explicit written permission is granted by the corresponding
64+
Copyright Holder. This restriction only applies to the primary font name as
65+
presented to the users.
66+
67+
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
68+
Software shall not be used to promote, endorse or advertise any
69+
Modified Version, except to acknowledge the contribution(s) of the
70+
Copyright Holder(s) and the Author(s) or with their explicit written
71+
permission.
72+
73+
5) The Font Software, modified or unmodified, in part or in whole,
74+
must be distributed entirely under this license, and must not be
75+
distributed under any other license. The requirement for fonts to
76+
remain under this license does not apply to any document created
77+
using the Font Software.
78+
79+
TERMINATION
80+
This license becomes null and void if any of the above conditions are
81+
not met.
82+
83+
DISCLAIMER
84+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
85+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
86+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
87+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
88+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
89+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
90+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
91+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
92+
OTHER DEALINGS IN THE FONT SOFTWARE.
889 KB
Binary file not shown.
859 KB
Binary file not shown.

‎mobile/lib/app.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ class App extends HookConsumerWidget {
2727
final resolved = resolveSchemes(schemeName);
2828
final lightScheme = applyAccent(resolved.light, accentIndex);
2929
final darkScheme = applyAccent(resolved.dark, accentIndex);
30-
// When a named scheme is selected it forces light or dark mode;
31-
// otherwise respect the user's ThemeMode preference.
30+
// Default and named schemes can force light or dark mode; otherwise
31+
// respect the user's ThemeMode preference.
3232
final effectiveMode = resolved.forcedMode ?? themeMode;
3333

3434
// Eagerly initialize websocket session and lifecycle observer when

‎mobile/lib/features/activity/activity_page.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ class _FeedItemTile extends ConsumerWidget {
162162
onTap: item.channelId != null ? onTap : null,
163163
child: Padding(
164164
padding: const EdgeInsets.symmetric(
165-
horizontal: Grid.xs,
165+
horizontal: Grid.gutter,
166166
vertical: Grid.twelve,
167167
),
168168
child: Column(

‎mobile/lib/features/channels/agent_activity/agent_activity_sheet.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class AgentActivitySheet extends HookConsumerWidget {
7979
return Column(
8080
children: [
8181
Padding(
82-
padding: const EdgeInsets.symmetric(horizontal: Grid.xs),
82+
padding: const EdgeInsets.symmetric(horizontal: Grid.gutter),
8383
child: Column(
8484
crossAxisAlignment: CrossAxisAlignment.start,
8585
children: [
@@ -128,9 +128,9 @@ class AgentActivitySheet extends HookConsumerWidget {
128128
: ListView.builder(
129129
controller: sheetScrollController,
130130
padding: EdgeInsets.fromLTRB(
131-
Grid.xs,
131+
Grid.gutter,
132132
Grid.xxs,
133-
Grid.xs,
133+
Grid.gutter,
134134
bottomPadding,
135135
),
136136
itemCount: transcript.length,

‎mobile/lib/features/channels/channel_detail_page.dart‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -445,8 +445,8 @@ class _MessageList extends HookConsumerWidget {
445445
controller: scrollController,
446446
reverse: true,
447447
padding: EdgeInsets.only(
448-
left: Grid.xs,
449-
right: Grid.xs,
448+
left: Grid.gutter,
449+
right: Grid.gutter,
450450
top: frostedAppBarHeight(context),
451451
bottom: Grid.xxs,
452452
),
@@ -540,7 +540,7 @@ class _MessageList extends HookConsumerWidget {
540540
backgroundColor: context.colors.primaryContainer,
541541
foregroundColor: context.colors.onPrimaryContainer,
542542
padding: const EdgeInsets.symmetric(
543-
horizontal: Grid.xs,
543+
horizontal: Grid.gutter,
544544
vertical: Grid.xxs,
545545
),
546546
),
@@ -969,8 +969,8 @@ class _ReadOnlyNotice extends StatelessWidget {
969969
return Container(
970970
width: double.infinity,
971971
padding: EdgeInsets.only(
972-
left: Grid.xs,
973-
right: Grid.xs,
972+
left: Grid.gutter,
973+
right: Grid.gutter,
974974
top: Grid.xxs,
975975
bottom: MediaQuery.viewPaddingOf(context).bottom + Grid.xxs,
976976
),
@@ -1028,7 +1028,7 @@ class _DetailConnectionBanner extends StatelessWidget {
10281028
return Container(
10291029
width: double.infinity,
10301030
padding: const EdgeInsets.symmetric(
1031-
horizontal: Grid.xs,
1031+
horizontal: Grid.gutter,
10321032
vertical: Grid.quarter + 2,
10331033
),
10341034
color: context.colors.surfaceContainerHighest,
@@ -1082,7 +1082,7 @@ class _TypingIndicator extends ConsumerWidget {
10821082
return Container(
10831083
width: double.infinity,
10841084
padding: const EdgeInsets.symmetric(
1085-
horizontal: Grid.xs,
1085+
horizontal: Grid.gutter,
10861086
vertical: Grid.quarter + 2,
10871087
),
10881088
child: Row(

‎mobile/lib/features/channels/compose_bar.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,8 +366,8 @@ class ComposeBar extends HookConsumerWidget {
366366
: null,
367367
),
368368
padding: EdgeInsets.only(
369-
left: Grid.xs,
370-
right: Grid.xs,
369+
left: Grid.gutter,
370+
right: Grid.gutter,
371371
top: Grid.xs,
372372
bottom: MediaQuery.viewPaddingOf(context).bottom + Grid.twelve,
373373
),

‎mobile/lib/features/channels/emoji_picker.dart‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,9 @@ class _EmojiPickerSheetState extends ConsumerState<EmojiPickerSheet> {
264264
onSelect: widget.onSelect,
265265
)
266266
: GridView.builder(
267-
padding: const EdgeInsets.symmetric(horizontal: Grid.xs),
267+
padding: const EdgeInsets.symmetric(
268+
horizontal: Grid.gutter,
269+
),
268270
gridDelegate:
269271
const SliverGridDelegateWithFixedCrossAxisCount(
270272
crossAxisCount: 8,
@@ -298,7 +300,7 @@ class _CustomEmojiGrid extends StatelessWidget {
298300
@override
299301
Widget build(BuildContext context) {
300302
return GridView.builder(
301-
padding: const EdgeInsets.symmetric(horizontal: Grid.xs),
303+
padding: const EdgeInsets.symmetric(horizontal: Grid.gutter),
302304
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
303305
crossAxisCount: 6,
304306
mainAxisSpacing: Grid.half,

‎mobile/lib/features/channels/manage_channel_sheet.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ class ManageChannelSheet extends HookConsumerWidget {
9898

9999
return Padding(
100100
padding: EdgeInsets.fromLTRB(
101-
Grid.xs,
101+
Grid.gutter,
102102
0,
103-
Grid.xs,
103+
Grid.gutter,
104104
MediaQuery.viewInsetsOf(context).bottom + Grid.xs,
105105
),
106106
child: SafeArea(

0 commit comments

Comments
 (0)