desktop about ui fix

This commit is contained in:
ryleedavis 2022-11-07 16:17:54 -07:00
parent e41f8088b0
commit 43deb9f81f

View file

@ -140,6 +140,9 @@ class DesktopAboutView extends ConsumerWidget {
children: [
Padding(
padding: const EdgeInsets.fromLTRB(24, 10, 24, 35),
child: Row(
children: [
Expanded(
child: RoundedWhiteContainer(
width: 929,
height: 411,
@ -169,7 +172,8 @@ class DesktopAboutView extends ConsumerWidget {
TextSpan(
text:
"By using Stack Wallet, you agree to the ",
style: STextStyles.desktopTextExtraExtraSmall(
style: STextStyles
.desktopTextExtraExtraSmall(
context)
.copyWith(
color: Theme.of(context)
@ -185,13 +189,15 @@ class DesktopAboutView extends ConsumerWidget {
launchUrl(
Uri.parse(
"https://stackwallet.com/terms-of-service.html"),
mode: LaunchMode.externalApplication,
mode:
LaunchMode.externalApplication,
);
},
),
TextSpan(
text: " and ",
style: STextStyles.desktopTextExtraExtraSmall(
style: STextStyles
.desktopTextExtraExtraSmall(
context)
.copyWith(
color: Theme.of(context)
@ -207,7 +213,8 @@ class DesktopAboutView extends ConsumerWidget {
launchUrl(
Uri.parse(
"https://stackwallet.com/privacy-policy.html"),
mode: LaunchMode.externalApplication,
mode:
LaunchMode.externalApplication,
);
},
),
@ -218,13 +225,14 @@ class DesktopAboutView extends ConsumerWidget {
),
const SizedBox(height: 32),
Padding(
padding: const EdgeInsets.only(right: 10, bottom: 10),
padding:
const EdgeInsets.only(right: 10, bottom: 10),
child: Column(
children: [
FutureBuilder(
future: PackageInfo.fromPlatform(),
builder:
(context, AsyncSnapshot<PackageInfo> snapshot) {
builder: (context,
AsyncSnapshot<PackageInfo> snapshot) {
String version = "";
String signature = "";
String build = "";
@ -253,7 +261,8 @@ class DesktopAboutView extends ConsumerWidget {
.desktopTextExtraExtraSmall(
context)
.copyWith(
color: Theme.of(context)
color: Theme.of(
context)
.extension<
StackColors>()!
.textDark),
@ -263,7 +272,8 @@ class DesktopAboutView extends ConsumerWidget {
),
SelectableText(
version,
style: STextStyles.itemSubtitle(
style:
STextStyles.itemSubtitle(
context),
),
],
@ -281,7 +291,8 @@ class DesktopAboutView extends ConsumerWidget {
.desktopTextExtraExtraSmall(
context)
.copyWith(
color: Theme.of(context)
color: Theme.of(
context)
.extension<
StackColors>()!
.textDark),
@ -291,7 +302,8 @@ class DesktopAboutView extends ConsumerWidget {
),
SelectableText(
build,
style: STextStyles.itemSubtitle(
style:
STextStyles.itemSubtitle(
context),
),
],
@ -311,7 +323,8 @@ class DesktopAboutView extends ConsumerWidget {
.desktopTextExtraExtraSmall(
context)
.copyWith(
color: Theme.of(context)
color: Theme.of(
context)
.extension<
StackColors>()!
.textDark),
@ -321,7 +334,8 @@ class DesktopAboutView extends ConsumerWidget {
),
SelectableText(
signature,
style: STextStyles.itemSubtitle(
style:
STextStyles.itemSubtitle(
context),
),
],
@ -332,28 +346,33 @@ class DesktopAboutView extends ConsumerWidget {
FutureBuilder(
future: commitFiroFuture,
builder: (context,
AsyncSnapshot<dynamic> snapshot) {
AsyncSnapshot<dynamic>
snapshot) {
bool commitExists = false;
bool isHead = false;
CommitStatus stateOfCommit =
CommitStatus.notLoaded;
if (snapshot.connectionState ==
ConnectionState.done &&
ConnectionState
.done &&
snapshot.hasData) {
commitExists =
snapshot.data![0] as bool;
isHead =
snapshot.data![1] as bool;
if (commitExists && isHead) {
commitExists = snapshot
.data![0] as bool;
isHead = snapshot.data![1]
as bool;
if (commitExists &&
isHead) {
stateOfCommit =
CommitStatus.isHead;
} else if (commitExists) {
stateOfCommit =
CommitStatus.isOldCommit;
CommitStatus
.isOldCommit;
} else {
stateOfCommit =
CommitStatus.notACommit;
CommitStatus
.notACommit;
}
}
TextStyle indicationStyle =
@ -362,27 +381,35 @@ class DesktopAboutView extends ConsumerWidget {
switch (stateOfCommit) {
case CommitStatus.isHead:
indicationStyle = STextStyles
.itemSubtitle(context)
.itemSubtitle(
context)
.copyWith(
color: Theme.of(context)
color: Theme.of(
context)
.extension<
StackColors>()!
.accentColorGreen);
break;
case CommitStatus.isOldCommit:
case CommitStatus
.isOldCommit:
indicationStyle = STextStyles
.itemSubtitle(context)
.itemSubtitle(
context)
.copyWith(
color: Theme.of(context)
color: Theme.of(
context)
.extension<
StackColors>()!
.accentColorYellow);
break;
case CommitStatus.notACommit:
case CommitStatus
.notACommit:
indicationStyle = STextStyles
.itemSubtitle(context)
.itemSubtitle(
context)
.copyWith(
color: Theme.of(context)
color: Theme.of(
context)
.extension<
StackColors>()!
.accentColorRed);
@ -392,7 +419,8 @@ class DesktopAboutView extends ConsumerWidget {
}
return Column(
crossAxisAlignment:
CrossAxisAlignment.start,
CrossAxisAlignment
.start,
children: [
Text(
"Firo Build Commit",
@ -424,28 +452,33 @@ class DesktopAboutView extends ConsumerWidget {
FutureBuilder(
future: commitEpicFuture,
builder: (context,
AsyncSnapshot<dynamic> snapshot) {
AsyncSnapshot<dynamic>
snapshot) {
bool commitExists = false;
bool isHead = false;
CommitStatus stateOfCommit =
CommitStatus.notLoaded;
if (snapshot.connectionState ==
ConnectionState.done &&
ConnectionState
.done &&
snapshot.hasData) {
commitExists =
snapshot.data![0] as bool;
isHead =
snapshot.data![1] as bool;
if (commitExists && isHead) {
commitExists = snapshot
.data![0] as bool;
isHead = snapshot.data![1]
as bool;
if (commitExists &&
isHead) {
stateOfCommit =
CommitStatus.isHead;
} else if (commitExists) {
stateOfCommit =
CommitStatus.isOldCommit;
CommitStatus
.isOldCommit;
} else {
stateOfCommit =
CommitStatus.notACommit;
CommitStatus
.notACommit;
}
}
TextStyle indicationStyle =
@ -454,27 +487,35 @@ class DesktopAboutView extends ConsumerWidget {
switch (stateOfCommit) {
case CommitStatus.isHead:
indicationStyle = STextStyles
.itemSubtitle(context)
.itemSubtitle(
context)
.copyWith(
color: Theme.of(context)
color: Theme.of(
context)
.extension<
StackColors>()!
.accentColorGreen);
break;
case CommitStatus.isOldCommit:
case CommitStatus
.isOldCommit:
indicationStyle = STextStyles
.itemSubtitle(context)
.itemSubtitle(
context)
.copyWith(
color: Theme.of(context)
color: Theme.of(
context)
.extension<
StackColors>()!
.accentColorYellow);
break;
case CommitStatus.notACommit:
case CommitStatus
.notACommit:
indicationStyle = STextStyles
.itemSubtitle(context)
.itemSubtitle(
context)
.copyWith(
color: Theme.of(context)
color: Theme.of(
context)
.extension<
StackColors>()!
.accentColorRed);
@ -484,7 +525,8 @@ class DesktopAboutView extends ConsumerWidget {
}
return Column(
crossAxisAlignment:
CrossAxisAlignment.start,
CrossAxisAlignment
.start,
children: [
Text(
"Epic Cash Build Commit",
@ -514,28 +556,33 @@ class DesktopAboutView extends ConsumerWidget {
FutureBuilder(
future: commitMoneroFuture,
builder: (context,
AsyncSnapshot<dynamic> snapshot) {
AsyncSnapshot<dynamic>
snapshot) {
bool commitExists = false;
bool isHead = false;
CommitStatus stateOfCommit =
CommitStatus.notLoaded;
if (snapshot.connectionState ==
ConnectionState.done &&
ConnectionState
.done &&
snapshot.hasData) {
commitExists =
snapshot.data![0] as bool;
isHead =
snapshot.data![1] as bool;
if (commitExists && isHead) {
commitExists = snapshot
.data![0] as bool;
isHead = snapshot.data![1]
as bool;
if (commitExists &&
isHead) {
stateOfCommit =
CommitStatus.isHead;
} else if (commitExists) {
stateOfCommit =
CommitStatus.isOldCommit;
CommitStatus
.isOldCommit;
} else {
stateOfCommit =
CommitStatus.notACommit;
CommitStatus
.notACommit;
}
}
TextStyle indicationStyle =
@ -544,27 +591,35 @@ class DesktopAboutView extends ConsumerWidget {
switch (stateOfCommit) {
case CommitStatus.isHead:
indicationStyle = STextStyles
.itemSubtitle(context)
.itemSubtitle(
context)
.copyWith(
color: Theme.of(context)
color: Theme.of(
context)
.extension<
StackColors>()!
.accentColorGreen);
break;
case CommitStatus.isOldCommit:
case CommitStatus
.isOldCommit:
indicationStyle = STextStyles
.itemSubtitle(context)
.itemSubtitle(
context)
.copyWith(
color: Theme.of(context)
color: Theme.of(
context)
.extension<
StackColors>()!
.accentColorYellow);
break;
case CommitStatus.notACommit:
case CommitStatus
.notACommit:
indicationStyle = STextStyles
.itemSubtitle(context)
.itemSubtitle(
context)
.copyWith(
color: Theme.of(context)
color: Theme.of(
context)
.extension<
StackColors>()!
.accentColorRed);
@ -574,7 +629,8 @@ class DesktopAboutView extends ConsumerWidget {
}
return Column(
crossAxisAlignment:
CrossAxisAlignment.start,
CrossAxisAlignment
.start,
children: [
Text(
"Monero Build Commit",
@ -613,7 +669,8 @@ class DesktopAboutView extends ConsumerWidget {
.desktopTextExtraExtraSmall(
context)
.copyWith(
color: Theme.of(context)
color: Theme.of(
context)
.extension<
StackColors>()!
.textDark),
@ -622,7 +679,8 @@ class DesktopAboutView extends ConsumerWidget {
height: 2,
),
BlueTextButton(
text: "https://stackwallet.com",
text:
"https://stackwallet.com",
onTap: () {
launchUrl(
Uri.parse(
@ -650,6 +708,9 @@ class DesktopAboutView extends ConsumerWidget {
),
],
),
),
],
),
);
}
}