QDS-10224 Beginning of a new design for Android

CMakeLists.txt

@@ -12,64 +12,64 @@ set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 find_package(
-  QT NAMES Qt6
-  COMPONENTS Core
-  REQUIRED)
+QT NAMES Qt6
+COMPONENTS Core
+REQUIRED)
 find_package(
-  Qt6
-  COMPONENTS Core Widgets Quick Gui Qml
-  REQUIRED)
+Qt6
+COMPONENTS Core Widgets Quick Gui Qml
+REQUIRED)
 
 set(QT_MINIMUM_VERSION 6.3.0)
 if(QT_VERSION VERSION_LESS QT_MINIMUM_VERSION)
-  message(FATAL_ERROR "Minimum supported Qt version: ${QT_MINIMUM_VERSION}")
+message(FATAL_ERROR "Minimum supported Qt version: ${QT_MINIMUM_VERSION}")
 endif()
 
 qt_add_executable(${PROJECT_NAME}
-  design-viewer/importdummy_wasm.qml
-  design-viewer/src/main.cpp
-  design-viewer/src/dv_android.cpp design-viewer/src/dv_android.h
-  design-viewer/src/dv_wasm.cpp design-viewer/src/dv_wasm.h
-  design-viewer/src/dv_base.cpp design-viewer/src/dv_base.h
+design-viewer/importdummy_wasm.qml
+design-viewer/src/main.cpp
+design-viewer/src/dv_android.cpp design-viewer/src/dv_android.h
+design-viewer/src/dv_wasm.cpp design-viewer/src/dv_wasm.h
+design-viewer/src/dv_base.cpp design-viewer/src/dv_base.h
 )
 
 target_link_libraries(${PROJECT_NAME} PRIVATE
-  Qt6::Core Qt6::Widgets
-  Qt6::Quick Qt6::Gui
-  Qt6::Qml Qt6::GuiPrivate
+Qt6::Core Qt6::Widgets
+Qt6::Quick Qt6::Gui
+Qt6::Qml Qt6::GuiPrivate
 )
 
 set_property(TARGET ${PROJECT_NAME}
-  APPEND PROPERTY QT_WASM_INITIAL_MEMORY "50MB"
+APPEND PROPERTY QT_WASM_INITIAL_MEMORY "50MB"
 )
 
 set_property(TARGET ${PROJECT_NAME}
-  APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/design-viewer/android
+APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/design-viewer/android
 )
 
 if (ANDROID)
-    if(EXISTS ${ANDROID_OPENSSL_PATH})
-        message(STATUS "Found OpenSSL for Android. Path: ${ANDROID_OPENSSL_PATH}")
-          set_property(TARGET ${PROJECT_NAME} PROPERTY QT_ANDROID_EXTRA_LIBS
-              ${ANDROID_OPENSSL_PATH}/libcrypto_3.so
-              ${ANDROID_OPENSSL_PATH}/libssl_3.so)
-    else()
-        message(WARNING "Cannot find OpenSSL for Android.")
-    endif()
+if(EXISTS ${ANDROID_OPENSSL_PATH})
+message(STATUS "Found OpenSSL for Android. Path: ${ANDROID_OPENSSL_PATH}")
+set_property(TARGET ${PROJECT_NAME} PROPERTY QT_ANDROID_EXTRA_LIBS
+${ANDROID_OPENSSL_PATH}/libcrypto_3.so
+${ANDROID_OPENSSL_PATH}/libssl_3.so)
+else()
+message(WARNING "Cannot find OpenSSL for Android.")
+endif()
 endif()
 
 # --install configuration
 install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.html
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.wasm
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.js
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/qtloader.js
-    DESTINATION ${CMAKE_INSTALL_PREFIX}
+FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.html
+FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.wasm
+FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.js
+FILES ${CMAKE_CURRENT_BINARY_DIR}/qtloader.js
+DESTINATION ${CMAKE_INSTALL_PREFIX}
 )
 
 install(
-    DIRECTORY ${CMAKE_SOURCE_DIR}/design-viewer/www/
-    DESTINATION ${CMAKE_INSTALL_PREFIX}
+DIRECTORY ${CMAKE_SOURCE_DIR}/design-viewer/www/
+DESTINATION ${CMAKE_INSTALL_PREFIX}
 )
 
 set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_INSTALL_PREFIX})

design-viewer/src/dv_android.cpp

@@ -73,7 +73,6 @@ QSharedPointer<QNetworkReply> DvAndroid::fetchResource(const QString &url)
     QNetworkRequest request(url);
     request.setRawHeader("authorization", "test");
     QSharedPointer<QNetworkReply> reply(m_nam.get(request));
-
     QObject::connect(reply.data(),
                      &QNetworkReply::sslErrors,
                      this,
@@ -122,9 +121,8 @@ void DvAndroid::setupUi()
     });
 
     // configure line edit
-    //    m_lineEdit->setText("https://designviewer.qt.io/qmlprojects/d41d8cd98f00b204e9800998ecf8427e/"
-    //                        "UntitledProject18.qmlrc");
-    m_lineEdit->setText("https://get.station307.com/uNtbGIb9NMa/UntitledProject18.qmlrc");
+    m_lineEdit->setText("https://designviewer.qt.io/qmlprojects/d41d8cd98f00b204e9800998ecf8427e/"
+                        "UntitledProject18.qmlrc");
     //    m_lineEdit->setText(
     //        "https://designviewer.qt.io/qmlprojects/17e8907b3b84b8206d45be4f551f4e25/TestTwo.qmlrc");
     //    m_lineEdit->setText("https://designviewer.qt.io/qmlprojects/17e8907b3b84b8206d45be4f551f4e25/"