From 0090e86adedcce95ac1926feb3cc5ee656fb4eb0 Mon Sep 17 00:00:00 2001
From: Sarah Jamie Lewis <sarah@openprivacy.ca>
Date: Thu, 24 Jun 2021 12:53:32 -0700
Subject: [PATCH] Add Flaticons Licenses, Fix Splash Screen, Fix Android
 License Prompt

---
 lib/licenses.dart                 |  3 +++
 lib/views/globalsettingsview.dart | 10 ++--------
 lib/views/splashView.dart         |  2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/lib/licenses.dart b/lib/licenses.dart
index a06b816..36a9f57 100644
--- a/lib/licenses.dart
+++ b/lib/licenses.dart
@@ -114,4 +114,7 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''');
+
+
+  yield LicenseEntryWithLineBreaks(["flaticons"], "Icons made by Freepik (https://www.freepik.com) from Flaticon (www.flaticon.com)");
 }
diff --git a/lib/views/globalsettingsview.dart b/lib/views/globalsettingsview.dart
index 9380965..2329ea8 100644
--- a/lib/views/globalsettingsview.dart
+++ b/lib/views/globalsettingsview.dart
@@ -64,7 +64,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
                               }).toList())),
                       SwitchListTile(
                         title: Text(AppLocalizations.of(context)!.settingTheme, style: TextStyle(color: settings.current().mainTextColor())),
-                        value: settings.current() == "light",
+                        value: settings.current().identifier() == "light",
                         onChanged: (bool value) {
                           if (value) {
                             settings.setLight();
@@ -169,13 +169,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
                           )),
                       AboutListTile(
                         icon: Icon(Icons.info, color: settings.current().mainTextColor()),
-                        applicationIcon: Padding(
-                            padding: EdgeInsets.all(20),
-                            child: Image(
-                              image: AssetImage("assets/knott.png"),
-                              width: 128,
-                              height: 128,
-                            )),
+                        applicationIcon: Padding(padding:EdgeInsets.all(5), child: Icon(CwtchIcons.cwtch_knott)),
                         applicationName: "Cwtch (Flutter UI)",
                         applicationVersion: AppLocalizations.of(context)!.versionBuilddate.replaceAll("%1", EnvironmentConfig.BUILD_VER).replaceAll("%2", EnvironmentConfig.BUILD_DATE),
                         applicationLegalese: '\u{a9} 2021 Open Privacy Research Society',
diff --git a/lib/views/splashView.dart b/lib/views/splashView.dart
index 78ffaf3..a5642f2 100644
--- a/lib/views/splashView.dart
+++ b/lib/views/splashView.dart
@@ -13,7 +13,7 @@ class SplashView extends StatelessWidget {
               body: Center(
                   child: Column(mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [
                 Image(
-                  image: AssetImage("assets/knott.png"),
+                  image: AssetImage("assets/core/knott-white.png"),
                   filterQuality: FilterQuality.medium,
                   isAntiAlias: true,
                   width: 200,