merge main
This commit is contained in:
@@ -92,11 +92,11 @@ class AppBarProfileInfoBox extends HookConsumerWidget {
|
||||
minLeadingWidth: 50,
|
||||
leading: GestureDetector(
|
||||
onTap: pickUserProfileImage,
|
||||
onDoubleTap: toggleReadonlyMode,
|
||||
onLongPress: toggleReadonlyMode,
|
||||
child: Stack(
|
||||
clipBehavior: Clip.none,
|
||||
children: [
|
||||
buildUserProfileImage(),
|
||||
AbsorbPointer(child: buildUserProfileImage()),
|
||||
if (!isReadonlyModeEnabled)
|
||||
Positioned(
|
||||
bottom: -5,
|
||||
|
||||
@@ -97,29 +97,11 @@ class _ImmichLogoWithText extends StatelessWidget {
|
||||
children: [
|
||||
Builder(
|
||||
builder: (context) {
|
||||
return Badge(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 4),
|
||||
backgroundColor: context.primaryColor,
|
||||
alignment: Alignment.centerRight,
|
||||
offset: const Offset(16, -8),
|
||||
label: Text(
|
||||
'β',
|
||||
style: TextStyle(
|
||||
fontSize: 11,
|
||||
color: context.colorScheme.onPrimary,
|
||||
fontWeight: FontWeight.bold,
|
||||
fontFamily: 'OverpassMono',
|
||||
height: 1.2,
|
||||
),
|
||||
),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.only(top: 3.0),
|
||||
child: SvgPicture.asset(
|
||||
context.isDarkTheme
|
||||
? 'assets/immich-logo-inline-dark.svg'
|
||||
: 'assets/immich-logo-inline-light.svg',
|
||||
height: 40,
|
||||
),
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(top: 3.0),
|
||||
child: SvgPicture.asset(
|
||||
context.isDarkTheme ? 'assets/immich-logo-inline-dark.svg' : 'assets/immich-logo-inline-light.svg',
|
||||
height: 40,
|
||||
),
|
||||
);
|
||||
},
|
||||
@@ -157,7 +139,7 @@ class _ProfileIndicator extends ConsumerWidget {
|
||||
|
||||
return InkWell(
|
||||
onTap: () => showDialog(context: context, useRootNavigator: false, builder: (ctx) => const ImmichAppBarDialog()),
|
||||
onDoubleTap: () => toggleReadonlyMode(),
|
||||
onLongPress: () => toggleReadonlyMode(),
|
||||
borderRadius: const BorderRadius.all(Radius.circular(12)),
|
||||
child: Badge(
|
||||
label: Container(
|
||||
@@ -173,7 +155,7 @@ class _ProfileIndicator extends ConsumerWidget {
|
||||
? const Icon(Icons.face_outlined, size: widgetSize)
|
||||
: Semantics(
|
||||
label: "logged_in_as".tr(namedArgs: {"user": user.name}),
|
||||
child: UserCircleAvatar(radius: 17, size: 31, user: user),
|
||||
child: AbsorbPointer(child: UserCircleAvatar(radius: 17, size: 31, user: user)),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user