Merge pull request #2965 from MerginMaps/componentstoapp

integrate components to main app

app/CMakeLists.txt

@@ -161,6 +161,7 @@ set(MM_HDRS
     variablesmanager.h
     workspacesmodel.h
     workspacesproxymodel.h
+    mmstyle.h
 )
 
 if (HAVE_BLUETOOTH)
@@ -259,6 +260,7 @@ endif ()
 qt_add_resources(
   MM_SRCS
   img/pics.qrc
+  icons/icons.qrc # TODO merge with pics.qrc?
   i18n/input_i18n.qrc
   fonts/fonts.qrc
 )
@@ -542,7 +544,7 @@ endif ()
 
 add_subdirectory(qml)
 
-# register Singleton
+# register Singleton TODO REMOVE!
 set_source_files_properties(qml/InputStyle.qml PROPERTIES QT_QML_SINGLETON_TYPE TRUE)
 
 # make sure the QML files are not prefixed with "qml/" in the qmldir

app/fonts/fonts.qrc

@@ -1,6 +1,6 @@
 <RCC>
     <qresource prefix="/">
-        <file>Lato-Regular.ttf</file>
-        <file>Lato-Bold.ttf</file>
+        <file>Inter-Regular.ttf</file>
+        <file>Inter-SemiBold.ttf</file>
     </qresource>
 </RCC>

app/icons/icons.qrc

@@ -29,7 +29,7 @@
         <file>More.svg</file>
         <file>MorePhotos.svg</file>
         <file>Mouth.svg</file>
-        <file>Natural Resources.svg</file>
+        <file>NaturalResources.svg</file>
         <file>Other.svg</file>
         <file>Others.svg</file>
         <file>ProjectButtonMore.svg</file>

app/main.cpp

@@ -70,6 +70,7 @@
 #include "qgscoordinatetransformcontext.h"
 #include "qgsvectorlayer.h"
 #include "qgsunittypes.h"
+#include "mmstyle.h"
 
 #include "rememberattributescontroller.h"
 #include "attributecontroller.h"
@@ -589,8 +590,9 @@ int main( int argc, char *argv[] )
 
   // we ship our fonts because they do not need to be installed on the target platform
   QStringList fonts;
-  fonts << ":/Lato-Regular.ttf"
-        << ":/Lato-Bold.ttf";
+  fonts << ":/Inter-Regular.ttf"
+        << ":/Inter-SemiBold.ttf";
+
   for ( QString font : fonts )
   {
     if ( QFontDatabase::addApplicationFont( font ) == -1 )
@@ -610,6 +612,7 @@ int main( int argc, char *argv[] )
   // and properly close connection after writting changes to gpkg.
   qputenv( "OGR_SQLITE_JOURNAL", "DELETE" );
 
+
   // Register to QQmlEngine
   engine.rootContext()->setContextProperty( "__androidUtils", &au );
   engine.rootContext()->setContextProperty( "__iosUtils", &iosUtils );
@@ -657,12 +660,11 @@ int main( int argc, char *argv[] )
   // there are screens that need a "little help", because system DPR has different value than the
   // one we calculated. In these scenarios we use a ratio between real (our) DPR and DPR reported by QT.
   // Use `value * __dp` for each pixel value in QML
-  engine.rootContext()->setContextProperty( "__dp", InputUtils::calculateDpRatio() );
+  qreal dp = InputUtils::calculateDpRatio();
+  engine.rootContext()->setContextProperty( "__dp", dp );
 
-// due to https://bugreports.qt.io/browse/QTBUG-113751, the right DPI is set when app is created (after this pool)
-#if (defined ANDROID && QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) )
-  QTimer::singleShot( 100, [&engine]() { engine.rootContext()->setContextProperty( "__dp", InputUtils::calculateDpRatio() );} );
-#endif
+  MMStyle mmstyle( dp );
+  engine.rootContext()->setContextProperty( "__style", &mmstyle );
 
   // Set simulated position for desktop builds
 #ifdef DESKTOP_OS

app/mmstyle.h

@@ -232,7 +232,7 @@ class MMStyle: public QObject
     QUrl moreIcon() {return QUrl( "qrc:/More.svg" );}
     QUrl morePhotosIcon() {return QUrl( "qrc:/MorePhotos.svg" );}
     QUrl mouthIcon() {return QUrl( "qrc:/Mouth.svg" );}
-    QUrl naturalResourcesIcon() {return QUrl( "qrc:/Natural Resources.svg" );}
+    QUrl naturalResourcesIcon() {return QUrl( "qrc:/NaturalResources.svg" );}
     QUrl otherIcon() {return QUrl( "qrc:/Other.svg" );}
     QUrl othersIcon() {return QUrl( "qrc:/Others.svg" );}
     QUrl projectButtonMoreIcon() {return QUrl( "qrc:/ProjectButtonMore.svg" );}

app/qml/CMakeLists.txt

@@ -33,6 +33,50 @@ set(MM_QML
     components/TextRowWithTitle.qml
     components/TextWithIcon.qml
     components/ToolbarButton.qml
+    components/MMBackButton.qml
+    components/MMButton.qml
+    components/MMButtonInput.qml
+    components/MMComboBox.qml
+    components/MMComponent_reachedDataLimit.qml
+    components/MMDrawer.qml
+    components/MMHeader.qml
+    components/MMHlineText.qml
+    components/MMIcon.qml
+    components/MMIconCheckBoxHorizontal.qml
+    components/MMIconCheckBoxVertical.qml
+    components/MMInput.qml
+    components/MMLink.qml
+    components/MMLinkButton.qml
+    components/MMListDrawer.qml
+    components/MMListDrawerItem.qml
+    components/MMMapButton.qml
+    components/MMMapLabel.qml
+    components/MMMenuDrawer.qml
+    components/MMMorePhoto.qml
+    components/MMNotification.qml
+    components/MMNotificationView.qml
+    components/MMPasswordInput.qml
+    components/MMPhoto.qml
+    components/MMPhotoGallery.qml
+    components/MMProgressBar.qml
+    components/MMProjectItem.qml
+    components/MMRadioButton.qml
+    components/MMRoundButton.qml
+    components/MMRoundLinkButton.qml
+    components/MMShadow.qml
+    components/MMSwitch.qml
+    components/MMTextArea.qml
+    components/MMTextBubble.qml
+    components/MMToolbar.qml
+    components/MMToolbarButton.qml
+    components/MMToolbarLongButton.qml
+    components/MMToolbarMenuButton.qml
+    onboarding/MMAcceptInvitation.qml
+    onboarding/MMCreateWorkspace.qml
+    onboarding/MMHowYouFoundUs.qml
+    onboarding/MMLogin.qml
+    onboarding/MMSignUp.qml
+    onboarding/MMWhichIndustry.qml
     dialogs/MigrateToMerginDialog.qml
     dialogs/MissingAuthDialog.qml
     dialogs/NoPermissionsDialog.qml
@@ -57,6 +101,11 @@ set(MM_QML
     editor/inputvaluerelationcombobox.qml
     editor/inputvaluerelationpage.qml
     editor/inputspacer.qml
+    inputs/MMAbstractEditor.qml
+    inputs/MMCheckBox.qml
+    inputs/MMInputEditor.qml
+    inputs/MMPasswordEditor.qml
+    inputs/MMSliderEditor.qml
     form/FeatureForm.qml
     form/FeatureFormPage.qml
     form/FeatureFormStyling.qml

app/qml/onboarding/MMLogin.qml

@@ -24,6 +24,14 @@ Page {
   signal changeServerClicked
   signal forgotPasswordClicked
 
+  property string apiRoot
+  /**
+  * Suppose to be true if auth request is pending. Then busy indicator is running and
+  * the login button is disabled.
+  */
+  //TODO!!
+  property bool pending: false
+
   readonly property real hPadding: width < __style.maxPageWidth
                                    ? 20 * __dp
                                    : (20 + (width - __style.maxPageWidth) / 2) * __dp
@@ -131,7 +139,7 @@ Page {
     width: parent.width
     height: 50 * __dp
     anchors.bottom: parent.bottom
-    text: "https://app.merginmaps.com/"
+    text: root.apiRoot
     leftIcon: __style.globeIcon
 
     onClicked: changeServerDrawer.visible = true