Skip to content

Commit

Permalink
Bugfix
Browse files Browse the repository at this point in the history
  • Loading branch information
realbardia committed Apr 12, 2021
1 parent a929e2c commit 6ea720d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 2 deletions.
7 changes: 7 additions & 0 deletions MeikadeApp.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion configurations/android/15/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<manifest package="org.nilegroup.Meikade" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="4.2.4" android:versionCode="4240" android:installLocation="auto">
<manifest package="org.nilegroup.Meikade" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="4.3.0" android:versionCode="4300" android:installLocation="auto">
<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
Remove the comment if you do not require these default permissions. -->
<uses-permission android:name="android.permission.INTERNET"/>
Expand Down
2 changes: 1 addition & 1 deletion qml/imports/logics/EditPoemPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
1 change: 1 addition & 0 deletions qml/imports/routes/MyPoemRoute.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

0 comments on commit 6ea720d

Please sign in to comment.