ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update archive text, change floating action button to more visible button in new space view

Browse source
This commit is contained in:
ggurdin 2023-11-30 15:19:43 -05:00
parent 294d5a2e66
commit 4d6b63d8d9
4 changed files with 235 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
assets/l10n/intl_en.arb
View file

@ -3938,5 +3938,8 @@
"groupName": "Group name",
"createGroupAndInviteUsers": "Create a group and invite users",
"groupCanBeFoundViaSearch": "Group can be found via search",
"inNoSpaces": "You are not a member of any classes or exchanges"
"inNoSpaces": "You are not a member of any classes or exchanges",
"createClass": "Create class",
"createExchange": "Create exchange",
"viewArchive": "View Archive"
}

23
lib/pages/chat_list/client_chooser_button.dart
View file

@ -1,23 +1,22 @@
// Dart imports:
import 'dart:developer';
// Flutter imports:
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
// Package imports:
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:go_router/go_router.dart';
import 'package:keyboard_shortcuts/keyboard_shortcuts.dart';
import 'package:matrix/matrix.dart';
// Project imports:
import 'package:fluffychat/pangea/extensions/client_extension.dart';
import 'package:fluffychat/pangea/utils/class_code.dart';
import 'package:fluffychat/pangea/utils/find_conversation_partner_dialog.dart';
import 'package:fluffychat/pangea/utils/logout.dart';
import 'package:fluffychat/widgets/matrix.dart';
// Flutter imports:
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
// Package imports:
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:go_router/go_router.dart';
import 'package:keyboard_shortcuts/keyboard_shortcuts.dart';
import 'package:matrix/matrix.dart';
import '../../utils/fluffy_share.dart';
import 'chat_list.dart';
@ -163,7 +162,7 @@ class ClientChooserButton extends StatelessWidget {
const SizedBox(width: 18),
// #Pangea
// Text(L10n.of(context)!.archive),
Expanded(child: Text(L10n.of(context)!.archive)),
Expanded(child: Text(L10n.of(context)!.viewArchive)),
// Pangea#
],
),

47
lib/pages/new_space/new_space_view.dart
View file

@ -1,10 +1,4 @@
// Flutter imports:
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
// Package imports:
import 'package:flutter_gen/gen_l10n/l10n.dart';
// Project imports:
import 'package:fluffychat/config/app_config.dart';
import 'package:fluffychat/pangea/constants/class_default_values.dart';
@ -13,6 +7,11 @@ import 'package:fluffychat/pangea/widgets/class/add_class_and_invite.dart';
import 'package:fluffychat/pangea/widgets/class/add_space_toggles.dart';
import 'package:fluffychat/pangea/widgets/space/class_settings.dart';
import 'package:fluffychat/widgets/layouts/max_width_body.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
// Package imports:
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'new_space.dart';
class NewSpaceView extends StatelessWidget {
@ -98,7 +97,6 @@ class NewSpaceView extends StatelessWidget {
roomId: null,
startOpen: false,
),
const SizedBox(height: 45),
// SwitchListTile.adaptive(
// title: Text(L10n.of(context)!.spaceIsPublic),
// value: controller.publicGroup,
@ -111,14 +109,41 @@ class NewSpaceView extends StatelessWidget {
// ),
// subtitle: Text(L10n.of(context)!.newSpaceDescription),
// ),
Padding(
padding: const EdgeInsets.all(16.0),
child: SizedBox(
width: double.infinity,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
foregroundColor: Theme.of(context).colorScheme.onPrimary,
backgroundColor: Theme.of(context).colorScheme.primary,
),
onPressed: controller.submitAction,
child: Row(
children: [
Expanded(
child: Text(
controller.newClassMode
? L10n.of(context)!.createClass
: L10n.of(context)!.createExchange,
),
),
Icon(Icons.adaptive.arrow_forward_outlined),
],
),
),
),
),
// Pangea#
],
),
),
floatingActionButton: FloatingActionButton(
onPressed: controller.submitAction,
child: const Icon(Icons.arrow_forward_outlined),
),
// #Pangea
// floatingActionButton: FloatingActionButton(
// onPressed: controller.submitAction,
// child: const Icon(Icons.arrow_forward_outlined),
// ),
// Pangea#
);
}
}

230
needed-translations.txt
View file

@ -756,7 +756,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"bn": [
@ -1521,7 +1524,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"bo": [
@ -2286,7 +2292,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"ca": [
@ -3046,7 +3055,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"cs": [
@ -3806,7 +3818,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"de": [
@ -4566,7 +4581,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"el": [
@ -5331,7 +5349,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"eo": [
@ -6091,7 +6112,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"es": [
@ -6115,7 +6139,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"et": [
@ -6875,7 +6902,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"eu": [
@ -7635,7 +7665,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"fa": [
@ -8395,7 +8428,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"fi": [
@ -9155,7 +9191,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"fr": [
@ -9915,7 +9954,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"ga": [
@ -10675,7 +10717,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"gl": [
@ -11435,7 +11480,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"he": [
@ -12195,7 +12243,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"hi": [
@ -12960,7 +13011,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"hr": [
@ -13720,7 +13774,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"hu": [
@ -14480,7 +14537,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"id": [
@ -15240,7 +15300,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"ie": [
@ -16002,7 +16065,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"it": [
@ -16762,7 +16828,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"ja": [
@ -17522,7 +17591,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"ko": [
@ -18282,7 +18354,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"lt": [
@ -19042,7 +19117,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"lv": [
@ -19807,7 +19885,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"nb": [
@ -20567,7 +20648,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"nl": [
@ -21327,7 +21411,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"pl": [
@ -22087,7 +22174,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"pt": [
@ -22852,7 +22942,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"pt_BR": [
@ -23612,7 +23705,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"pt_PT": [
@ -24372,7 +24468,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"ro": [
@ -25132,7 +25231,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"ru": [
@ -25892,7 +25994,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"sk": [
@ -26653,7 +26758,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"sl": [
@ -27416,7 +27524,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"sr": [
@ -28176,7 +28287,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"sv": [
@ -28936,7 +29050,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"ta": [
@ -29701,7 +29818,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"th": [
@ -30466,7 +30586,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"tr": [
@ -31226,7 +31349,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"uk": [
@ -31986,7 +32112,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"vi": [
@ -32749,7 +32878,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"zh": [
@ -33509,7 +33641,10 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
],
"zh_Hant": [
@ -34269,6 +34404,9 @@
"groupName",
"createGroupAndInviteUsers",
"groupCanBeFoundViaSearch",
"inNoSpaces"
"inNoSpaces",
"createClass",
"createExchange",
"viewArchive"
]
}