Merge pull request #320 from bitfriend/issue198_cleanup-code-periodic…

…ally

Issue198 cleanup code periodically

app/lib/screens/HomeScreens/chat/Overview.dart

@@ -68,7 +68,7 @@ class _ChatOverviewState extends State<ChatOverview> {
                   ),
                 ),
                 const SizedBox(height: 10),
-                buildList(context),
+                if (!widget.client.isGuest()) buildList(context),
               ],
             ),
           ),
@@ -120,9 +120,6 @@ class _ChatOverviewState extends State<ChatOverview> {
   }
 
   Widget buildList(BuildContext context) {
-    if (widget.client.isGuest()) {
-      return const SizedBox();
-    }
     return GetBuilder<ChatListController>(
       id: 'chatlist',
       builder: (ChatListController controller) {

app/lib/screens/HomeScreens/faq/Editor.dart

@@ -206,8 +206,6 @@ class _HtmlEditorExampleState extends State<HtmlEditorExample> {
                         },
                       ),
                     )
-                  else
-                    const SizedBox()
                 ],
               ),
             ),

app/lib/screens/HomeScreens/faq/Item.dart

@@ -267,7 +267,6 @@ class _FaqItemScreenState extends State<FaqItemScreen> {
                   endIndent: 20,
                   color: Colors.grey,
                 ),
-                const SizedBox(),
               ],
             ),
           ),

app/lib/widgets/ChatListItem.dart

@@ -104,10 +104,10 @@ class _ChatListItemState extends State<ChatListItem> {
     );
   }
 
-  Widget buildSubtitle(BuildContext context) {
+  Widget? buildSubtitle(BuildContext context) {
     if (widget.latestMessage == null) {
       if (widget.typingUsers.isEmpty) {
-        return const SizedBox();
+        return null;
       }
       return Text(
         getUserPlural(widget.typingUsers),
@@ -189,9 +189,9 @@ class _ChatListItemState extends State<ChatListItem> {
     );
   }
 
-  Widget buildTrailing(BuildContext context) {
+  Widget? buildTrailing(BuildContext context) {
     if (widget.latestMessage == null) {
-      return const SizedBox();
+      return null;
     }
     return Text(
       DateFormat.Hm().format(

app/lib/widgets/CustomChatInput.dart

@@ -46,7 +46,7 @@ class CustomChatInput extends StatelessWidget {
                     mainAxisSize: MainAxisSize.min,
                     mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                     children: [
-                      _buildPlusButton(controller),
+                      if (isChatScreen) _buildAttachmentButton(controller),
                       Expanded(
                         child: Padding(
                           padding: const EdgeInsets.symmetric(horizontal: 10),
@@ -78,10 +78,7 @@ class CustomChatInput extends StatelessWidget {
     );
   }
 
-  Widget _buildPlusButton(ChatRoomController controller) {
-    if (isChatScreen != true) {
-      return const SizedBox();
-    }
+  Widget _buildAttachmentButton(ChatRoomController controller) {
     return Obx(
       () => InkWell(
         onTap: () {

app/lib/widgets/EmptyHistoryPlaceholder.dart

@@ -42,7 +42,8 @@ class EmptyHistoryPlaceholder extends StatelessWidget {
                   ),
                 ),
               ),
-              _buildTypingIndicator(controller),
+              if (controller.typingUsers.isNotEmpty)
+                _buildTypingIndicator(controller),
             ],
           ),
         );
@@ -51,9 +52,6 @@ class EmptyHistoryPlaceholder extends StatelessWidget {
   }
 
   Widget _buildTypingIndicator(ChatRoomController controller) {
-    if (controller.typingUsers.isEmpty) {
-      return const SizedBox();
-    }
     return Positioned.fill(
       child: Align(
         alignment: Alignment.bottomLeft,

app/lib/widgets/SideMenu.dart

@@ -65,7 +65,7 @@ class _SideDrawerState extends State<SideDrawer> {
               buildSharedDocumentsItem(),
               buildFaqItem(),
               const SizedBox(height: 5),
-              buildLogoutItem(context),
+              if (!widget.client.isGuest()) buildLogoutItem(context),
             ],
           ),
         ),
@@ -302,9 +302,6 @@ class _SideDrawerState extends State<SideDrawer> {
   }
 
   Widget buildLogoutItem(BuildContext context) {
-    if (widget.client.isGuest()) {
-      return const SizedBox();
-    }
     return ListTile(
       leading: SvgPicture.asset(
         'assets/images/logout.svg',

app/lib/widgets/ToDoListView.dart

@@ -41,7 +41,7 @@ class _ToDoListViewState extends State<ToDoListView> {
               mainAxisAlignment: MainAxisAlignment.start,
               children: <Widget>[
                 buildSubtitle(),
-                buildDivider(),
+                if (!todoController.initialExpand.value) buildDivider(),
                 Padding(
                   padding: const EdgeInsets.only(top: 10),
                   child: Row(
@@ -98,7 +98,6 @@ class _ToDoListViewState extends State<ToDoListView> {
           ),
           onExpansionChanged: (val) => todoController.toggleExpand(),
           initiallyExpanded: false,
-          trailing: const SizedBox(),
           children: [
             ListView(
               shrinkWrap: true,
@@ -164,7 +163,7 @@ class _ToDoListViewState extends State<ToDoListView> {
                 ),
               ],
             ),
-            buildCompletedTasks(),
+            if (todoController.expandBtn.value) buildCompletedTasks(),
           ],
         ),
       ),
@@ -196,9 +195,6 @@ class _ToDoListViewState extends State<ToDoListView> {
   }
 
   Widget buildDivider() {
-    if (todoController.initialExpand.value) {
-      return const SizedBox();
-    }
     return const Divider(
       color: ToDoTheme.listDividerColor,
       indent: 0,
@@ -208,9 +204,6 @@ class _ToDoListViewState extends State<ToDoListView> {
   }
 
   Widget buildCompletedTasks() {
-    if (!todoController.expandBtn.value) {
-      return const SizedBox();
-    }
     return Padding(
       padding: const EdgeInsets.symmetric(vertical: 10),
       child: ListView(

app/lib/widgets/ToDoTaskItem.dart

@@ -92,13 +92,7 @@ class _ToDoTaskItemState extends State<ToDoTaskItem> {
                             : ToDoTheme.inactiveCheckColor,
                         shape: BoxShape.circle,
                       ),
-                      child: widget.isCompleted
-                          ? const Icon(
-                              Icons.done_outlined,
-                              color: ToDoTheme.inactiveCheckColor,
-                              size: 10,
-                            )
-                          : const SizedBox(),
+                      child: checkBuilder(),
                     ),
                   ),
                   Expanded(
@@ -198,6 +192,17 @@ class _ToDoTaskItemState extends State<ToDoTaskItem> {
     );
   }
 
+  Widget? checkBuilder() {
+    if (!widget.isCompleted) {
+      return null;
+    }
+    return const Icon(
+      Icons.done_outlined,
+      color: ToDoTheme.inactiveCheckColor,
+      size: 10,
+    );
+  }
+
   List<ImageProvider<Object>> getMockAvatars(int count) {
     return List.generate(count, (index) {
       int id = Random().nextInt(70);

app/lib/widgets/TypeIndicator.dart

@@ -140,7 +140,7 @@ class _TypeIndicatorState extends State<TypeIndicator>
             ? MainAxisAlignment.start
             : MainAxisAlignment.end,
         children: [
-          buildStart(),
+          if (widget.bubbleAlignment == BubbleRtlAlignment.left) buildStart(),
           Container(
             margin: const EdgeInsets.all(8),
             padding: const EdgeInsets.only(top: 12),
@@ -169,16 +169,13 @@ class _TypeIndicatorState extends State<TypeIndicator>
               ],
             ),
           ),
-          buildEnd(),
+          if (widget.bubbleAlignment == BubbleRtlAlignment.right) buildEnd(),
         ],
       ),
     );
   }
 
   Widget buildStart() {
-    if (widget.bubbleAlignment != BubbleRtlAlignment.left) {
-      return const SizedBox();
-    }
     return Container(
       margin: const EdgeInsets.only(right: 12),
       child: TypingWidget(
@@ -189,9 +186,6 @@ class _TypeIndicatorState extends State<TypeIndicator>
   }
 
   Widget buildEnd() {
-    if (widget.bubbleAlignment != BubbleRtlAlignment.right) {
-      return const SizedBox();
-    }
     return Container(
       margin: const EdgeInsets.only(left: 12),
       child: TypingWidget(

native/cli/src/action/fetch_news.rs

@@ -1,21 +1,23 @@
 use anyhow::{bail, Context, Result};
 use clap::Parser;
+use effektio_core::{
+    events::{NewsContentType, NewsEventDevContent},
+    ruma::{
+        api::client::filter::RoomEventFilter,
+        events::{room::MediaSource, MessageLikeEvent},
+        RoomId,
+    },
+};
+use log::{info, warn};
 
 use crate::config::{LoginConfig, ENV_ROOM};
-use effektio_core::events;
-use effektio_core::ruma;
-
-use crate::ruma::api::client::filter::RoomEventFilter;
-use crate::ruma::events::room::MediaSource;
-
-use log::{info, warn};
 
 /// Posting a news item to a given room
 #[derive(Parser, Debug)]
 pub struct FetchNews {
     /// The room you want to post the news to
     #[clap(short, long, parse(try_from_str), env = ENV_ROOM)]
-    pub room: Box<ruma::RoomId>,
+    pub room: Box<RoomId>,
     #[clap(flatten)]
     pub login: LoginConfig,
 }
@@ -42,10 +44,10 @@ impl FetchNews {
         for entry in messages.chunk {
             let event = match entry
                 .event
-                .deserialize_as::<ruma::events::MessageLikeEvent<events::NewsEventDevContent>>()
+                .deserialize_as::<MessageLikeEvent<NewsEventDevContent>>()
             {
-                Ok(ruma::events::MessageLikeEvent::Original(o)) => o,
-                Ok(ruma::events::MessageLikeEvent::Redacted(_)) => {
+                Ok(MessageLikeEvent::Original(o)) => o,
+                Ok(MessageLikeEvent::Redacted(_)) => {
                     // FIXME: what do we do with redactions
                     continue;
                 }
@@ -77,15 +79,15 @@ impl FetchNews {
             ]));
             for content in news.contents {
                 let (key, content) = match content {
-                    events::NewsContentType::Image(image) => match image.source {
+                    NewsContentType::Image(image) => match image.source {
                         MediaSource::Plain(url) => ("image", url.to_string()),
                         MediaSource::Encrypted(_) => ("image", "<encrypted>".to_owned()),
                     },
-                    events::NewsContentType::Video(video) => match video.source {
+                    NewsContentType::Video(video) => match video.source {
                         MediaSource::Plain(url) => ("video", url.to_string()),
                         MediaSource::Encrypted(_) => ("video", "<encrypted>".to_owned()),
                     },
-                    events::NewsContentType::Text(text) => ("text", text.body),
+                    NewsContentType::Text(text) => ("text", text.body),
                     _ => ("unknown", "n/a".to_owned()),
                 };
                 table.add_row(term_table::row::Row::new(vec![

native/cli/src/main.rs

@@ -3,8 +3,6 @@
 use anyhow::Result;
 use clap::Parser;
 
-use effektio_core::ruma;
-
 mod action;
 mod config;
 

native/effektio/src/api/auth.rs

@@ -62,8 +62,12 @@ pub async fn login_with_token(base_path: String, restore_token: String) -> Resul
                 .is_guest(is_guest)
                 .build()
                 .unwrap();
-            let c = Client::new(client, state);
-            info!("Successfully logged in {:?} with token.", user_id);
+            let c = Client::new(client.clone(), state);
+            info!(
+                "Successfully logged in user {:?}, device {:?} with token.",
+                user_id,
+                client.device_id(),
+            );
             Ok(c)
         })
         .await?
@@ -100,8 +104,12 @@ pub async fn login_new_client(
                 .is_guest(false)
                 .build()
                 .unwrap();
-            let c = Client::new(client, state);
-            info!("Successfully logged in user: {:?}", user_id);
+            let c = Client::new(client.clone(), state);
+            info!(
+                "Successfully logged in user {:?}, device {:?}",
+                user_id,
+                client.device_id(),
+            );
             Ok(c)
         })
         .await?
@@ -141,8 +149,12 @@ pub async fn register_with_registration_token(
                 .is_guest(false)
                 .build()
                 .unwrap();
-            let c = Client::new(client, state);
-            info!("Successfully registered user: {:?}", username);
+            let c = Client::new(client.clone(), state);
+            info!(
+                "Successfully registered user {:?}, device {:?}",
+                username,
+                client.device_id(),
+            );
             Ok(c)
         })
         .await?