added new icon and hopefully fixed invisible text bug

oskarsh · Aug 15, 2019 · cf00194 · cf00194
1 parent c74f37f
commit cf00194
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 12 deletions.
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/lib/screens/login.dart b/lib/screens/login.dart
@@ -72,10 +72,8 @@ class _LoginState extends State<Login> {
         children: <Widget>[
           Container(
             height: 30,
-            color: Theme.of(context).backgroundColor,
           ),
           Container(
-            color: Theme.of(context).backgroundColor,
             child: Text(
               "NextNotes",
               textAlign: TextAlign.center,
@@ -92,7 +90,7 @@ class _LoginState extends State<Login> {
               padding: const EdgeInsets.all(30.0),
               margin: const EdgeInsets.all(30.0),
               decoration: new BoxDecoration(
-                color: Theme.of(context).backgroundColor, 
+                color: Theme.of(context).dialogBackgroundColor, 
                 borderRadius: new BorderRadius.all(Radius.circular(10)),
                 boxShadow: [
                   new BoxShadow(
@@ -124,7 +122,7 @@ class _LoginState extends State<Login> {
     @override
     Widget build(BuildContext context) {
       TextStyle style = TextStyle(
-          fontFamily: 'ZillaSlab', fontSize: 20.0, color: Theme.of(context).primaryTextTheme.body1.color);
+          fontFamily: 'ZillaSlab', fontSize: 20.0, color: Theme.of(context).primaryColor);
 
       final usernameField = TextField(
         obscureText: false,
@@ -175,7 +173,7 @@ class _LoginState extends State<Login> {
           child: Text("Login",
               textAlign: TextAlign.center,
               style: style.copyWith(
-                  color: Theme.of(context).backgroundColor, fontWeight: FontWeight.bold)),
+                  color: Theme.of(context).dialogBackgroundColor, fontWeight: FontWeight.bold)),
         ),
       );
 
@@ -189,7 +187,6 @@ class _LoginState extends State<Login> {
       // }
 
       return Scaffold(
-          backgroundColor: Theme.of(context).backgroundColor,
           body: Center(
               child: _showAuthOrApp(context, usernameField, passwordField,
                   nextcloudAdressField, loginButton)));

diff --git a/lib/screens/settings.dart b/lib/screens/settings.dart
@@ -108,7 +108,7 @@ class _SettingsPageState extends State<SettingsPage> {
                               color: Theme.of(context).primaryColor,
                               child: new Text('Logout',
                                   style: new TextStyle(
-                                      fontSize: 16.0, color: Theme.of(context).backgroundColor)),
+                                      fontSize: 16.0, color: Theme.of(context).dialogBackgroundColor)),
                               onPressed: () async {
                                 // Create storage
                                 final storage = new FlutterSecureStorage();

diff --git a/lib/screens/splash.dart b/lib/screens/splash.dart
@@ -45,9 +45,11 @@ class _SplashState extends State<Splash> {
     if (_isLoading) {
       return (Container
       (
+        color: Theme.of(context).dialogBackgroundColor,
         alignment: Alignment.center,
-        child: Column(children: <Widget>[
-        Text("Syncing with Nextcloud this can take up to minute"),
+        child: Column(mainAxisAlignment: MainAxisAlignment.center,
+          children: <Widget>[
+        Text("Syncing with Nextcloud this can take up to minute", style: TextStyle(fontSize: 16.0),),
         SpinKitFoldingCube(
           color: Theme.of(context).primaryColor,
           size: 100.0,
@@ -56,7 +58,7 @@ class _SplashState extends State<Splash> {
     } else {
       return (Container(
           alignment: Alignment.center,
-          color: Theme.of(context).backgroundColor,
+          color: Theme.of(context).dialogBackgroundColor,
           child: Column(
             mainAxisAlignment: MainAxisAlignment.center,
             children: <Widget>[
@@ -65,7 +67,7 @@ class _SplashState extends State<Splash> {
                   padding: EdgeInsets.all(20),
                   child: Text(
                     "NextNotes is now fully synced, \n go ahead and explore the App",
-                    style: TextStyle(fontSize: 16.0 ,fontFamily: "ZillaSlab", color: Theme.of(context).primaryTextTheme.body1.color),
+                    style: TextStyle(fontSize: 16.0 ,fontFamily: "ZillaSlab"),
                   )),
               Material(
                 elevation: 18.0,
@@ -79,7 +81,7 @@ class _SplashState extends State<Splash> {
                   color: Theme.of(context).primaryColor,
                   child: new Text('Explore the App',
                       style:
-                          new TextStyle(fontSize: 16.0, color: Theme.of(context).backgroundColor)),
+                          new TextStyle(fontSize: 16.0, color: Theme.of(context).dialogBackgroundColor)),
                   onPressed: () {
                     Navigator.push(
                         context,