mirror of
https://github.com/koloideal/Casha.git
synced 2026-06-10 10:25:28 +03:00
stableee
This commit is contained in:
@@ -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,9 +168,33 @@ class AccountColorPanel extends StatelessWidget {
|
|||||||
width: 1.5,
|
width: 1.5,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
child: Center(
|
child: Row(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
children: [
|
||||||
|
Container(
|
||||||
|
width: 10,
|
||||||
|
height: 10,
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: dashboardState.tempPrimary,
|
||||||
|
shape: BoxShape.circle,
|
||||||
|
border: Border.all(
|
||||||
|
color: Theme.of(dashboardContext)
|
||||||
|
.brightness ==
|
||||||
|
Brightness.dark
|
||||||
|
? Colors.white30
|
||||||
|
: Colors.black12,
|
||||||
|
width: 1,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 6),
|
||||||
|
Flexible(
|
||||||
child: Text(
|
child: Text(
|
||||||
s.colorSolid,
|
s.colorSolid,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
maxLines: 1,
|
||||||
|
textAlign: TextAlign.center,
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontSize: 11,
|
fontSize: 11,
|
||||||
fontWeight: isSolid
|
fontWeight: isSolid
|
||||||
@@ -178,6 +209,8 @@ class AccountColorPanel extends StatelessWidget {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -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,9 +245,33 @@ class _FullScreenBlurOverlayState extends State<FullScreenBlurOverlay> {
|
|||||||
width: 1.5,
|
width: 1.5,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
child: Center(
|
child: Row(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
children: [
|
||||||
|
Container(
|
||||||
|
width: 10,
|
||||||
|
height: 10,
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: dash.tempPrimary,
|
||||||
|
shape: BoxShape.circle,
|
||||||
|
border: Border.all(
|
||||||
|
color: Theme.of(widget.context)
|
||||||
|
.brightness ==
|
||||||
|
Brightness.dark
|
||||||
|
? Colors.white30
|
||||||
|
: Colors.black12,
|
||||||
|
width: 1,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 6),
|
||||||
|
Flexible(
|
||||||
child: Text(
|
child: Text(
|
||||||
s.colorSolid,
|
s.colorSolid,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
maxLines: 1,
|
||||||
|
textAlign: TextAlign.center,
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontSize: 11,
|
fontSize: 11,
|
||||||
fontWeight: isSolid
|
fontWeight: isSolid
|
||||||
@@ -257,6 +286,8 @@ class _FullScreenBlurOverlayState extends State<FullScreenBlurOverlay> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
|
|||||||
Reference in New Issue
Block a user