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,10 +86,12 @@ ApplicationWindow {
                             font.pixelSize: fontMetrics.font.pixelSize * 1.1
                             fullText: model.name
                         }
+
                     }
 
                     RowLayout {
                         id: roomDescriptionRow
+
                         Layout.fillWidth: true
                         Layout.preferredWidth: parent.width
                         spacing: Nheko.paddingSmall
@@ -125,6 +100,7 @@ ApplicationWindow {
 
                         Label {
                             id: roomTopic
+
                             color: roomDirDelegate.unimportantText
                             font.weight: Font.Thin
                             Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
@@ -136,14 +112,17 @@ ApplicationWindow {
                             verticalAlignment: Text.AlignVCenter
                             wrapMode: Text.WordWrap
                         }
+
                         Item {
                             id: numMembersRectangle
+
                             Layout.fillWidth: false
                             Layout.margins: Nheko.paddingSmall
                             width: roomCount.width
 
                             Label {
                                 id: roomCount
+
                                 color: roomDirDelegate.unimportantText
                                 anchors.centerIn: parent
                                 Layout.fillWidth: false
@@ -151,25 +130,34 @@ ApplicationWindow {
                                 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)
                             }
+
                         }
+
                     }
+
                 }
+
             }
+
         }
 
         footer: Item {
@@ -189,7 +177,40 @@ ApplicationWindow {
                 foreground: Nheko.colors.mid
                 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...");
 
@@ -191,5 +192,5 @@ RoomDirectoryModel::displayRooms(std::vector<mtx::responses::PublicRoomsChunk> f
 
         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,10 +53,7 @@ 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_; }
 
@@ -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);