Ran qmlformat and make license

resources/qml/RoomDirectory.qml

@@ -10,10 +10,10 @@ import im.nheko 1.0
 
 ApplicationWindow {
     id: roomDirectoryWindow
+
+    property RoomDirectoryModel publicRooms
+
     visible: true
-
-    property RoomDirectoryModel publicRooms : RoomDirectoryModel {}
-
     x: MainWindow.x + (MainWindow.width / 2) - (width / 2)
     y: MainWindow.y + (MainWindow.height / 2) - (height / 2)
     minimumWidth: 650
@@ -29,38 +29,12 @@ ApplicationWindow {
         onActivated: roomDirectoryWindow.close()
     }
 
-    header: RowLayout {
-        id: searchBarLayout
-        spacing: Nheko.paddingMedium
-        width: parent.width      
-
-        implicitHeight: roomSearch.height
-
-        MatrixTextField {
-            id: roomSearch
-
-            Layout.fillWidth: true
-	    selectByMouse: true
-
-            font.pixelSize: fontMetrics.font.pixelSize
-            padding: Nheko.paddingMedium
-            color: Nheko.colors.text
-            placeholderText: qsTr("Search for public rooms")
-            onTextChanged: searchTimer.restart()
-        }
-
-        Timer {
-            id: searchTimer
-
-            interval: 350
-            onTriggered: roomDirView.model.setSearchTerm(roomSearch.text)
-        }
-    }
-
     ListView {
         id: roomDirView
+
         anchors.fill: parent
         model: publicRooms
+
         delegate: Rectangle {
             id: roomDirDelegate
 
@@ -70,12 +44,10 @@ ApplicationWindow {
             property int avatarSize: fontMetrics.lineSpacing * 4
 
             color: background
-            
             height: avatarSize + 2.5 * Nheko.paddingMedium
             width: ListView.view.width
 
             RowLayout {
-
                 spacing: Nheko.paddingMedium
                 anchors.fill: parent
                 anchors.margins: Nheko.paddingMedium
@@ -103,6 +75,7 @@ ApplicationWindow {
 
                     RowLayout {
                         id: roomNameRow
+
                         Layout.fillWidth: true
                         spacing: 0
 
@@ -113,21 +86,24 @@ ApplicationWindow {
                             font.pixelSize: fontMetrics.font.pixelSize * 1.1
                             fullText: model.name
                         }
+
                     }
 
                     RowLayout {
                         id: roomDescriptionRow
+
                         Layout.fillWidth: true
                         Layout.preferredWidth: parent.width
                         spacing: Nheko.paddingSmall
                         Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
-			Layout.preferredHeight: fontMetrics.lineSpacing * 4
+                        Layout.preferredHeight: fontMetrics.lineSpacing * 4
 
                         Label {
                             id: roomTopic
+
                             color: roomDirDelegate.unimportantText
                             font.weight: Font.Thin
-			    Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
+                            Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
                             font.pixelSize: fontMetrics.font.pixelSize
                             elide: Text.ElideRight
                             maximumLineCount: 2
@@ -136,60 +112,105 @@ ApplicationWindow {
                             verticalAlignment: Text.AlignVCenter
                             wrapMode: Text.WordWrap
                         }
-			Item {
-			  id: numMembersRectangle
-			  Layout.fillWidth: false
-			  Layout.margins: Nheko.paddingSmall
-                          width: roomCount.width
 
-                        Label {
+                        Item {
-                            id: roomCount
+                            id: numMembersRectangle
-                            color: roomDirDelegate.unimportantText
+
-			    anchors.centerIn: parent
                             Layout.fillWidth: false
-                            font.weight: Font.Thin
+                            Layout.margins: Nheko.paddingSmall
-                            font.pixelSize: fontMetrics.font.pixelSize
+                            width: roomCount.width
-                            text: model.numMembers.toString()
+
-                        }
+                            Label {
-			}
+                                id: roomCount
+
+                                color: roomDirDelegate.unimportantText
+                                anchors.centerIn: parent
+                                Layout.fillWidth: false
+                                font.weight: Font.Thin
+                                font.pixelSize: fontMetrics.font.pixelSize
+                                text: model.numMembers.toString()
+                            }
+
+                        }
+
+                        Item {
+                            id: buttonRectangle
+
+                            Layout.fillWidth: false
+                            Layout.margins: Nheko.paddingSmall
+                            width: joinRoomButton.width
+
+                            Button {
+                                id: joinRoomButton
+
+                                visible: publicRooms.canJoinRoom(model.roomid)
+                                anchors.centerIn: parent
+                                width: Math.ceil(0.1 * roomDirectoryWindow.width)
+                                text: "Join"
+                                onClicked: publicRooms.joinRoom(model.index)
+                            }
+
+                        }
 
-			Item {
-				id: buttonRectangle
-				Layout.fillWidth: false
-				Layout.margins: Nheko.paddingSmall	
-                        	width: joinRoomButton.width
-				Button {
-                            		id: joinRoomButton
-			    		visible: publicRooms.canJoinRoom(model.roomid)
-					anchors.centerIn: parent 
-                            		width: Math.ceil(0.1 * roomDirectoryWindow.width)
-					text: "Join"
-                            		onClicked: publicRooms.joinRoom(model.index)
-                        	}		
-			}
                     }
+
                 }
+
             }
+
         }
 
-	footer: Item {
+        footer: Item {
-		anchors.horizontalCenter: parent.horizontalCenter
+            anchors.horizontalCenter: parent.horizontalCenter
-        	width: parent.width
+            width: parent.width
-        	visible: (publicRooms.reachedEndOfPagination == false) && publicRooms.loadingMoreRooms
+            visible: (publicRooms.reachedEndOfPagination == false) && publicRooms.loadingMoreRooms
-		// hacky but works
+            // hacky but works
-        	height: loadingSpinner.height + 2 * Nheko.paddingLarge
+            height: loadingSpinner.height + 2 * Nheko.paddingLarge
-        	anchors.margins: Nheko.paddingLarge
+            anchors.margins: Nheko.paddingLarge
 
-        	Spinner {
+            Spinner {
-                	id: loadingSpinner
+                id: loadingSpinner
 
-                	anchors.centerIn: parent
+                anchors.centerIn: parent
-			anchors.margins: Nheko.paddingLarge
+                anchors.margins: Nheko.paddingLarge
-			running: visible
+                running: visible
-			foreground: Nheko.colors.mid 
+                foreground: Nheko.colors.mid
-                	z: 7
+                z: 7
-               }
+            }
-    	}
+
+        }
 
     }
+
+    publicRooms: RoomDirectoryModel {
+    }
+
+    header: RowLayout {
+        id: searchBarLayout
+
+        spacing: Nheko.paddingMedium
+        width: parent.width
+        implicitHeight: roomSearch.height
+
+        MatrixTextField {
+            id: roomSearch
+
+            Layout.fillWidth: true
+            selectByMouse: true
+            font.pixelSize: fontMetrics.font.pixelSize
+            padding: Nheko.paddingMedium
+            color: Nheko.colors.text
+            placeholderText: qsTr("Search for public rooms")
+            onTextChanged: searchTimer.restart()
+        }
+
+        Timer {
+            id: searchTimer
+
+            interval: 350
+            onTriggered: roomDirView.model.setSearchTerm(roomSearch.text)
+        }
+
+    }
+
 }

src/RoomDirectoryModel.cpp

@@ -82,10 +82,10 @@ RoomDirectoryModel::getViasForRoom(const std::vector<std::string> &aliases)
 
         vias.reserve(aliases.size());
 
-        std::transform(
+        std::transform(aliases.begin(),
-          aliases.begin(), aliases.end(), std::back_inserter(vias), [](const auto &alias) {
+                       aliases.end(),
-                  return alias.substr(alias.find(":") + 1);
+                       std::back_inserter(vias),
-          });
+                       [](const auto &alias) { return alias.substr(alias.find(":") + 1); });
 
         return vias;
 }
@@ -126,7 +126,8 @@ RoomDirectoryModel::data(const QModelIndex &index, int role) const
 void
 RoomDirectoryModel::fetchMore(const QModelIndex &)
 {
-	if (!canFetchMore_) return;	
+        if (!canFetchMore_)
+                return;
 
         nhlog::net()->debug("Fetching more rooms from mtxclient...");
 
@@ -137,18 +138,18 @@ RoomDirectoryModel::fetchMore(const QModelIndex &)
         // req.third_party_instance_id = third_party_instance_id;
         auto requested_server = server_;
 
-	reachedEndOfPagination_ = false;
+        reachedEndOfPagination_ = false;
-	emit reachedEndOfPaginationChanged();
+        emit reachedEndOfPaginationChanged();
 
-	loadingMoreRooms_ = true;
+        loadingMoreRooms_ = true;
-	emit loadingMoreRoomsChanged();
+        emit loadingMoreRoomsChanged();
 
         http::client()->post_public_rooms(
           req,
           [requested_server, this, req](const mtx::responses::PublicRooms &res,
                                         mtx::http::RequestErr err) {
-		  loadingMoreRooms_ = false;
+                  loadingMoreRooms_ = false;
-		  emit loadingMoreRoomsChanged();
+                  emit loadingMoreRoomsChanged();
 
                   if (err) {
                           nhlog::net()->error(
@@ -184,12 +185,12 @@ RoomDirectoryModel::displayRooms(std::vector<mtx::responses::PublicRoomsChunk> f
         endInsertRows();
 
         if (next_batch.empty()) {
-                canFetchMore_ = false;
+                canFetchMore_           = false;
-		reachedEndOfPagination_ = true;
+                reachedEndOfPagination_ = true;
-		emit reachedEndOfPaginationChanged();
+                emit reachedEndOfPaginationChanged();
         }
 
         prevBatch_ = next_batch;
 
-	nhlog::ui()->debug ("Finished loading rooms");
+        nhlog::ui()->debug("Finished loading rooms");
 }

src/RoomDirectoryModel.h

@@ -27,8 +27,9 @@ class RoomDirectoryModel : public QAbstractListModel
 {
         Q_OBJECT
 
-	Q_PROPERTY (bool loadingMoreRooms READ loadingMoreRooms NOTIFY loadingMoreRoomsChanged)
+        Q_PROPERTY(bool loadingMoreRooms READ loadingMoreRooms NOTIFY loadingMoreRoomsChanged)
-	Q_PROPERTY (bool reachedEndOfPagination READ reachedEndOfPagination NOTIFY reachedEndOfPaginationChanged)
+        Q_PROPERTY(bool reachedEndOfPagination READ reachedEndOfPagination NOTIFY
+                     reachedEndOfPaginationChanged)
 
 public:
         explicit RoomDirectoryModel(QObject *parent = nullptr, const std::string &s = "");
@@ -52,14 +53,11 @@ public:
                 return static_cast<int>(publicRoomsData_.size());
         }
 
-        bool canFetchMore(const QModelIndex &) const override
+        bool canFetchMore(const QModelIndex &) const override { return canFetchMore_; }
-        {
-                return canFetchMore_;
-        }
 
-	bool loadingMoreRooms() const { return loadingMoreRooms_; }
+        bool loadingMoreRooms() const { return loadingMoreRooms_; }
 
-	bool reachedEndOfPagination() const { return reachedEndOfPagination_; }
+        bool reachedEndOfPagination() const { return reachedEndOfPagination_; }
 
         void fetchMore(const QModelIndex &) override;
 
@@ -69,8 +67,8 @@ public:
 signals:
         void fetchedRoomsBatch(std::vector<mtx::responses::PublicRoomsChunk> rooms,
                                const std::string &next_batch);
-	void loadingMoreRoomsChanged();
+        void loadingMoreRoomsChanged();
-	void reachedEndOfPaginationChanged();
+        void reachedEndOfPaginationChanged();
 
 public slots:
         void displayRooms(std::vector<mtx::responses::PublicRoomsChunk> rooms,
@@ -85,9 +83,9 @@ private:
         std::string userSearchString_;
         std::string prevBatch_;
         std::string nextBatch_;
-        bool canFetchMore_ {true};
+        bool canFetchMore_{true};
-	bool loadingMoreRooms_ {false};
+        bool loadingMoreRooms_{false};
-	bool reachedEndOfPagination_ {false};
+        bool reachedEndOfPagination_{false};
         std::vector<mtx::responses::PublicRoomsChunk> publicRoomsData_;
 
         std::vector<std::string> getViasForRoom(const std::vector<std::string> &room);

src/timeline/TimelineViewManager.cpp

@@ -286,8 +286,7 @@ TimelineViewManager::TimelineViewManager(CallManager *callManager, ChatPage *par
                                          "EmojiCategory",
                                          "Error: Only enums");
 
-        qmlRegisterType<RoomDirectoryModel>(
+        qmlRegisterType<RoomDirectoryModel>("im.nheko", 1, 0, "RoomDirectoryModel");
-          "im.nheko", 1, 0, "RoomDirectoryModel");
 
 #ifdef USE_QUICK_VIEW
         view      = new QQuickView(parent);