kolo/Casha
1
0
Fork 0
mirror of https://github.com/koloideal/Casha.git synced 2026-06-10 10:25:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

stableee

Browse Source
This commit is contained in:
kolo
2026-03-26 01:03:11 +03:00
parent 8ba9ae0b9f
commit b67dd5b9f6
2 changed files with 100 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/dashboard/widgets/account_editor_overlay/color_panel.dart
+51 -18
View File
@@ -84,8 +84,14 @@ class AccountColorPanel extends StatelessWidget {
Expanded( Expanded(
child: PanelTab( child: PanelTab(
label: s.colorPrimary, label: s.colorPrimary,
isSelected: dashboardState.editingPrimary, isSelected:
color: dashboardState.tempPrimary, dashboardState.editingPrimary && !isSolid,
color: isSolid
? Theme.of(dashboardContext)
.colorScheme
.onSurface
.withOpacity(0.12)
: dashboardState.tempPrimary,
isDimmed: isSolid, isDimmed: isSolid,
onTap: () { onTap: () {
dashboardState.setState(() { dashboardState.setState(() {
@@ -103,7 +109,8 @@ class AccountColorPanel extends StatelessWidget {
Expanded( Expanded(
child: PanelTab( child: PanelTab(
label: s.colorSecondary, label: s.colorSecondary,
isSelected: !dashboardState.editingPrimary, isSelected:
!dashboardState.editingPrimary && !isSolid,
color: dashboardState.tempSecondary, color: dashboardState.tempSecondary,
isDimmed: isSolid, isDimmed: isSolid,
onTap: () { onTap: () {
@@ -161,22 +168,48 @@ class AccountColorPanel extends StatelessWidget {
width: 1.5, width: 1.5,
), ),
), ),
child: Center( child: Row(
child: Text( mainAxisSize: MainAxisSize.min,
s.colorSolid, mainAxisAlignment: MainAxisAlignment.center,
style: TextStyle( children: [
fontSize: 11, Container(
fontWeight: isSolid width: 10,
? FontWeight.w600 height: 10,
: FontWeight.normal, decoration: BoxDecoration(
color: isSolid color: dashboardState.tempPrimary,
? const Color(0xFF7C6DED) shape: BoxShape.circle,
: Theme.of(dashboardContext) border: Border.all(
.colorScheme color: Theme.of(dashboardContext)
.onSurface .brightness ==
.withOpacity(0.5), Brightness.dark
? Colors.white30
: Colors.black12,
width: 1,
),
),
), ),
), const SizedBox(width: 6),
Flexible(
child: Text(
s.colorSolid,
overflow: TextOverflow.ellipsis,
maxLines: 1,
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 11,
fontWeight: isSolid
? FontWeight.w600
: FontWeight.normal,
color: isSolid
? const Color(0xFF7C6DED)
: Theme.of(dashboardContext)
.colorScheme
.onSurface
.withOpacity(0.5),
),
),
),
],
), ),
), ),
), ),
lib/features/dashboard/widgets/color_editor_overlay.dart
+49 -18
View File
@@ -171,8 +171,13 @@ class _FullScreenBlurOverlayState extends State<FullScreenBlurOverlay> {
Expanded( Expanded(
child: PanelTab( child: PanelTab(
label: s.colorPrimary, label: s.colorPrimary,
isSelected: dash.editingPrimary, isSelected: dash.editingPrimary && !isSolid,
color: dash.tempPrimary, color: isSolid
? Theme.of(widget.context)
.colorScheme
.onSurface
.withOpacity(0.12)
: dash.tempPrimary,
isDimmed: isSolid, isDimmed: isSolid,
onTap: () { onTap: () {
dash.setState(() { dash.setState(() {
@@ -188,7 +193,7 @@ class _FullScreenBlurOverlayState extends State<FullScreenBlurOverlay> {
Expanded( Expanded(
child: PanelTab( child: PanelTab(
label: s.colorSecondary, label: s.colorSecondary,
isSelected: !dash.editingPrimary, isSelected: !dash.editingPrimary && !isSolid,
color: dash.tempSecondary, color: dash.tempSecondary,
isDimmed: isSolid, isDimmed: isSolid,
onTap: () { onTap: () {
@@ -240,22 +245,48 @@ class _FullScreenBlurOverlayState extends State<FullScreenBlurOverlay> {
width: 1.5, width: 1.5,
), ),
), ),
child: Center( child: Row(
child: Text( mainAxisSize: MainAxisSize.min,
s.colorSolid, mainAxisAlignment: MainAxisAlignment.center,
style: TextStyle( children: [
fontSize: 11, Container(
fontWeight: isSolid width: 10,
? FontWeight.w600 height: 10,
: FontWeight.normal, decoration: BoxDecoration(
color: isSolid color: dash.tempPrimary,
? const Color(0xFF7C6DED) shape: BoxShape.circle,
: Theme.of(widget.context) border: Border.all(
.colorScheme color: Theme.of(widget.context)
.onSurface .brightness ==
.withOpacity(0.5), Brightness.dark
? Colors.white30
: Colors.black12,
width: 1,
),
),
), ),
), const SizedBox(width: 6),
Flexible(
child: Text(
s.colorSolid,
overflow: TextOverflow.ellipsis,
maxLines: 1,
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 11,
fontWeight: isSolid
? FontWeight.w600
: FontWeight.normal,
color: isSolid
? const Color(0xFF7C6DED)
: Theme.of(widget.context)
.colorScheme
.onSurface
.withOpacity(0.5),
),
),
),
],
), ),
), ),
), ),