update repos detail default branch

williamHlw · Nov 28, 2019 · 3cbddca · 3cbddca
1 parent 86a25ac
commit 3cbddca
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 37 deletions.
diff --git a/lib/model/RepositoryQL.dart b/lib/model/RepositoryQL.dart
@@ -69,7 +69,7 @@ class RepositoryQL {
       issuesClosed: map["issuesClosed"]["totalCount"],
       issuesOpen: map["issuesOpen"]["totalCount"],
       issuesTotal: map["issues"]["totalCount"],
-      defaultBranch: map["defaultBranchRef"]["name"],
+      defaultBranch: map["defaultBranchRef"] != null ? map["defaultBranchRef"]["name"] : null,
       reposName: map["name"],
       hasIssuesEnabled: map["hasIssuesEnabled"],
       reposFullName: map["nameWithOwner"],

diff --git a/lib/page/repos/repository_detail_page.dart b/lib/page/repos/repository_detail_page.dart
@@ -243,6 +243,12 @@ class _RepositoryDetailPageState extends State<RepositoryDetailPage>
                   parent: animationController, curve: CurveBezier()),
               child: FloatingActionButton(
                 onPressed: () {
+                  if (model.repository?.hasIssuesEnabled == false) {
+                    Fluttertoast.showToast(
+                        msg: GSYLocalizations.i18n(context)
+                            .repos_no_support_issue);
+                    return;
+                  }
                   _createIssue();
                 },
                 child: Icon(Icons.add),
@@ -286,6 +292,6 @@ class BottomStatusModel {
   final IconData watchIcon;
   final IconData starIcon;
 
-  BottomStatusModel(this.watchText, this.starText, this.watchIcon,
-      this.starIcon);
+  BottomStatusModel(
+      this.watchText, this.starText, this.watchIcon, this.starIcon);
 }
diff --git a/lib/page/repos/repostory_detail_info_page.dart b/lib/page/repos/repostory_detail_info_page.dart
@@ -118,7 +118,11 @@ class ReposDetailInfoPageState extends State<ReposDetailInfoPage>
             ReposDetailModel.of(context).currentBranch)
         .then((result) {
       if (result != null && result.result) {
-        ReposDetailModel.of(context).currentBranch = result.data.defaultBranch;
+        if (result.data.defaultBranch != null &&
+            result.data.defaultBranch.length > 0) {
+          ReposDetailModel.of(context).currentBranch =
+              result.data.defaultBranch;
+        }
         ReposDetailModel.of(context).repository = result.data;
         ReposDetailModel.of(context).getReposStatus(_getBottomWidget);
         if (result.next != null) {
@@ -141,43 +145,50 @@ class ReposDetailInfoPageState extends State<ReposDetailInfoPage>
   ///绘制底部状态
   List<Widget> _getBottomWidget() {
     ///根据网络返回数据，返回底部状态数据
-    List<Widget> bottomWidget = ( ReposDetailModel.of(context).bottomModel == null)
+    List<Widget> bottomWidget = (ReposDetailModel.of(context).bottomModel ==
+            null)
         ? []
         : <Widget>[
-      /// star
-      _renderBottomItem( ReposDetailModel.of(context).bottomModel.starText,
-          ReposDetailModel.of(context).bottomModel.starIcon, () {
-            CommonUtils.showLoadingDialog(context);
-            return ReposDao.doRepositoryStarDao(widget.userName,
-                widget.reposName,  ReposDetailModel.of(context).repository.isStared)
-                .then((result) {
-              showRefreshLoading();
-              Navigator.pop(context);
-            });
-          }),
+            /// star
+            _renderBottomItem(ReposDetailModel.of(context).bottomModel.starText,
+                ReposDetailModel.of(context).bottomModel.starIcon, () {
+              CommonUtils.showLoadingDialog(context);
+              return ReposDao.doRepositoryStarDao(
+                      widget.userName,
+                      widget.reposName,
+                      ReposDetailModel.of(context).repository.isStared)
+                  .then((result) {
+                showRefreshLoading();
+                Navigator.pop(context);
+              });
+            }),
 
-      /// watch
-      _renderBottomItem( ReposDetailModel.of(context).bottomModel.watchText,
-          ReposDetailModel.of(context).bottomModel.watchIcon, () {
-            CommonUtils.showLoadingDialog(context);
-            return ReposDao.doRepositoryWatchDao(widget.userName,
-                widget.reposName,  ReposDetailModel.of(context).repository.isSubscription == "SUBSCRIBED")
-                .then((result) {
-              showRefreshLoading();
-              Navigator.pop(context);
-            });
-          }),
+            /// watch
+            _renderBottomItem(
+                ReposDetailModel.of(context).bottomModel.watchText,
+                ReposDetailModel.of(context).bottomModel.watchIcon, () {
+              CommonUtils.showLoadingDialog(context);
+              return ReposDao.doRepositoryWatchDao(
+                      widget.userName,
+                      widget.reposName,
+                      ReposDetailModel.of(context).repository.isSubscription ==
+                          "SUBSCRIBED")
+                  .then((result) {
+                showRefreshLoading();
+                Navigator.pop(context);
+              });
+            }),
 
-      ///fork
-      _renderBottomItem("fork", GSYICons.REPOS_ITEM_FORK, () {
-        CommonUtils.showLoadingDialog(context);
-        return ReposDao.createForkDao(widget.userName, widget.reposName)
-            .then((result) {
-          showRefreshLoading();
-          Navigator.pop(context);
-        });
-      }),
-    ];
+            ///fork
+            _renderBottomItem("fork", GSYICons.REPOS_ITEM_FORK, () {
+              CommonUtils.showLoadingDialog(context);
+              return ReposDao.createForkDao(widget.userName, widget.reposName)
+                  .then((result) {
+                showRefreshLoading();
+                Navigator.pop(context);
+              });
+            }),
+          ];
     return bottomWidget;
   }