diff --git a/MeikadeApp.pro b/MeikadeApp.pro index 5463701..8402b1d 100644 --- a/MeikadeApp.pro +++ b/MeikadeApp.pro @@ -11,3 +11,10 @@ include(cpp/cpp.pri) include(objective-c/objective-c.pri) ANDROID_ABIS = armeabi-v7a arm64-v8a x86 x86_64 + +contains(ANDROID_TARGET_ARCH,) { + ANDROID_ABIS = \ + armeabi-v7a \ + arm64-v8a \ + x86_64 +} diff --git a/configurations/android/15/AndroidManifest.xml b/configurations/android/15/AndroidManifest.xml index 2752f84..e2aaeb9 100755 --- a/configurations/android/15/AndroidManifest.xml +++ b/configurations/android/15/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/qml/imports/logics/EditPoemPage.qml b/qml/imports/logics/EditPoemPage.qml index 13355de..fe50958 100644 --- a/qml/imports/logics/EditPoemPage.qml +++ b/qml/imports/logics/EditPoemPage.qml @@ -25,7 +25,7 @@ EditPoemView { navigationRepeater.model: AsemanListModel { data: categories } backBtn.onClicked: ViewportType.open = false - previewBtn.onClicked: Viewport.controller.trigger("float:/mypoems/poem", {"poemId": poemId, "previewText": editArea.text, "previewType": dis.currentType}) + previewBtn.onClicked: Viewport.controller.trigger("popup:/mypoems/poem", {"poemId": poemId, "previewText": editArea.text, "previewType": dis.currentType}) saveBtn.onClicked: { userActions.fetch(); diff --git a/qml/imports/routes/MyPoemRoute.qml b/qml/imports/routes/MyPoemRoute.qml index 1c7f732..32cc0ba 100644 --- a/qml/imports/routes/MyPoemRoute.qml +++ b/qml/imports/routes/MyPoemRoute.qml @@ -7,6 +7,7 @@ import AsemanQml.Base 2.0 MyPoemPage { ViewportType.maximumWidth: Viewport.viewport.width > Viewport.viewport.height && !Devices.isMobile? Viewport.viewport.height * 3 / 5 : 0 ViewportType.touchToClose: true + ViewportType.gestureWidth: Viewport.viewport.height width: Constants.width height: Constants.height }