From be300d9027bc8409424614775b2be28ebade82aa Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Thu, 23 Feb 2023 11:25:32 -0600
Subject: [PATCH] OLED Black color fixes

---
 lib/pages/loading_view.dart                | 28 +++++++++++++++++-----
 lib/utilities/theme/oled_black_colors.dart |  5 ++--
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/lib/pages/loading_view.dart b/lib/pages/loading_view.dart
index b7db1aa58..6c4b611ee 100644
--- a/lib/pages/loading_view.dart
+++ b/lib/pages/loading_view.dart
@@ -3,8 +3,11 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:lottie/lottie.dart';
 import 'package:stackwallet/utilities/assets.dart';
+import 'package:stackwallet/utilities/theme/color_theme.dart';
 import 'package:stackwallet/utilities/theme/stack_colors.dart';
 import 'package:stackwallet/widgets/background.dart';
+import 'package:stackwallet/widgets/conditional_parent.dart';
+import 'package:stackwallet/widgets/rounded_container.dart';
 
 class LoadingView extends StatelessWidget {
   const LoadingView({Key? key}) : super(key: key);
@@ -12,18 +15,31 @@ class LoadingView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final size = MediaQuery.of(context).size;
+    final width = min(size.width, size.height) * 0.5;
     return Background(
       child: Scaffold(
         backgroundColor: Theme.of(context).extension<StackColors>()!.background,
         body: Container(
           color: Theme.of(context).extension<StackColors>()!.background,
           child: Center(
-            child: SizedBox(
-              width: min(size.width, size.height) * 0.5,
-              child: Lottie.asset(
-                Assets.lottie.test2,
-                animate: true,
-                repeat: true,
+            child: ConditionalParent(
+              condition:
+                  Theme.of(context).extension<StackColors>()!.themeType ==
+                      ThemeType.oledBlack,
+              builder: (child) => RoundedContainer(
+                color: const Color(0xFFDEDEDE),
+                radiusMultiplier: 100,
+                width: width * 1.35,
+                height: width * 1.35,
+                child: child,
+              ),
+              child: SizedBox(
+                width: width,
+                child: Lottie.asset(
+                  Assets.lottie.test2,
+                  animate: true,
+                  repeat: true,
+                ),
               ),
             ),
             // child: Image(
diff --git a/lib/utilities/theme/oled_black_colors.dart b/lib/utilities/theme/oled_black_colors.dart
index 97fd6ad5f..3a7ba8126 100644
--- a/lib/utilities/theme/oled_black_colors.dart
+++ b/lib/utilities/theme/oled_black_colors.dart
@@ -283,7 +283,7 @@ class OledBlackColors extends StackColorTheme {
   @override
   Color get infoItemText => const Color(0xFFDEDEDE);
   @override
-  Color get infoItemIcons => const Color(0xFF5C94F4);
+  Color get infoItemIcons => const Color(0xFFF26822); //const Color(0xFF5C94F4);
 
   // popup
   @override
@@ -321,7 +321,8 @@ class OledBlackColors extends StackColorTheme {
   @override
   Color get myStackContactIconBG => const Color(0xFF747778);
   @override
-  Color get textConfirmTotalAmount => const Color(0xFF144D35);
+  Color get textConfirmTotalAmount =>
+      textFieldSuccessLabel; //const Color(0xFF144D35);
   @override
   Color get textSelectedWordTableItem => const Color(0xFF143D8E);