fixed admin actions visible while guest

Author: remi-martin

lib/api/CategoryAPI.dart

@@ -30,7 +30,7 @@ Future<Map<String,dynamic>> fetchAlbums(String albumID) async {
       var categoryList = result['result']['categories'];
       for (var cat in categoryList) {
         bool canUpload = false;
-        if (API.prefs.getString('user_status') != 'normal'
+        if (!['normal', 'guest'].contains(API.prefs.getString('user_status'))
             || uploadCategoryIdList.contains(cat['id'].toString())) {
           canUpload = true;
         }

lib/api/SessionAPI.dart

@@ -43,7 +43,6 @@ Future<String> loginUser(String url, String username, String password) async {
   return 'Something happened';
 }
 Future<String> loginGuest(String url) async {
-
   API().dio.options.baseUrl = url;
 
   try {

lib/views/CategoryViewPage.dart

@@ -356,7 +356,7 @@ class _CategoryViewPageState extends State<CategoryViewPage> with SingleTickerPr
       title: _isEditMode ?
       Text("${_selectedItems.length}", overflow: TextOverflow.fade, softWrap: true) :
       Text(widget.title),
-      actions: [
+      actions: widget.isAdmin ? [
         _isEditMode ? IconButton(
           onPressed: _onSelectAll,
           icon: _selectedItems.length == imageList.length ?
@@ -365,11 +365,11 @@ class _CategoryViewPageState extends State<CategoryViewPage> with SingleTickerPr
         _isEditMode ? IconButton(
           onPressed: closeEditMode,
           icon: Icon(Icons.cancel),
-        ) : widget.isAdmin? IconButton(
+        ) : widget.isAdmin ? IconButton(
           onPressed: openEditMode,
           icon: Icon(Icons.touch_app_rounded),
         ) : SizedBox(),
-      ],
+      ] : [],
     );
   }
 
@@ -422,7 +422,8 @@ class _CategoryViewPageState extends State<CategoryViewPage> with SingleTickerPr
       overlayOpacity: 0.5,
       shape: CircleBorder(),
       children: [
-        SpeedDialChild(
+        if(widget.isAdmin)
+          SpeedDialChild(
           elevation: 5,
           labelWidget: Text(appStrings(context).createNewAlbum_title, style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold, color: Colors.white)),
           child: Icon(Icons.create_new_folder),
@@ -540,8 +541,10 @@ class _CategoryViewPageState extends State<CategoryViewPage> with SingleTickerPr
           physics: NeverScrollableScrollPhysics(),
           itemBuilder: (BuildContext context, int index) {
             var album = albums[index];
+            print(widget.isAdmin);
             return AlbumListItem(album,
-              isAdmin: API.prefs.getString('user_status') != 'normal',
+              isAdmin: widget.isAdmin && API.prefs.getString('user_status') != 'normal',
+              canUpload: API.prefs.getString('user_status') == 'normal' && _canUpload,
               onClose: () {
                 setState(() {
                   _getData();

lib/views/RootCategoryViewPage.dart

@@ -211,7 +211,8 @@ class _RootCategoryViewPageState extends State<RootCategoryViewPage> with Single
       itemBuilder: (BuildContext context, int index) {
         var album = albums[index];
         return AlbumListItem(album,
-          isAdmin: API.prefs.getString('user_status') != 'normal',
+          isAdmin: widget.isAdmin && API.prefs.getString('user_status') != 'normal',
+          canUpload: API.prefs.getString('user_status') == 'normal' && album['can_upload'],
           onClose: () {
             setState(() {
               _getData();

lib/views/components/list_item.dart

@@ -20,10 +20,11 @@ String albumSubCount(dynamic album, context) {
 }
 
 class AlbumListItem extends StatefulWidget {
-  const AlbumListItem(this.album, {Key key, this.isAdmin = false, this.onClose, this.onOpen}) : super(key: key);
+  const AlbumListItem(this.album, {Key key, this.isAdmin = false, this.onClose, this.onOpen, this.canUpload = false}) : super(key: key);
 
   final dynamic album;
   final bool isAdmin;
+  final bool canUpload;
   final Function() onClose;
   final Function() onOpen;
 
@@ -138,37 +139,40 @@ class _AlbumListItemState extends State<AlbumListItem> {
         borderRadius: BorderRadius.circular(10),
         child: Slidable(
           enabled: widget.isAdmin,
-          child: AlbumListCard(widget.album, isAdmin: widget.isAdmin),
+          child: AlbumListCard(widget.album, isAdmin: widget.isAdmin, canUpload: widget.canUpload,),
           endActionPane: ActionPane(
             motion: DrawerMotion(),
             children: [
               CustomSlidableAction(
                 backgroundColor: Theme.of(context).colorScheme.primary,
-                onPressed: (_) {
-                  _onEditAlbum();
-                },
-                child: Center(
-                  child: Icon(Icons.edit, size: 38, color: Colors.white),
+                onPressed: (_) => _onEditAlbum(),
+                child: SizedBox.expand(
+                  child: FittedBox(
+                    fit: BoxFit.contain,
+                    child: Icon(Icons.edit, color: Colors.white),
+                  ),
                 ),
               ),
               CustomSlidableAction(
                 backgroundColor: Color(0xFF4B4B4B),
-                child: Center(
-                  child: Icon(Icons.reply, size: 38, color: Colors.white),
+                onPressed: (_) => _onMoveAlbum(),
+                child: SizedBox.expand(
+                  child: FittedBox(
+                    fit: BoxFit.contain,
+                    child: Icon(Icons.reply, color: Colors.white),
+                  ),
                 ),
-                onPressed: (_) {
-                  _onMoveAlbum();
-                },
               ),
               CustomSlidableAction(
                 backgroundColor: Colors.red,
-                child: Center(
-                  child: Icon(Icons.delete, size: 38, color: Colors.white),
-                ),
                 autoClose: true,
-                onPressed: (_) {
-                  _onDeleteAlbum();
-                },
+                onPressed: (_) => _onDeleteAlbum(),
+                child: SizedBox.expand(
+                  child: FittedBox(
+                    fit: BoxFit.contain,
+                    child: Icon(Icons.delete, color: Colors.white),
+                  ),
+                ),
               ),
             ],
           ),
@@ -179,10 +183,11 @@ class _AlbumListItemState extends State<AlbumListItem> {
 }
 
 class AlbumListCard extends StatelessWidget {
-  const AlbumListCard(this.album, {Key key, this.isAdmin = false}) : super(key: key);
+  const AlbumListCard(this.album, {Key key, this.isAdmin = false, this.canUpload = false,}) : super(key: key);
 
   final dynamic album;
   final bool isAdmin;
+  final bool canUpload;
 
   @override
   Widget build(BuildContext context) {
@@ -244,7 +249,7 @@ class AlbumListCard extends StatelessWidget {
                       maxLines: 1,
                     ),
                   ),
-                  if(album["can_upload"] ?? false) Padding(
+                  if(canUpload) Padding(
                     padding: const EdgeInsets.only(left: 5),
                     child: Icon(Icons.upload, size: 18,),
                   ),