Commit bb63bb86 authored by camilo higuita's avatar camilo higuita

update manifest for android

parents 3c369837 d4d2115d
<?xml version="1.0"?>
<manifest package="org.kde.index" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="index" android:icon="@drawable/icon">
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="index" android:screenOrientation="unspecified" android:launchMode="singleTop">
<uses-sdk android:minSdkVersion="19"/>
<!-- 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. -->
<!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
Remove the comment if you do not require these default features. -->
android:name=&quot;com.example.android.tools.NotificationClient&quot;
<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Index" android:icon="@drawable/icon">
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="index" android:screenOrientation="unspecified" android:launchMode="singleTop">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
......@@ -15,7 +25,6 @@
<meta-data android:name="android.app.lib_name" android:value="index"/>
<meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
<meta-data android:name="android.app.repository" android:value="default"/>
<meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
......@@ -57,17 +66,20 @@
<!-- extract android style -->
<!-- available android:values :
* default - In most cases this will be the same as "full", but it can also be something else if needed, e.g., for compatibility reasons
* full - useful QWidget & Quick Controls 1 apps
* minimal - useful for Quick Controls 2 apps, it is much faster than "full"
* none - useful for apps that don't use any of the above Qt modules
-->
<meta-data android:name="android.app.extract_android_style" android:value="minimal"/>
<!-- extract android style -->
</activity>
<!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
<service android:process=":qt" android:name=".MyService">
<!-- android:process=":qt" is needed to force the service to run on a separate process than the Activity -->
......
......@@ -59,10 +59,16 @@ DISTFILES += \
$$PWD/org.kde.index.desktop \
3rdparty/mauikit/src/android/AndroidManifest.xml \
3rdparty/mauikit/src/android/build.gradle \
3rdparty/mauikit/src/android/build.gradle \
3rdparty/mauikit/src/android/gradle/wrapper/gradle-wrapper.jar \
3rdparty/mauikit/src/android/gradle/wrapper/gradle-wrapper.jar \
3rdparty/mauikit/src/android/gradle/wrapper/gradle-wrapper.properties \
3rdparty/mauikit/src/android/gradle/wrapper/gradle-wrapper.properties \
3rdparty/mauikit/src/android/gradlew \
3rdparty/mauikit/src/android/gradlew \
3rdparty/mauikit/src/android/gradlew.bat \
3rdparty/mauikit/src/android/gradlew.bat \
3rdparty/mauikit/src/android/res/values/libs.xml \
3rdparty/mauikit/src/android/res/values/libs.xml
contains(ANDROID_TARGET_ARCH,armeabi-v7a) {
......
......@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
}, Qt::QueuedConnection);
auto context = engine.rootContext();
const auto context = engine.rootContext();
context->setContextProperty("inx", &index);
engine.load(url);
return app.exec();
......
This diff is collapsed.
......@@ -3,130 +3,74 @@ import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import org.kde.kirigami 2.0 as Kirigami
import org.kde.mauikit 1.0 as Maui
//import FMH 1.0
ColumnLayout
Maui.FileBrowser
{
id: control
// orientation: Qt.Vertical
property alias browser : browser
property bool terminalVisible : true
property alias terminal : terminalLoader.item
Maui.FileBrowser
{
id: browser
Layout.fillWidth: true
Layout.fillHeight: true
headBar.visible: true
headBar.drawBorder: true
headBar.plegable: false
menu:[
MenuItem
{
visible: !isMobile
text: qsTr("Show terminal")
checkable: true
checked: terminalVisible
onTriggered:
{
terminalVisible = !terminalVisible
Maui.FM.setDirConf(browser.currentPath+"/.directory", "MAUIFM", "ShowTerminal", terminalVisible)
}
}
]
headBar.rightContent: ToolButton
{
visible: control.terminal
icon.name: "akonadiconsole"
onClicked: control.terminalVisible = !control.terminalVisible
checked : control.terminalVisible
checkable: false
}
height: _browserList.height
width: _browserList.width
onNewBookmark:
headBar.visible: true
itemMenu.contentData: [
MenuItem
{
for(var index in paths)
placesSidebar.list.addPlace(paths[index])
visible: control.itemMenu.isDir
text: qsTr("Open in tab")
onTriggered: openTab(control.itemMenu.item.path)
}
]
onCurrentPathChanged:
menu: [
MenuItem
{
// if(!isAndroid)
// terminalVisible = Maui.FM.dirConf(currentPath+"/.directory")["showterminal"] === "true" ? true : false
if(terminalVisible && !isMobile)
terminal.session.sendText("cd '" + currentPath + "'\n")
for(var i = 0; i < placesSidebar.count; i++)
if(currentPath === placesSidebar.list.get(i).path)
placesSidebar.currentIndex = i
visible: !isMobile
text: qsTr("Show terminal")
checkable: true
checked: terminalVisible
onTriggered:
{
terminalVisible = !terminalVisible
Maui.FM.setDirConf(control.currentPath+"/.directory", "MAUIFM", "ShowTerminal", terminalVisible)
}
}
]
onItemClicked: openItem(index)
onItemDoubleClicked:
{
var item = list.get(index)
console.log(item.mime)
if(Maui.FM.isDir(item.path) || item.mime === "inode/directory")
browser.openFolder(item.path)
else
browser.openFile(item.path)
}
headBar.rightContent: ToolButton
{
visible: terminal
icon.name: "utilities-terminal"
onClicked: terminalVisible = !terminalVisible
checked : terminalVisible
checkable: false
}
// Rectangle
// {
// id: handle
// visible: true
// Layout.fillWidth: true
// height: 5
// color: "transparent"
// Kirigami.Separator
// {
// visible: terminalLoader.visible
// anchors
// {
// bottom: parent.bottom
// right: parent.right
// left: parent.left
// }
// }
onNewBookmark:
{
for(var index in paths)
placesSidebar.list.addPlace(paths[index])
}
// MouseArea
// {
// visible: terminalLoader.visible
onCurrentPathChanged:
{
if(terminalVisible && !isMobile)
terminal.session.sendText("cd '" + currentPath.replace("file://", "") + "'\n")
// anchors.fill: parent
// drag.target: parent
// drag.axis: Drag.YAxis
// drag.smoothed: true
// cursorShape: Qt.SizeVerCursor
// }
// }
for(var i = 0; i < placesSidebar.count; i++)
if(currentPath === placesSidebar.list.get(i).path)
placesSidebar.currentIndex = i
}
// handle: Rectangle
// {
// color: "yellow"
// }
onItemClicked: openItem(index)
Loader
onItemDoubleClicked:
{
id: terminalLoader
visible: terminalVisible && terminal
focus: true
Layout.fillWidth: true
// Layout.fillHeight: true
Layout.minimumHeight: visible && terminal ? 100 : 0
Layout.maximumHeight: visible && terminal ? 500 : 0
Layout.preferredHeight : visible && terminal ? 200 : 0
source: !isMobile ? "Terminal.qml" : undefined
var item = list.get(index)
console.log(item.mime)
if(Maui.FM.isDir(item.path) || item.mime === "inode/directory")
control.openFolder(item.path)
else
control.openFile(item.path)
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment