New Force Style mode

Aseman-Land · Oct 6, 2024 · 1d7101c · 1d7101c
1 parent 75e5016
commit 1d7101c
Show file tree

Hide file tree

Showing 40 changed files with 44 additions and 38 deletions.
diff --git a/MeikadeApp.pro b/MeikadeApp.pro
@@ -5,6 +5,7 @@ QMAKE_TARGET_BUNDLE_PREFIX = com.meikade
 QMAKE_BUNDLE = Meikade
 
 DEFINES += DISABLE_SUBSCRIPTION
+DEFINES += FORCE_IOSSTYLE
 
 include(configurations/configurations.pri)
 include(translations/translations.pri)

diff --git a/configurations/android/android.pri b/configurations/android/android.pri
@@ -7,6 +7,6 @@ android {
         $$PWD/gradle.properties
 }
 
-ANDROID_ABIS = armeabi-v7a arm64-v8a x86_64 x86
+ANDROID_ABIS = arm64-v8a
 
 android: include(/opt/develop/android/openssl/openssl.pri)
diff --git a/cpp/main.cpp b/cpp/main.cpp
@@ -71,10 +71,15 @@ int main(int argc, char *argv[])
     qputenv("QT_ANDROID_ENABLE_WORKAROUND_TO_DISABLE_PREDICTIVE_TEXT", "1");
     qputenv("QT_LOGGING_RULES", "qt.qml.connections=false");
 
-    bool androidStyle;
+    bool androidStyle = false;
 #ifdef Q_OS_ANDROID
+#ifdef FORCE_IOSSTYLE
+    androidStyle = false;
+    QQuickStyle::setStyle("IOSStyle");
+#else
     androidStyle = true;
     QQuickStyle::setStyle("Material");
+#endif
 #else
     androidStyle = false;
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))

diff --git a/qml/TestDialog.qml b/qml/TestDialog.qml
@@ -134,7 +134,7 @@ Page {
         text: "Configs Panel"
         color: "#fff"
         light: false
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
     }
 
     HScrollBar {

diff --git a/qml/auth/views/privates/ChangePasswordForm.qml b/qml/auth/views/privates/ChangePasswordForm.qml
@@ -99,7 +99,7 @@ Page {
         text: qsTr("Change Password") + Translations.refresher
         color: Colors.headerColor
         light: !Colors.lightHeader
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
 
         RowLayout {
             anchors.left: parent.left

diff --git a/qml/auth/views/privates/ChangePasswordUsingCodeForm.qml b/qml/auth/views/privates/ChangePasswordUsingCodeForm.qml
@@ -98,7 +98,7 @@ Page {
         text: qsTr("Forget Password") + Translations.refresher
         color: Colors.headerColor
         light: !Colors.lightHeader
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
 
         RowLayout {
             anchors.left: parent.left

diff --git a/qml/auth/views/privates/ChangePasswordUsingPasswordForm.qml b/qml/auth/views/privates/ChangePasswordUsingPasswordForm.qml
@@ -99,7 +99,7 @@ Page {
         text: qsTr("Change Password") + Translations.refresher
         color: Colors.headerColor
         light: !Colors.lightHeader
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
 
         RowLayout {
             anchors.left: parent.left

diff --git a/qml/auth/views/privates/ForgetPasswordForm.qml b/qml/auth/views/privates/ForgetPasswordForm.qml
@@ -97,7 +97,7 @@ Page {
         text: qsTr("Forget Password") + Translations.refresher
         color: Colors.headerColor
         light: !Colors.lightHeader
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
 
         RowLayout {
             anchors.left: parent.left

diff --git a/qml/auth/views/privates/LoginForm.qml b/qml/auth/views/privates/LoginForm.qml
@@ -61,7 +61,7 @@ Page {
         text: qsTr("Authenticating") + Translations.refresher
         color: Colors.headerColor
         light: !Colors.lightHeader
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
         visible: !introMode
 
         HeaderBackButton {

diff --git a/qml/auth/views/privates/SignupForm.qml b/qml/auth/views/privates/SignupForm.qml
@@ -265,7 +265,7 @@ Page {
         text: qsTr("Signup") + Translations.refresher
         color: Colors.headerColor
         light: !Colors.lightHeader
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
 
         RowLayout {
             anchors.left: parent.left

diff --git a/qml/explore/views/privates/ExploreForm.qml b/qml/explore/views/privates/ExploreForm.qml
@@ -96,7 +96,7 @@ Item {
         anchors.right: parent.right
         anchors.top: parent.top
         titleFontSize: 10 * Devices.fontDensity
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
         opacity: Devices.isIOS || Devices.isDesktop? 0.8 : 1
     }
 

diff --git a/qml/general/views/AboutView.qml b/qml/general/views/AboutView.qml
@@ -322,7 +322,7 @@ Page {
         anchors.right: parent.right
         anchors.top: parent.top
         color: "#222222"
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
         text: qsTr("About") + Translations.refresher
 
         HeaderBackButton {

diff --git a/qml/general/views/ChangelogsView.qml b/qml/general/views/ChangelogsView.qml
@@ -88,7 +88,7 @@ Page {
         text: qsTr("ChangeLogs") + Translations.refresher
         color: Colors.headerColor
         light: !Colors.lightHeader
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
 
         HeaderBackButton {
             id: closeBtn

diff --git a/qml/general/views/ContactView.qml b/qml/general/views/ContactView.qml
@@ -414,7 +414,7 @@ Page {
         text: qsTr("Contact us") + Translations.refresher
         color: Colors.headerColor
         light: !Colors.lightHeader
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
 
         HeaderBackButton {
             id: closeBtn

diff --git a/qml/general/views/SettingsView.qml b/qml/general/views/SettingsView.qml
@@ -344,7 +344,7 @@ Item {
         anchors.left: parent.left
         text: qsTr("Settings") + Translations.refresher
         color: Colors.lightBackground
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
         light: Colors.darkMode
 
         HeaderBackButton {

diff --git a/qml/general/views/SyncView.qml b/qml/general/views/SyncView.qml
@@ -239,7 +239,7 @@ Page {
         text: qsTr("Sync") + Translations.refresher
         color: Colors.headerColor
         light: !Colors.lightHeader
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
 
         HeaderBackButton {
             id: closeBtn

diff --git a/qml/home/views/privates/HomeForm.qml b/qml/home/views/privates/HomeForm.qml
@@ -96,7 +96,7 @@ Item {
         anchors.right: parent.right
         anchors.top: parent.top
         titleFontSize: 10 * Devices.fontDensity
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
         opacity: Devices.isIOS || Devices.isDesktop? 0.8 : 1
     }
 

diff --git a/qml/imports/components/DrawerFrame.qml b/qml/imports/components/DrawerFrame.qml
@@ -22,7 +22,7 @@ Item {
     Rectangle {
         anchors.fill: parent
         color: Colors.background
-        opacity: 0.5
+        opacity: Devices.isAndroid? 1 : 0.5
     }
 
     AsemanFlickable {

diff --git a/qml/imports/globals/translations/lang-en.qm b/qml/imports/globals/translations/lang-en.qm
diff --git a/qml/imports/globals/translations/lang-fa.qm b/qml/imports/globals/translations/lang-fa.qm
diff --git a/qml/imports/models/MyMeikadeModel.qml b/qml/imports/models/MyMeikadeModel.qml
@@ -63,7 +63,7 @@ AsemanListModel {
         res[res.length] = {
             "title": qsTr("Privacy Policy") + Translations.refresher,
             "icon": "mdi_information",
-            "link": "float:/web?link=http://meikade.com/privacy&title=" + qsTr("Privacy Policy"),
+            "link": "float:/web?link=https://meikade.com/privacy&title=" + qsTr("Privacy Policy"),
             "underco": false
         };
 

diff --git a/qml/lists/views/FavoritedListView.qml b/qml/lists/views/FavoritedListView.qml
@@ -165,7 +165,7 @@ Item {
         text: qsTr("Favoriteds") + Translations.refresher
         color: Colors.headerColor
         light: !Colors.lightHeader
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
 
         HeaderBackButton {
             id: closeBtn

diff --git a/qml/lists/views/FavoritedPoetsListView.qml b/qml/lists/views/FavoritedPoetsListView.qml
@@ -313,7 +313,7 @@ Item {
         anchors.left: parent.left
         color: Colors.headerColor
         light: !Colors.lightHeader
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
 
         ColumnLayout {
             anchors.horizontalCenter: parent.horizontalCenter

diff --git a/qml/lists/views/ListsView.qml b/qml/lists/views/ListsView.qml
@@ -40,7 +40,7 @@ Item {
     Rectangle {
         anchors.fill: parent
         color: selectMode? Colors.background : Colors.deepBackground
-        opacity: selectMode? 0.5 : 1
+        opacity: selectMode && !Devices.isAndroid? 0.5 : 1
     }
 
     ReloadItem {
@@ -325,7 +325,7 @@ Item {
         anchors.left: parent.left
         text: qsTr("Lists") + Translations.refresher
         color: selectMode? "transparent" : Colors.headerColor
-        shadow: selectMode? false : Devices.isAndroid
+        shadow: selectMode? false : isAndroidStyle
         light: (!selectMode || Colors.darkMode) && !Colors.lightHeader
 
         HeaderBackButton {

diff --git a/qml/messages/views/InboxView.qml b/qml/messages/views/InboxView.qml
@@ -155,7 +155,7 @@ Page {
         text: qsTr("Inbox") + Translations.refresher
         color: Colors.headerColor
         light: !Colors.lightHeader
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
 
         HeaderBackButton {
             id: closeBtn

diff --git a/qml/notes/views/AddNoteView.qml b/qml/notes/views/AddNoteView.qml
@@ -241,7 +241,7 @@ Page {
         text: qsTr("Edit Note") + Translations.refresher
         color: Colors.headerColor
         light: !Colors.lightHeader
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
 
         HeaderBackButton {
             id: closeBtn

diff --git a/qml/notes/views/NotesListView.qml b/qml/notes/views/NotesListView.qml
@@ -157,7 +157,7 @@ Item {
         text: qsTr("Notes") + Translations.refresher
         color: Colors.headerColor
         light: !Colors.lightHeader
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
 
         HeaderBackButton {
             id: closeBtn

diff --git a/qml/notes/views/NotesPoetsListView.qml b/qml/notes/views/NotesPoetsListView.qml
@@ -157,7 +157,7 @@ Item {
         text: qsTr("Notes") + Translations.refresher
         color: Colors.headerColor
         light: !Colors.lightHeader
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
 
         HeaderBackButton {
             id: closeBtn

diff --git a/qml/poems/views/MostReadedPoemsView.qml b/qml/poems/views/MostReadedPoemsView.qml
@@ -187,7 +187,7 @@ Item {
         text: qsTr("Most Recents") + Translations.refresher
         color: Colors.headerColor
         light: !Colors.lightHeader
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
 
         HeaderBackButton {
             id: closeBtn

diff --git a/qml/poet/views/ManageOfflinePoetsView.qml b/qml/poet/views/ManageOfflinePoetsView.qml
@@ -302,7 +302,7 @@ Item {
         text: qsTr("Edit Shelf") + Translations.refresher
         color: Colors.headerColor
         light: !Colors.lightHeader
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
 
         HeaderBackButton {
             id: closeBtn

diff --git a/qml/poet/views/PoetBooksView.qml b/qml/poet/views/PoetBooksView.qml
@@ -268,7 +268,7 @@ Item {
         anchors.left: parent.left
         color: Colors.headerColor
         light: !Colors.lightHeader
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
 
         RowLayout {
             anchors.fill: parent

diff --git a/qml/poet/views/PoetTypesView.qml b/qml/poet/views/PoetTypesView.qml
@@ -116,7 +116,7 @@ Item {
         text: qsTr("Manage Shelf") + Translations.refresher
         color: Colors.headerColor
         light: !Colors.lightHeader
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
 
         HeaderBackButton {
             id: closeBtn

diff --git a/qml/poet/views/PoetsListView.qml b/qml/poet/views/PoetsListView.qml
@@ -54,7 +54,7 @@ Item {
         light: !Colors.lightHeader
         text: qsTr("All Poets") + Translations.refresher
         titleFontSize: 10 * Devices.fontDensity
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
 
         HeaderBackButton {
             id: headerBtn

diff --git a/qml/poet/views/TopPoetsView.qml b/qml/poet/views/TopPoetsView.qml
@@ -223,7 +223,7 @@ Item {
         text: qsTr("Manage Shelf") + Translations.refresher
         color: Colors.headerColor
         light: !Colors.lightHeader
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
 
         HeaderBackButton {
             id: closeBtn

diff --git a/qml/publish/views/PublishView.qml b/qml/publish/views/PublishView.qml
@@ -390,7 +390,7 @@ Page {
         anchors.top: parent.top
         color: Colors.headerColor
         light: !Colors.lightHeader
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
 
         Image {
             anchors.centerIn: parent

diff --git a/qml/randoms/views/HafizFaalView.qml b/qml/randoms/views/HafizFaalView.qml
@@ -41,7 +41,7 @@ Item {
         text: qsTr("Hafiz Faal") + Translations.refresher
         color: Colors.headerColor
         light: !Colors.lightHeader
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
 
         HeaderBackButton {
             id: closeBtn

diff --git a/qml/search/views/SearchView.qml b/qml/search/views/SearchView.qml
@@ -365,7 +365,7 @@ Rectangle {
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.top: parent.top
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
 
         Rectangle {
             anchors.fill: parent

diff --git a/qml/volcano/PaymentsDialog.qml b/qml/volcano/PaymentsDialog.qml
@@ -102,7 +102,7 @@ Page {
         anchors.right: parent.right
         color: Colors.headerColor
         light: !Colors.lightHeader
-        shadow: Devices.isAndroid
+        shadow: isAndroidStyle
 
         ColumnLayout {
             anchors.centerIn: parent

diff --git a/thirdparty/qtaseman b/thirdparty/qtaseman
diff --git a/thirdparty/thirdparty.pri b/thirdparty/thirdparty.pri
@@ -1,7 +1,7 @@
 
 !qtHaveModule(asemanqml): {
     QT_ASEMAN_MODULES += core gui qml network widgets sql
-    ASEMAN_QML_MODULES += materialicons controls models viewport base network controls_beta sql
+    ASEMAN_QML_MODULES += materialicons controls models viewport base network controls_beta sql modern graphicaleffects
 
     DEFINES += QASEMAN_STATIC
     include(qtaseman/aseman.pri)
+1 −1		src/asemanqml/asemanqml.pri
+3 −0		src/asemanqml/graphicaleffects/GraphicalEffects/Qt5/Desaturate.qml
+3 −0		src/asemanqml/graphicaleffects/GraphicalEffects/Qt5/LevelAdjust.qml
+1 −0		src/asemanqml/graphicaleffects/GraphicalEffects/Qt5/qmldir
+3 −0		src/asemanqml/graphicaleffects/GraphicalEffects/Qt6/Desaturate.qml
+3 −0		src/asemanqml/graphicaleffects/GraphicalEffects/Qt6/LevelAdjust.qml
+1 −0		src/asemanqml/graphicaleffects/GraphicalEffects/Qt6/qmldir
+2 −0		src/asemanqml/graphicaleffects/qmake_asemangraphicaleffects.qrc
+3 −3		src/asemanqml/viewport/Viewport/IOSContextMenuViewport.qml
+4 −0		src/asemanqml/viewport/asemanviewport.cpp
+4 −4		src/gui/asemanjavalayer.cpp