more bug fixes

namanshergill · Apr 4, 2021 · b5ce327 · b5ce327
1 parent dfaf852
commit b5ce327
Show file tree

Hide file tree

Showing 14 changed files with 295 additions and 752 deletions.
diff --git a/lib/common/app_scroll_view.dart b/lib/common/app_scroll_view.dart
@@ -99,24 +99,21 @@ class ScrollViewAppBar extends StatelessWidget {
       ),
       bottom: PreferredSize(
         preferredSize: Size.fromHeight(bottomPadding ?? 0),
-        child: Container(
-          color: AppColor.background,
-          child: Column(
-            children: [
-              Padding(
-                padding: EdgeInsets.symmetric(horizontal: 24),
-                child: bottomHeader ?? Container(),
-              ),
-              AppTabBar(
-                controller: tabController,
-                tabs: List.generate(
-                    tabs!.length,
-                    (index) => AppTab(
-                          title: tabs![index],
-                        )),
-              ),
-            ],
-          ),
+        child: Column(
+          children: [
+            Padding(
+              padding: EdgeInsets.symmetric(horizontal: 24),
+              child: bottomHeader ?? Container(),
+            ),
+            AppTabBar(
+              controller: tabController,
+              tabs: List.generate(
+                  tabs!.length,
+                  (index) => AppTab(
+                        title: tabs![index],
+                      )),
+            ),
+          ],
         ),
       ),
     );

diff --git a/lib/common/app_tab_bar.dart b/lib/common/app_tab_bar.dart
@@ -9,36 +9,39 @@ class AppTabBar extends StatelessWidget {
       : _tabController = controller;
   @override
   Widget build(BuildContext context) {
-    return Column(
-      children: [
-        // Divider(
-        //   height: 0,
-        //   color: AppColor.grey3,
-        //   thickness: 0.2,
-        // ),
-        TabBar(
-          physics: BouncingScrollPhysics(),
-          isScrollable: true,
-          controller: _tabController,
-          indicator: BoxDecoration(
-              borderRadius: AppThemeBorderRadius.bigBorderRadius,
-              color: AppColor.accent),
-          unselectedLabelColor: AppColor.grey3,
-          labelStyle: Theme.of(context)
-              .textTheme
-              .headline6!
-              .copyWith(fontSize: 14, fontWeight: FontWeight.w600),
-          indicatorPadding:
-              EdgeInsets.only(left: 8, right: 8, bottom: 8, top: 8),
-          labelPadding: EdgeInsets.only(left: 8, right: 8, bottom: 8, top: 8),
-          tabs: tabs!,
-        ),
-        // Divider(
-        //   height: 0,
-        //   color: AppColor.grey3,
-        //   thickness: 0.2,
-        // ),
-      ],
+    return Container(
+      color: AppColor.background,
+      child: Column(
+        children: [
+          // Divider(
+          //   height: 0,
+          //   color: AppColor.grey3,
+          //   thickness: 0.2,
+          // ),
+          TabBar(
+            physics: BouncingScrollPhysics(),
+            isScrollable: true,
+            controller: _tabController,
+            indicator: BoxDecoration(
+                borderRadius: AppThemeBorderRadius.bigBorderRadius,
+                color: AppColor.accent),
+            unselectedLabelColor: AppColor.grey3,
+            labelStyle: Theme.of(context)
+                .textTheme
+                .headline6!
+                .copyWith(fontSize: 14, fontWeight: FontWeight.w600),
+            indicatorPadding:
+                EdgeInsets.only(left: 8, right: 8, bottom: 8, top: 8),
+            labelPadding: EdgeInsets.only(left: 8, right: 8, bottom: 8, top: 8),
+            tabs: tabs!,
+          ),
+          // Divider(
+          //   height: 0,
+          //   color: AppColor.grey3,
+          //   thickness: 0.2,
+          // ),
+        ],
+      ),
     );
   }
 }

diff --git a/lib/common/bottom_sheet.dart b/lib/common/bottom_sheet.dart
@@ -129,7 +129,7 @@ void showScrollableBottomActionsMenu(BuildContext context,
     builder: (context) {
       final _media = MediaQuery.of(context).size;
       return DraggableScrollableSheet(
-        initialChildSize: 1,
+        initialChildSize: 0.7,
         maxChildSize: 1,
         expand: false,
         minChildSize: 0.6,

diff --git a/lib/common/infinite_scroll_wrapper.dart b/lib/common/infinite_scroll_wrapper.dart
@@ -62,6 +62,9 @@ class InfiniteScrollWrapper<T> extends StatefulWidget {
   /// First page loading indicator.
   final WidgetBuilder? firstPageLoadingBuilder;
 
+  /// ListView ScrollController.
+  final ScrollController? scrollController;
+
   InfiniteScrollWrapper(
       {Key? key,
       required this.future,
@@ -76,6 +79,7 @@ class InfiniteScrollWrapper<T> extends StatefulWidget {
       this.topSpacing = 0,
       this.firstDivider = true,
       this.firstPageLoadingBuilder,
+      this.scrollController,
       this.listEndIndicator = true,
       this.spacing = 16})
       : super(key: key);
@@ -161,6 +165,7 @@ class _InfiniteScrollWrapperState<T> extends State<InfiniteScrollWrapper<T?>> {
         resetAndRefresh();
       }),
       child: PagedListView<int, T>(
+        scrollController: widget.scrollController,
         physics: BouncingScrollPhysics(),
         pagingController: _pagingController,
         builderDelegate: PagedChildBuilderDelegate<T>(
@@ -191,7 +196,10 @@ class _InfiniteScrollWrapperState<T> extends State<InfiniteScrollWrapper<T?>> {
           firstPageProgressIndicatorBuilder: (context) =>
               widget.firstPageLoadingBuilder != null
                   ? widget.firstPageLoadingBuilder!(context)
-                  : LoadingIndicator(),
+                  : Padding(
+                      padding: const EdgeInsets.all(32.0),
+                      child: LoadingIndicator(),
+                    ),
           newPageProgressIndicatorBuilder: (context) => Padding(
             padding: const EdgeInsets.all(32.0),
             child: LoadingIndicator(),

diff --git a/lib/common/markdown_body.dart b/lib/common/markdown_body.dart
@@ -13,6 +13,7 @@ import 'package:onehub/common/image_loader.dart';
 import 'package:onehub/common/shimmer_widget.dart';
 import 'package:onehub/style/borderRadiuses.dart';
 import 'package:onehub/style/colors.dart';
+import 'package:onehub/utils/markdown_emoji.dart';
 import 'package:onehub/utils/regex.dart';
 
 class MarkdownBodyController {
@@ -43,6 +44,7 @@ class _MarkdownBodyState extends State<MarkdownBody> {
   }
 
   void updateData(String data) {
+    data = emoteText(data);
     data = md.markdownToHtml(data);
     var document = parse(data);
     // The list of tags to perform modifications on.

diff --git a/lib/models/issues/issue_model.dart b/lib/models/issues/issue_model.dart
@@ -5,6 +5,7 @@
 import 'dart:convert';
 
 import 'package:onehub/models/issues/issue_timeline_event_model.dart';
+import 'package:onehub/models/repositories/repository_model.dart';
 import 'package:onehub/models/users/user_info_model.dart';
 
 class IssueModel {
@@ -65,7 +66,7 @@ class IssueModel {
   DateTime? closedAt;
   AuthorAssociation? authorAssociation;
   dynamic activeLockReason;
-  Repository? repository;
+  RepositoryModel? repository;
   String? body;
   String? timelineUrl;
   dynamic performedViaGithubApp;
@@ -96,7 +97,7 @@ class IssueModel {
     DateTime? closedAt,
     AuthorAssociation? authorAssociation,
     dynamic activeLockReason,
-    Repository? repository,
+    RepositoryModel? repository,
     String? body,
     String? timelineUrl,
     dynamic performedViaGithubApp,
@@ -186,7 +187,7 @@ class IssueModel {
         activeLockReason: json["active_lock_reason"],
         repository: json["repository"] == null
             ? null
-            : Repository.fromJson(json["repository"]),
+            : RepositoryModel.fromJson(json["repository"]),
         body: json["body"] == null ? null : json["body"],
         timelineUrl: json["timeline_url"] == null ? null : json["timeline_url"],
         performedViaGithubApp: json["performed_via_github_app"],