Nexus/nexus
Nexus/nexus
Watch
4
5
Fork
You've already forked nexus
 6
Code Issues 15 Pull requests 1 Projects Releases Packages Wiki Activity

Compare commits

base: Nexus:85ce14f1937e7f8d99c64c7e7ce71954639a723b
Branches Tags
Nexus:main
..
compare: Nexus:d25d24a692140c857cf4eb62dadf2efb49e438e5
Branches Tags
Nexus:main
Author SHA1 Message Date
Erwan Leboucher
d25d24a692 Consolidate getXCodeSDK/getXCodeClang into a single getXCodeTool 2026-08-08 16:31:19 -04:00
Erwan Leboucher
90a5579e7c Apply the same Nix lipo workaround to iOS 2026-08-08 16:31:19 -04:00
Erwan Leboucher
f3787d7f83 Handle xcrun failures via getXCodeSDK/getXCodeClang helpers 2026-08-08 16:31:19 -04:00
Erwan Leboucher
f3ea9d67a6 Fix macOS build on Nix-provided Flutter 2026-08-08 16:31:19 -04:00
Erwan Leboucher
606bf78152 feat: Add iOS platform support 2026-08-08 16:31:19 -04:00
Henry-Hiles
bf31f5510a
 		make room dialog scrollable 2026-08-08 16:21:58 -04:00
Henry-Hiles
bd185824f9
 		set loading when waiting for token exchange 2026-08-08 16:18:54 -04:00
Henry-Hiles
2afd5ae258
 		put account data keys in model 2026-08-08 16:14:11 -04:00
4 changed files with 73 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/controllers/settings_sections.dart
View file

@ -130,7 +130,7 @@ class SettingsSectionsController
.watch(ClientController.provider.notifier) .watch(ClientController.provider.notifier)
.setAccountData( .setAccountData(
.new( .new(
type: InvitePermissionConfig.key, type: AccountData.invitePermissionConfigKey,
content: InvitePermissionConfig( content: InvitePermissionConfig(
defaultAction: value, defaultAction: value,
), ),

12
lib/models/account_data.dart
View file

@ -15,17 +15,21 @@ abstract class AccountData with _$AccountData {
IList<RecentEmoji> recentEmoji, IList<RecentEmoji> recentEmoji,
) => {"recent_emoji": recentEmoji.map((emoji) => emoji.toJson()).toList()}; ) => {"recent_emoji": recentEmoji.map((emoji) => emoji.toJson()).toList()};
static const invitePermissionConfigKey = "m.invite_permission_config";
static const directKey = "m.direct";
static const recentEmojiKey = "m.recent_emoji";
const factory AccountData({ const factory AccountData({
@JsonKey(name: InvitePermissionConfig.key) @JsonKey(name: AccountData.invitePermissionConfigKey)
@Default(InvitePermissionConfig()) @Default(InvitePermissionConfig())
InvitePermissionConfig invitePermissionConfig, InvitePermissionConfig invitePermissionConfig,
@JsonKey(name: "m.direct") @JsonKey(name: AccountData.directKey)
@Default(IMap.empty()) @Default(IMap.empty())
IMap<String, IList<String>> directMessages, IMap<String, IList<String>> directMessages,
@JsonKey( @JsonKey(
name: "m.recent_emoji", name: AccountData.recentEmojiKey,
readValue: AccountData.readRecentEmojiValue, readValue: AccountData.readRecentEmojiValue,
toJson: AccountData.recentEmojiToJson, toJson: AccountData.recentEmojiToJson,
) )
@ -39,8 +43,6 @@ abstract class AccountData with _$AccountData {
@freezed @freezed
abstract class InvitePermissionConfig with _$InvitePermissionConfig { abstract class InvitePermissionConfig with _$InvitePermissionConfig {
static const key = "m.invite_permission_config";
const factory InvitePermissionConfig({ const factory InvitePermissionConfig({
@JsonKey(unknownEnumValue: DefaultInviteAction.allow) @JsonKey(unknownEnumValue: DefaultInviteAction.allow)
@Default(DefaultInviteAction.allow) @Default(DefaultInviteAction.allow)

41
lib/pages/select_server.dart
View file

@ -60,27 +60,32 @@ class SelectServerPage extends HookConsumerWidget {
AppLinks().uriLinkStream.listen((encodedUri) async { AppLinks().uriLinkStream.listen((encodedUri) async {
final state = encodedUri.queryParameters["state"]; final state = encodedUri.queryParameters["state"];
if (state != codeResponse.state) return; if (state != codeResponse.state) return;
isLoading.value = true;
final code = encodedUri.queryParameters["code"]; try {
final code = encodedUri.queryParameters["code"];
if (code != null) { if (code != null) {
await ref await ref
.watch(ClientController.provider.notifier) .watch(ClientController.provider.notifier)
.exchangeToken( .exchangeToken(
.new( .new(
homeserverUrl: newUrl, homeserverUrl: newUrl,
codeVerifier: codeResponse.codeVerifier, codeVerifier: codeResponse.codeVerifier,
redirectUri: .new( redirectUri: .new(
scheme: "nexus.federated.nexus", scheme: "nexus.federated.nexus",
path: "/", path: "/",
),
code: code,
clientId: await ref.watch(
ClientIdController.provider(newUrl).future,
),
), ),
code: code, )
clientId: await ref.watch( .onError(showError);
ClientIdController.provider(newUrl).future, }
), } finally {
), isLoading.value = false;
)
.onError(showError);
} }
}); });
} }

80
lib/widgets/room_appbar.dart
View file

@ -40,48 +40,52 @@ class RoomAppbar extends ConsumerWidget implements PreferredSizeWidget {
constraints: .loose(.fromWidth(400)), constraints: .loose(.fromWidth(400)),
child: Padding( child: Padding(
padding: .all(24), padding: .all(24),
child: Column( child: SingleChildScrollView(
mainAxisSize: .min, child: Column(
crossAxisAlignment: .start, mainAxisSize: .min,
spacing: 8, crossAxisAlignment: .start,
children: [ spacing: 8,
Row( children: [
spacing: 12, Row(
mainAxisSize: .min, spacing: 12,
children: [ mainAxisSize: .min,
if (room.metadata?.avatar != null) children: [
ExpandableImage( if (room.metadata?.avatar != null)
room.metadata?.avatar == null ExpandableImage(
? null room.metadata?.avatar == null
: .new(mxc: room.metadata!.avatar!), ? null
child: AvatarOrHash( : .new(mxc: room.metadata!.avatar!),
room.metadata?.avatar, child: AvatarOrHash(
room.metadata?.avatar,
room.metadata?.name ?? "Unnamed Room",
height: 64,
fallback: Icon(Icons.numbers),
),
),
Expanded(
child: Text(
room.metadata?.name ?? "Unnamed Room", room.metadata?.name ?? "Unnamed Room",
height: 64, overflow: .ellipsis,
fallback: Icon(Icons.numbers), maxLines: 3,
), style: Theme.of(
),
Expanded(
child: Text(
room.metadata?.name ?? "Unnamed Room",
overflow: .ellipsis,
maxLines: 3,
style: Theme.of(context).textTheme.headlineSmall,
),
),
],
),
if (room.metadata?.topic?.isNotEmpty == true)
LinkifiedText(
room.metadata!.topic!,
style: Theme.of(context).textTheme.bodyLarge
?.copyWith(
color: Theme.of(
context, context,
).colorScheme.onSurfaceVariant, ).textTheme.headlineSmall,
), ),
),
],
), ),
], if (room.metadata?.topic?.isNotEmpty == true)
LinkifiedText(
room.metadata!.topic!,
style: Theme.of(context).textTheme.bodyLarge
?.copyWith(
color: Theme.of(
context,
).colorScheme.onSurfaceVariant,
),
),
],
),
), ),
), ),
), ),