Adding basic plausible usage tracking (#51)

ios/Runner.xcodeproj/project.pbxproj

@@ -357,7 +357,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 26;
+				CURRENT_PROJECT_VERSION = 27;
 				DEVELOPMENT_TEAM = 3TCN256Z4Z;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -488,7 +488,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 26;
+				CURRENT_PROJECT_VERSION = 27;
 				DEVELOPMENT_TEAM = 3TCN256Z4Z;
 				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 arm64";
@@ -514,7 +514,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 26;
+				CURRENT_PROJECT_VERSION = 27;
 				DEVELOPMENT_TEAM = 3TCN256Z4Z;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;

ios/Runner/Info.plist

@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>26</string>
+	<string>27</string>
 	<key>CFBundleLocalizations</key>
 	<array>
 		<string>cs</string>

lib/blocs/repos/channel_list_bloc.dart

@@ -1,3 +1,5 @@
+import 'dart:math';
+
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -9,33 +11,29 @@ import 'package:glimesh_app/i18n.dart';
 @immutable
 abstract class ChannelListEvent extends Equatable {}
 
-class LoadChannels extends ChannelListEvent {
+abstract class AlwaysRefreshingChannelListEvent extends ChannelListEvent {
+  @override
+  List<Object> get props => [Random().nextInt(1000)];
+}
+
+class LoadChannels extends AlwaysRefreshingChannelListEvent {
   final String categorySlug;
   final int channelLimit;
 
   LoadChannels({required this.categorySlug, this.channelLimit: 15});
 
   @override
   String toString() => 'LoadChannels';
-
-  @override
-  List<Object> get props => [this.categorySlug, this.channelLimit];
 }
 
-class LoadMyLiveFollowedChannels extends ChannelListEvent {
+class LoadMyLiveFollowedChannels extends AlwaysRefreshingChannelListEvent {
   @override
   String toString() => 'LoadMyLiveFollowedChannels';
-
-  @override
-  List<Object> get props => [];
 }
 
-class LoadHomepageChannels extends ChannelListEvent {
+class LoadHomepageChannels extends AlwaysRefreshingChannelListEvent {
   @override
   String toString() => 'LoadHomepageChannels';
-
-  @override
-  List<Object> get props => [];
 }
 
 @immutable
@@ -55,7 +53,7 @@ class ChannelListLoaded extends ChannelListState {
   ChannelListLoaded({required this.results});
 
   @override
-  List<Object> get props => [results];
+  List<Object> get props => results.map((e) => e.id).toList();
 }
 
 class ChannelListNotLoaded extends ChannelListState {
@@ -85,10 +83,13 @@ class ChannelListBloc extends Bloc<ChannelListEvent, ChannelListState> {
   _loadChannels(LoadChannels event, Emitter emit) async {
     emit(ChannelListLoading());
 
+    print("inside");
+
     final queryResults =
         await this.glimeshRepository.getLiveChannels(event.categorySlug);
 
     if (queryResults.hasException) {
+      print(queryResults.hasException);
       emit(ChannelListNotLoaded(queryResults.exception!.graphqlErrors));
       return;
     }
@@ -101,6 +102,12 @@ class ChannelListBloc extends Bloc<ChannelListEvent, ChannelListState> {
 
     listOfChannels.shuffle();
 
+    print('map');
+    listOfChannels.forEach((e) {
+      print(e.id);
+      print(e.title);
+    });
+
     emit(ChannelListLoaded(results: listOfChannels));
   }
 

lib/components/FTLPlayer.dart

@@ -176,6 +176,7 @@ class _FTLPlayerState extends State<FTLPlayer> {
         Image.network(widget.channel.thumbnail),
         Container(
           decoration: BoxDecoration(color: Colors.black45),
+          child: Loading("Loading Video"),
         ),
         _errored
             ? Center(

lib/components/StreamTitle.dart

@@ -75,6 +75,7 @@ class _StreamTitleState extends State<StreamTitle> {
         padding: EdgeInsets.all(20),
         child: ListView(
           children: [
+            _buildTitleTag(),
             _buildSubcategoryTag(),
             _buildTags(context),
             _buildLanguageTag(context),
@@ -85,6 +86,13 @@ class _StreamTitleState extends State<StreamTitle> {
     );
   }
 
+  Widget _buildTitleTag() {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [Text("Title"), Chip(label: Text(widget.channel.title))],
+    );
+  }
+
   Widget _buildSubcategoryTag() {
     if (widget.channel.subcategory == null) {
       return Padding(padding: EdgeInsets.zero);

lib/main.dart

@@ -7,6 +7,7 @@ import 'package:glimesh_app/blocs/repos/chat_messages_bloc.dart';
 import 'package:glimesh_app/blocs/repos/follow_bloc.dart';
 import 'package:glimesh_app/blocs/repos/settings_bloc.dart';
 import 'package:glimesh_app/screens/AppScreen.dart';
+import 'package:glimesh_app/track.dart';
 import 'package:gql_phoenix_link/gql_phoenix_link.dart';
 import 'package:graphql_flutter/graphql_flutter.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
@@ -252,6 +253,8 @@ class GlimeshApp extends StatelessWidget {
       final ChannelBloc bloc = ChannelBloc(
         glimeshRepository: repo,
       );
+
+      track.event(page: "${channel.username}");
 
       return MaterialPageRoute(
         builder: (context) {
@@ -291,6 +294,8 @@ class GlimeshApp extends StatelessWidget {
 
     if (settings.name == '/profile') {
       final String username = settings.arguments as String;
+
+      track.event(page: "${username}/profile");
 
       return MaterialPageRoute(
         builder: (context) {

lib/screens/AppScreen.dart

@@ -7,6 +7,8 @@ import 'package:glimesh_app/screens/CategoryListScreen.dart';
 import 'package:glimesh_app/screens/FollowingScreen.dart';
 import 'package:glimesh_app/auth.dart';
 
+import 'package:glimesh_app/track.dart';
+
 class AppScreen extends StatefulWidget {
   AppScreen({Key? key, required this.title}) : super(key: key);
 
@@ -34,6 +36,8 @@ class _AppScreenState extends State<AppScreen> {
   void initState() {
     super.initState();
 
+    track.event();
+
     setState(() {
       pages = [
         MyProfileScreen(),
@@ -106,7 +110,8 @@ class _AppScreenState extends State<AppScreen> {
           ],
         ),
       ),
-      body: pages.isEmpty ? Loading(context.t("Loading")) : pages[_selectedIndex],
+      body:
+          pages.isEmpty ? Loading(context.t("Loading")) : pages[_selectedIndex],
       bottomNavigationBar:
           _bottomNavigationBar(context, authState.authenticated),
     );
@@ -115,7 +120,8 @@ class _AppScreenState extends State<AppScreen> {
   Widget _anonymousUserInfo(BuildContext context, bool shown) {
     if (shown) {
       return ListTile(
-        title: Text(context.t("Login to experience the very best Glimesh has to offer!")),
+        title: Text(context
+            .t("Login to experience the very best Glimesh has to offer!")),
       );
     } else {
       return SizedBox();

lib/screens/CategoryListScreen.dart

@@ -8,6 +8,7 @@ import 'package:glimesh_app/blocs/repos/channel_list_bloc.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:glimesh_app/repository.dart';
 import 'package:gettext_i18n/gettext_i18n.dart';
+import 'package:glimesh_app/track.dart';
 
 class CategoryListScreen extends StatelessWidget {
   @override

lib/screens/ChannelListScreen.dart

@@ -6,13 +6,16 @@ import 'package:glimesh_app/repository.dart';
 import 'package:glimesh_app/models.dart';
 import 'package:glimesh_app/auth.dart';
 import 'package:gettext_i18n/gettext_i18n.dart';
+import 'package:glimesh_app/track.dart';
 
 class ChannelListScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     Category category = ModalRoute.of(context)!.settings.arguments as Category;
     final authState = AuthState.of(context);
 
+    track.event(page: "streams/${category.slug}");
+
     return Scaffold(
       appBar: AppBar(
         title: Text(context

lib/screens/FollowingScreen.dart

@@ -7,11 +7,15 @@ import 'package:glimesh_app/components/Loading.dart';
 import 'package:glimesh_app/repository.dart';
 import 'package:glimesh_app/models.dart';
 import 'package:gettext_i18n/gettext_i18n.dart';
+import 'package:glimesh_app/track.dart';
 
 class FollowingScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final authState = AuthState.of(context);
+
+    track.event(page: "streams/following");
+
     return Scaffold(
       body: BlocProvider(
         create: (context) => ChannelListBloc(

lib/screens/LoginScreen.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:glimesh_app/glimesh.dart';
 import 'package:glimesh_app/auth.dart';
+import 'package:glimesh_app/track.dart';
 import 'package:graphql_flutter/graphql_flutter.dart';
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:package_info_plus/package_info_plus.dart';
@@ -14,11 +15,27 @@ class LoginScreen extends StatelessWidget {
     authState = AuthState.of(context);
     bool horizontalTablet = MediaQuery.of(context).size.width > 992;
 
+    track.event(page: "users/log_in");
+
     return Scaffold(
       body: SafeArea(
-        child: horizontalTablet
-            ? _buildHorizontal(context)
-            : _buildVertical(context),
+        child: Stack(
+          children: [
+            horizontalTablet
+                ? _buildHorizontal(context)
+                : _buildVertical(context),
+            InkWell(
+              child: Padding(
+                padding: EdgeInsets.all(5),
+                child: Icon(
+                  Icons.chevron_left,
+                  color: Colors.white70,
+                ),
+              ),
+              onTap: () => Navigator.pop(context),
+            )
+          ],
+        ),
       ),
     );
   }
@@ -37,22 +54,7 @@ class LoginScreen extends StatelessWidget {
                 child: _loginButton(context, true),
               ),
             ),
-            FutureBuilder<PackageInfo>(
-              future: PackageInfo.fromPlatform(),
-              builder: (context, snapshot) {
-                switch (snapshot.connectionState) {
-                  case ConnectionState.done:
-                    return Align(
-                      alignment: Alignment.bottomCenter,
-                      child: Text(
-                        'Version: ${snapshot.data!.version}+${snapshot.data!.buildNumber}',
-                      ),
-                    );
-                  default:
-                    return const SizedBox();
-                }
-              },
-            ),
+            _versionWidget(),
           ],
         ));
   }
@@ -68,28 +70,36 @@ class LoginScreen extends StatelessWidget {
         Expanded(
           child: _loginButton(context, false),
         ),
-        FutureBuilder<PackageInfo>(
-          future: PackageInfo.fromPlatform(),
-          builder: (context, snapshot) {
-            switch (snapshot.connectionState) {
-              case ConnectionState.done:
-                return Align(
-                  alignment: Alignment.bottomCenter,
-                  child: Text(
-                    'Version: ${snapshot.data!.version}+${snapshot.data!.buildNumber}',
-                  ),
-                );
-              default:
-                return const SizedBox();
-            }
-          },
-        ),
+        _versionWidget()
       ],
     );
   }
 
+  Widget _versionWidget() {
+    return FutureBuilder<PackageInfo>(
+      future: PackageInfo.fromPlatform(),
+      builder: (context, snapshot) {
+        switch (snapshot.connectionState) {
+          case ConnectionState.done:
+            return Align(
+              alignment: Alignment.bottomCenter,
+              child: Text(
+                'Version: ${snapshot.data!.version}+${snapshot.data!.buildNumber}',
+                style: Theme.of(context).textTheme.caption,
+              ),
+            );
+          default:
+            return const SizedBox();
+        }
+      },
+    );
+  }
+
   Widget _logo() {
-    return Image.asset('assets/images/logo-with-text.png');
+    return Padding(
+      padding: EdgeInsets.only(left: 20, right: 20),
+      child: Image.asset('assets/images/logo-with-text.png'),
+    );
   }
 
   Widget _loginButton(BuildContext context, bool center) {
@@ -125,17 +135,10 @@ class LoginScreen extends StatelessWidget {
                 // Later once "state" is figured out, this can be just .pop to go back to the last page
                 Navigator.popUntil(context, ModalRoute.withName('/'));
               },
-              child: Text(context.t("Login")),
+              child: Text(context.t("Login or Register")),
             ),
           ),
           Padding(padding: EdgeInsets.only(top: 20)),
-          Center(
-            child: Text(
-              context.t(
-                  "If you need to register, please visit Glimesh.tv on your phone or computer."),
-              textAlign: center ? TextAlign.center : TextAlign.left,
-            ),
-          )
         ],
       ),
     );