Merge remote-tracking branch 'origin/master'

Author: agrapine

.gitignore

@@ -39,3 +39,4 @@ lib/generated_plugin_registrant.dart
 /android/app/google-services.json
 /android/key.properties
 *.last_build_id
+

README.md

@@ -8,5 +8,5 @@ Currently used for:
 - Matrix Api Client (Chopper)
 
 ```sh
-flutter packages pub run build_runner build
+flutter packages pub run build_runner build --delete-conflicting-outputs
 ```

android/app/build.gradle

@@ -34,7 +34,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -48,7 +48,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "co.swipelab.rant"
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

lib/ghost/ghost_service.chopper.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/cupertino.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:rant/account.dart';
@@ -7,9 +8,17 @@ import 'package:rant/util/widget_switch.dart';
 import 'package:rant/util/focus_fixer.dart';
 import 'package:rant/views/login_view.dart';
 import 'package:rant/views/home_view.dart';
+import 'package:rant/views/register_view.dart';
 import 'package:scoped/scoped.dart';
 
+import 'dart:io' show Platform;
+
+//import 'package:flutter/foundation.dart'
+//    show debugDefaultTargetPlatformOverride;
+
 void main() async {
+  debugDefaultTargetPlatformOverride = TargetPlatform.fuchsia;
+
   WidgetsFlutterBinding.ensureInitialized();
 
   await initStore();
@@ -31,26 +40,17 @@ class MyApp extends StatelessWidget {
         title: 'RANTER',
         debugShowCheckedModeBanner: false,
         theme: ThemeData(
-          primaryColor: Color(0xFFFFF9EB),
-          accentColor: Color(0xFFFFF9EB),
+          primaryColor: Colors.black,
           brightness: Brightness.light,
-          //fontFamily: 'SF Pro Text',
-//          appBarTheme: Theme.of(context).appBarTheme.copyWith(
-//                elevation: 0,
-//                color: Colors.white54,
-//                textTheme: TextTheme(
-//                  headline6: TextStyle(
-//                    color: Color(0xFF000000)
-//                  ),
-//                ),
-//              ),
-          //scaffoldBackgroundColor: Color(0xFF191C26),
         ),
-        home: context.get<Account>().isAuthenticated.bindValue(
-            (context, value) => WidgetSwitch(index: value ? 1 : 0, items: [
-                  (context) => LoginView(),
-                  (context) => HomeView(),
-                ])),
+        routes: {
+          "/": (context) => context.get<Account>().isAuthenticated.bindValue(
+              (context, value) => WidgetSwitch(index: value ? 1 : 0, items: [
+                    (context) => LoginView(),
+                    (context) => HomeView(),
+                  ])),
+          "/register": (context) => RegisterView(),
+        },
       ),
     );
   }