Skip to content

Commit

Permalink
Merge branch 'lint/role-chip' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
@poppingmoon
poppingmoon committed Jan 4, 2024
2 parents 4e6aed6 + 160c109 commit c016106
Show file tree
Hide file tree
Showing 4 changed files with 168 additions and 56 deletions.
42 changes: 42 additions & 0 deletions lib/extensions/string_extensions.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,46 @@ extension StringExtensions on String {
.replaceAll(Characters(''), Characters('\u{200B}'))
.toString();
}

Color? toColor() {
final code = startsWith("#") ? substring(1) : this;
switch (code.length) {
case 3:
final rgb = code
.split("")
.map((c) => int.tryParse(c, radix: 16))
.nonNulls
.map((i) => i * 16 + i)
.toList();
if (rgb.length == 3) {
return Color.fromRGBO(rgb[0], rgb[1], rgb[2], 1);
}
case 4:
final argb = code
.split("")
.map((c) => int.tryParse(c, radix: 16))
.nonNulls
.map((i) => i * 16 + i)
.toList();
if (argb.length != 4) {
return Color.fromARGB(argb[0], argb[1], argb[2], argb[3]);
}
case 6:
final hex = int.tryParse(code, radix: 16);
if (hex != null) {
return Color(hex + 0xFF000000);
}
case 8:
final hex = int.tryParse(
"${code.substring(6)}${code.substring(0, 6)}",
radix: 16,
);
if (hex != null) {
return Color(hex);
}
default:
return null;
}
return null;
}
}
32 changes: 4 additions & 28 deletions lib/model/color_theme.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'dart:ui';

import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:miria/extensions/color_extension.dart';
import 'package:miria/extensions/string_extensions.dart';
import 'package:miria/model/misskey_theme.dart';

part 'color_theme.freezed.dart';
Expand Down Expand Up @@ -80,34 +81,9 @@ class ColorTheme with _$ColorTheme {
return Color.fromRGBO(rgb[0], rgb[1], rgb[2], opacity);
}

final code = (input.startsWith("#") ? input.substring(1) : input);

if (code.length == 3) {
final rgb = code
.split("")
.map((c) => int.parse(c, radix: 16))
.map((i) => i * 16 + i)
.toList();
return Color.fromRGBO(rgb[0], rgb[1], rgb[2], 1);
}
if (code.length == 4) {
final argb = code
.split("")
.map((c) => int.parse(c, radix: 16))
.map((i) => i * 16 + i)
.toList();
return Color.fromARGB(argb[0], argb[1], argb[2], argb[3]);
}
if (code.length == 6) {
return Color(int.parse(code, radix: 16) + 0xFF000000);
}
if (code.length == 8) {
return Color(
int.parse(
"${code.substring(6)}${code.substring(0, 6)}",
radix: 16,
),
);
final color = input.toColor();
if (color != null) {
return color;
}

throw FormatException("invalid color format", val);
Expand Down
81 changes: 61 additions & 20 deletions lib/view/explore_page/explore_role_users_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:miria/model/account.dart';
import 'package:miria/providers.dart';
import 'package:miria/view/common/account_scope.dart';
import 'package:miria/view/common/misskey_notes/misskey_note.dart';
import 'package:miria/view/common/pushable_listview.dart';
import 'package:miria/view/user_page/user_list_item.dart';
import 'package:misskey_dart/misskey_dart.dart';
Expand All @@ -21,26 +22,66 @@ class ExploreRoleUsersPage extends ConsumerWidget {

@override
Widget build(BuildContext context, WidgetRef ref) {
return AccountScope(
account: account,
child: Scaffold(
appBar: AppBar(title: Text(item.name)),
body: PushableListView(
initializeFuture: () async {
final response = await ref
.read(misskeyProvider(account))
.roles
.users(RolesUsersRequest(roleId: item.id));
return response.toList();
},
nextFuture: (lastItem, _) async {
final response =
await ref.read(misskeyProvider(account)).roles.users(
RolesUsersRequest(roleId: item.id, untilId: lastItem.id),
);
return response.toList();
},
itemBuilder: (context, item) => UserListItem(user: item.user),
return DefaultTabController(
length: 2,
child: AccountScope(
account: account,
child: Scaffold(
appBar: AppBar(
title: Text(item.name),
bottom: const TabBar(
tabs: [
Tab(text: "ユーザー"),
Tab(text: "タイムライン"),
],
),
),
body: TabBarView(
children: [
PushableListView(
initializeFuture: () async {
final response = await ref
.read(misskeyProvider(account))
.roles
.users(RolesUsersRequest(roleId: item.id));
return response.toList();
},
nextFuture: (lastItem, _) async {
final response =
await ref.read(misskeyProvider(account)).roles.users(
RolesUsersRequest(
roleId: item.id,
untilId: lastItem.id,
),
);
return response.toList();
},
itemBuilder: (context, item) => UserListItem(user: item.user),
),
PushableListView(
initializeFuture: () async {
final response = await ref
.read(misskeyProvider(account))
.roles
.notes(RolesNotesRequest(roleId: item.id));
ref.read(notesProvider(account)).registerAll(response);
return response.toList();
},
nextFuture: (lastItem, _) async {
final response =
await ref.read(misskeyProvider(account)).roles.notes(
RolesNotesRequest(
roleId: item.id,
untilId: lastItem.id,
),
);
ref.read(notesProvider(account)).registerAll(response);
return response.toList();
},
itemBuilder: (context, note) => MisskeyNote(note: note),
),
],
),
),
),
);
Expand Down
69 changes: 61 additions & 8 deletions lib/view/user_page/user_detail.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:miria/extensions/date_time_extension.dart';
import 'package:miria/extensions/string_extensions.dart';
import 'package:miria/extensions/user_extension.dart';
import 'package:miria/model/account.dart';
import 'package:miria/providers.dart';
Expand All @@ -15,6 +16,7 @@ import 'package:miria/view/common/error_detail.dart';
import 'package:miria/view/common/error_dialog_handler.dart';
import 'package:miria/view/common/misskey_notes/mfm_text.dart';
import 'package:miria/view/common/misskey_notes/misskey_note.dart';
import 'package:miria/view/common/misskey_notes/network_image.dart';
import 'package:miria/view/dialogs/simple_confirm_dialog.dart';
import 'package:miria/view/themes/app_theme.dart';
import 'package:miria/view/user_page/update_memo_dialog.dart';
Expand Down Expand Up @@ -306,14 +308,7 @@ class UserDetailState extends ConsumerState<UserDetail> {
runSpacing: 5,
children: [
for (final role in user.roles ?? <UserRole>[])
Container(
decoration: BoxDecoration(
border:
Border.all(color: Theme.of(context).dividerColor),
),
padding: const EdgeInsets.all(5),
child: Text(role.name),
),
RoleChip(role: role),
],
),
const Padding(padding: EdgeInsets.only(top: 5)),
Expand Down Expand Up @@ -616,3 +611,61 @@ class BirthdayConfettiState extends State<BirthdayConfetti> {
return widget.child;
}
}

class RoleChip extends ConsumerWidget {
const RoleChip({super.key, required this.role});

final UserRole role;

@override
Widget build(BuildContext context, WidgetRef ref) {
final account = AccountScope.of(context);
final textStyle = Theme.of(context).textTheme.bodyMedium;
final height = MediaQuery.textScalerOf(context)
.scale((textStyle?.fontSize ?? 14) * (textStyle?.height ?? 1));
return Tooltip(
message: role.description,
child: GestureDetector(
onTap: () async {
final response = await ref
.read(misskeyProvider(account))
.roles
.show(RolesShowRequest(roleId: role.id));
if (response.isPublic && response.isExplorable) {
if (!context.mounted) return;
context.pushRoute(
ExploreRoleUsersRoute(item: response, account: account),
);
}
},
child: Container(
decoration: BoxDecoration(
border: Border.all(
color: role.color?.toColor() ?? Theme.of(context).dividerColor,
),
borderRadius: BorderRadius.circular(height),
),
padding: const EdgeInsets.symmetric(
vertical: 5,
horizontal: 10,
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
if (role.iconUrl != null)
Padding(
padding: const EdgeInsets.only(right: 5),
child: NetworkImageView(
url: role.iconUrl!.toString(),
type: ImageType.role,
height: height,
),
),
Text(role.name),
],
),
),
),
);
}
}

0 comments on commit c016106

Please sign in to comment.