pull from upstream

lib/MVP/Models/AccountModel.dart → lib/Accounts/AccountModel.dart

@@ -22,13 +22,14 @@ class AccountModel extends HiveObject {
   Uint8List? avatarBytes;
 
   @HiveField(5)
-  bool? isActive = false;
+  bool? isActive;
 
   AccountModel({
     this.login,
     this.token,
     this.id,
     this.clientId,
     this.avatarBytes,
+    this.isActive = false,
   });
 }

lib/Accounts/AccountsCubit.dart

@@ -0,0 +1,56 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:hive/hive.dart';
+
+import 'AccountModel.dart';
+
+class AccountsCubit extends Cubit<List<AccountModel>> {
+  Box accountBox;
+
+  static AccountModel defaultAccount = AccountModel(
+    id: 0,
+    clientId: 'kimne78kx3ncx6brgo4mv6wki5h1ko',
+    login: 'justinfan64537',
+  );
+
+  AccountsCubit(this.accountBox) : super([]) {
+    refresh();
+  }
+
+  Future<void> refresh() async {
+    try {
+      for (var account in accountBox.values) {
+        if (account.token == null) {
+          await (account as HiveObject).delete();
+        }
+      }
+      // ignore: empty_catches
+    } catch (e) {}
+    emit([
+      for (var account in accountBox.values) account as AccountModel,
+    ]);
+  }
+
+  Future<void> add(AccountModel account) async {
+    await accountBox.add(account);
+    emit([...state, account]);
+  }
+
+  Future<void> remove(AccountModel account) async {
+    await account.delete();
+    emit([...state]..remove(account));
+  }
+
+  Future<AccountModel> getActive() async {
+    return state.firstWhere((account) => account.isActive ?? false, orElse: () => defaultAccount);
+  }
+
+  Future<void> setActive(AccountModel activeAccount) async {
+    for (var account in state) {
+      account.isActive = false;
+      await account.save();
+    }
+    activeAccount.isActive = true;
+    await activeAccount.save();
+    emit([...state]);
+  }
+}

lib/Badges/SevenTVBadges.dart

@@ -26,7 +26,7 @@ class SevenTVBadges extends Cubit<Map<String, List<twitch.Badge>>> {
             description: null,
             id: badgeData['id'],
             mipmap: [
-              for (var url in badgeData['urls'].take(1)) url.last,
+              for (var url in badgeData['urls']) url.last,
             ],
             name: badgeData['id'],
             tag: badgeData['id'],

lib/Components/ChatInputBox.dart

@@ -138,22 +138,22 @@ class _ChatInputBoxState extends State<ChatInputBox> {
                     },
                   ),
                 ),
-                AspectRatio(
-                  aspectRatio: 1.0,
-                  child: Container(
-                    height: 32.0,
-                    child: InkWell(
-                      onTap: () async => await UploadModal.show(
-                        context,
-                        channel: widget.channel!,
-                      ),
-                      child: Icon(
-                        Icons.file_present,
-                        color: Theme.of(context).colorScheme.onSurface.withAlpha(64 * 3),
-                      ),
-                    ),
-                  ),
-                ),
+                // AspectRatio(
+                //   aspectRatio: 1.0,
+                //   child: Container(
+                //     height: 32.0,
+                //     child: InkWell(
+                //       onTap: () async => await UploadModal.show(
+                //         context,
+                //         channel: widget.channel!,
+                //       ),
+                //       child: Icon(
+                //         Icons.file_present,
+                //         color: Theme.of(context).colorScheme.onSurface.withAlpha(64 * 3),
+                //       ),
+                //     ),
+                //   ),
+                // ),
                 AspectRatio(
                   aspectRatio: 1.0,
                   child: Container(

lib/Components/HomeDrawer.dart

@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import '/Components/UI/WidgetBlur.dart';
 import '/Pages/Account.dart';
-import '/Pages/Profile.dart';
 import '/Pages/Search.dart';
 import '/Pages/Whispers.dart';
 import '/StreamOverlay/StreamOverlayBloc.dart';
@@ -87,7 +86,7 @@ class HomeDrawer extends StatelessWidget {
                               onPressed: () => Navigator.of(context).push(
                                 MaterialPageRoute(
                                   builder: (BuildContext context) => AccountPage(
-                                    client: client,
+                                    client: client!,
                                   ),
                                 ),
                               ),