Compare commits
2 Commits
4cb59d6cbc
...
7741b255da
Author | SHA1 | Date |
---|---|---|
Sarah Jamie Lewis | 7741b255da | |
Sarah Jamie Lewis | 3aa0042b71 |
|
@ -58,9 +58,6 @@ class CwtchNotifier {
|
||||||
// EnvironmentConfig.debugLog("NewEvent $type $data");
|
// EnvironmentConfig.debugLog("NewEvent $type $data");
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case "CwtchStarted":
|
case "CwtchStarted":
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (data["Reload"] == "true" && profileCN.num > 0) {
|
if (data["Reload"] == "true" && profileCN.num > 0) {
|
||||||
// don't reload...
|
// don't reload...
|
||||||
// unless we have loaded no profiles...then there isnt a risk and this
|
// unless we have loaded no profiles...then there isnt a risk and this
|
||||||
|
|
|
@ -106,7 +106,7 @@ class FlwtchState extends State<Flwtch> with WindowListener {
|
||||||
// Cwtch.start can take time, we don't want it blocking first splash screen draw, so postpone a smidge to let splash render
|
// Cwtch.start can take time, we don't want it blocking first splash screen draw, so postpone a smidge to let splash render
|
||||||
Future.delayed(const Duration(milliseconds: 100), () {
|
Future.delayed(const Duration(milliseconds: 100), () {
|
||||||
print("initState delayed: invoking cwtch.Start()");
|
print("initState delayed: invoking cwtch.Start()");
|
||||||
cwtch.Start().then( (v) {
|
cwtch.Start().then((v) {
|
||||||
cwtch.getCwtchDir().then((dir) {
|
cwtch.getCwtchDir().then((dir) {
|
||||||
globalSettings.themeloader.LoadThemes(dir);
|
globalSettings.themeloader.LoadThemes(dir);
|
||||||
});
|
});
|
||||||
|
|
|
@ -56,8 +56,7 @@ class _SplashViewState extends State<SplashView> {
|
||||||
: appState.modalState == ModalState.storageMigration
|
: appState.modalState == ModalState.storageMigration
|
||||||
? AppLocalizations.of(context)!.storageMigrationModalMessage
|
? AppLocalizations.of(context)!.storageMigrationModalMessage
|
||||||
: AppLocalizations.of(context)!.shuttingDownApp, // Todo l10n AppLocalizations.of(context)!.storageMigrationModalMessage
|
: AppLocalizations.of(context)!.shuttingDownApp, // Todo l10n AppLocalizations.of(context)!.storageMigrationModalMessage
|
||||||
style: defaultTextButtonStyle.copyWith(
|
style: defaultTextButtonStyle.copyWith(fontSize: 16.0, fontFamily: "Inter", color: appState.appError == "" ? whiteishPurple : hotPink))),
|
||||||
fontSize: 16.0, fontFamily: "Inter", color: appState.appError == "" ? whiteishPurple : hotPink))),
|
|
||||||
Visibility(
|
Visibility(
|
||||||
visible: appState.modalState == ModalState.storageMigration || appState.modalState == ModalState.shutdown,
|
visible: appState.modalState == ModalState.storageMigration || appState.modalState == ModalState.shutdown,
|
||||||
child: LinearProgressIndicator(
|
child: LinearProgressIndicator(
|
||||||
|
|
|
@ -63,7 +63,7 @@ class _ContactRowState extends State<ContactRow> {
|
||||||
enableFeedback: true,
|
enableFeedback: true,
|
||||||
splashFactory: InkSplash.splashFactory,
|
splashFactory: InkSplash.splashFactory,
|
||||||
child: Ink(
|
child: Ink(
|
||||||
color: selected ? Provider.of<Settings>(context).theme.backgroundHilightElementColor : Colors.transparent,
|
color: selected ? (Provider.of<Settings>(context).theme.backgroundHilightElementColor as Color).withOpacity(0.8) : Colors.transparent,
|
||||||
child: Container(
|
child: Container(
|
||||||
child: Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center, children: [
|
child: Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center, children: [
|
||||||
Padding(
|
Padding(
|
||||||
|
@ -123,8 +123,8 @@ class _ContactRowState extends State<ContactRow> {
|
||||||
height: contact.isInvitation ? Provider.of<Settings>(context).fontScaling * 14.0 + 35.0 : Provider.of<Settings>(context).fontScaling * 14.0 + 5.0,
|
height: contact.isInvitation ? Provider.of<Settings>(context).fontScaling * 14.0 + 35.0 : Provider.of<Settings>(context).fontScaling * 14.0 + 5.0,
|
||||||
child: contact.isInvitation == true
|
child: contact.isInvitation == true
|
||||||
? FittedBox(
|
? FittedBox(
|
||||||
fit: BoxFit.cover,
|
fit: BoxFit.scaleDown,
|
||||||
child: Row(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center, children: <Widget>[
|
child: Wrap(children: <Widget>[
|
||||||
Padding(
|
Padding(
|
||||||
padding: EdgeInsets.all(2),
|
padding: EdgeInsets.all(2),
|
||||||
child: TextButton.icon(
|
child: TextButton.icon(
|
||||||
|
|
Loading…
Reference in New Issue