Compare commits
4 Commits
v1.1.2
...
old_androi
| Author | SHA1 | Date | |
|---|---|---|---|
| 235cf5f613 | |||
| e1581cd424 | |||
| 5479b04190 | |||
| e247a486e1 |
63
packaging/android/AndroidManifest.xml
Normal file
63
packaging/android/AndroidManifest.xml
Normal file
@@ -0,0 +1,63 @@
|
|||||||
|
<?xml version='1.0' encoding='utf-8'?>
|
||||||
|
<manifest package="org.eyecreate.qiflora" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.3" android:versionCode="7" android:installLocation="auto">
|
||||||
|
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="QiFlora" 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="QiFlora"
|
||||||
|
android:theme="@style/AppTheme"
|
||||||
|
android:screenOrientation="unspecified"
|
||||||
|
android:windowSoftInputMode="adjustResize"
|
||||||
|
android:launchMode="singleTop">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.MAIN"/>
|
||||||
|
<category android:name="android.intent.category.LAUNCHER"/>
|
||||||
|
</intent-filter>
|
||||||
|
<meta-data android:name="android.app.lib_name" android:value="qiflora"/>
|
||||||
|
<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"/>
|
||||||
|
<meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
|
||||||
|
<!-- Deploy Qt libs as part of package -->
|
||||||
|
<meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
|
||||||
|
<meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
|
||||||
|
<meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
|
||||||
|
<!-- Run with local libs -->
|
||||||
|
<meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
|
||||||
|
<meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
|
||||||
|
<meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/>
|
||||||
|
<meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
|
||||||
|
<meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
|
||||||
|
<!-- Messages maps -->
|
||||||
|
<meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
|
||||||
|
<meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
|
||||||
|
<meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
|
||||||
|
<!-- Messages maps -->
|
||||||
|
|
||||||
|
<!-- Splash screen -->
|
||||||
|
<meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/splash"/>
|
||||||
|
<!-- Splash screen -->
|
||||||
|
|
||||||
|
<!-- Background running -->
|
||||||
|
<!-- Warning: changing this value to true may cause unexpected crashes if the
|
||||||
|
application still try to draw after
|
||||||
|
"applicationStateChanged(Qt::ApplicationSuspended)"
|
||||||
|
signal is sent! -->
|
||||||
|
<meta-data android:name="android.app.background_running" android:value="false"/>
|
||||||
|
<!-- Background running -->
|
||||||
|
|
||||||
|
<!-- auto screen scale factor -->
|
||||||
|
<meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/>
|
||||||
|
<!-- auto screen scale factor -->
|
||||||
|
</activity>
|
||||||
|
</application>
|
||||||
|
<uses-sdk android:minSdkVersion="24" />
|
||||||
|
<uses-permission android:name="android.permission.BLUETOOTH" />
|
||||||
|
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
|
||||||
|
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
|
||||||
|
<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
|
||||||
|
|
||||||
|
<!-- 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. -->
|
||||||
|
<!-- %%INSERT_FEATURES -->
|
||||||
|
|
||||||
|
</manifest>
|
||||||
BIN
packaging/android/res/drawable-xxxhdpi/icon.png
Normal file
BIN
packaging/android/res/drawable-xxxhdpi/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
BIN
packaging/android/res/drawable-xxxhdpi/qiflora_splash.9.png
Normal file
BIN
packaging/android/res/drawable-xxxhdpi/qiflora_splash.9.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
BIN
packaging/android/res/drawable/icon.png
Normal file
BIN
packaging/android/res/drawable/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
BIN
packaging/android/res/drawable/qiflora_splash.9.png
Normal file
BIN
packaging/android/res/drawable/qiflora_splash.9.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
12
packaging/android/res/drawable/splash.xml
Normal file
12
packaging/android/res/drawable/splash.xml
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<item>
|
||||||
|
<shape android:shape="rectangle" >
|
||||||
|
<solid android:color="#FF1fca05"/>
|
||||||
|
</shape>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<bitmap android:src="@drawable/qiflora_splash"
|
||||||
|
android:gravity="center"/>
|
||||||
|
</item>
|
||||||
|
</layer-list>
|
||||||
6
packaging/android/res/values/apptheme.xml
Normal file
6
packaging/android/res/values/apptheme.xml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<style name="AppTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
|
||||||
|
<item name="android:windowBackground">@drawable/qiflora_splash</item>
|
||||||
|
</style>
|
||||||
|
</resources>
|
||||||
4
packaging/build-android.sh
Normal file
4
packaging/build-android.sh
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
#makes use of: kdeorg/android-arm-sdk
|
||||||
|
mkdir ../build-android
|
||||||
|
cmake -B build-android -DANDROID_EXTRA_LIBS="/opt/kdeandroid-deps/lib/libcrypto.so;/opt/kdeandroid-deps/lib/libssl.so" -DQTANDROID_EXPORTED_TARGET=qiflora -DANDROID_APK_DIR=./android -DCMAKE_TOOLCHAIN_FILE=/opt/kdeandroid-deps/share/ECM/toolchain/Android.cmake -DCMAKE_PREFIX_PATH="$QT_ANDROID;/opt/kdeandroid-deps" -DKF5Kirigami2_DIR=/opt/kdeandroid-deps/lib/cmake/KF5Kirigami2 -DKF5CoreAddons_DIR=/opt/kdeandroid-deps/lib/cmake/KF5CoreAddons -DECM_DIR=/opt/kdeandroid-deps/share/ECM/cmake -DECM_ADDITIONAL_FIND_ROOT_PATH=$QT_ANDROID ..
|
||||||
@@ -91,7 +91,7 @@
|
|||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.eyecreate.org/eyecreate/qiflora.git",
|
"url": "https://git.eyecreate.org/eyecreate/qiflora.git",
|
||||||
"tag": "v1.1.2",
|
"tag": "v1.1.2",
|
||||||
"commit": "16db502a0460139dcff6a63df90c218e3e4c1d66"
|
"commit": "23fdbd27b63dc48085287dcad206786ebfadb9df"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,11 @@ set(qiflora_SRCS
|
|||||||
main.cpp
|
main.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (CMAKE_SYSTEM_NAME STREQUAL "Android")
|
||||||
|
kirigami_package_breeze_icons(ICONS view-refresh help-about filename-bpm-amarok colors-chromablue quickopen contrast window-close)
|
||||||
|
endif()
|
||||||
|
|
||||||
qt5_add_resources(RESOURCES resources.qrc)
|
qt5_add_resources(RESOURCES resources.qrc)
|
||||||
add_executable(qiflora ${qiflora_SRCS} ${RESOURCES})
|
add_executable(qiflora ${qiflora_SRCS} ${RESOURCES})
|
||||||
target_link_libraries(qiflora Qt5::Core Qt5::Qml Qt5::Quick Qt5::Svg Qt5::Bluetooth Qt5::Charts KF5::CoreAddons)
|
target_link_libraries(qiflora Qt5::Core Qt5::Qml Qt5::Quick Qt5::Svg Qt5::Bluetooth Qt5::Charts KF5::CoreAddons KF5::Kirigami2 Qt5::QuickControls2)
|
||||||
install(TARGETS qiflora ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
|
install(TARGETS qiflora ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import QtQuick 2.6
|
|||||||
import org.kde.kirigami 2.6 as Kirigami
|
import org.kde.kirigami 2.6 as Kirigami
|
||||||
import QtQuick.Controls 2.0 as Controls
|
import QtQuick.Controls 2.0 as Controls
|
||||||
import QtQuick.Layouts 1.12 as Layouts
|
import QtQuick.Layouts 1.12 as Layouts
|
||||||
|
import QtQml.Models 2.2 //This only exists here to help build on android.
|
||||||
import QtCharts 2.3 as Charts
|
import QtCharts 2.3 as Charts
|
||||||
import org.eyecreate.qiflora 1.1
|
import org.eyecreate.qiflora 1.1
|
||||||
|
|
||||||
|
|||||||
112
sysmacros.patch
112
sysmacros.patch
@@ -1,112 +0,0 @@
|
|||||||
diff -Naur udev-175/extras/cdrom_id/cdrom_id.c udev-175-fix/extras/cdrom_id/cdrom_id.c
|
|
||||||
--- udev-175/extras/cdrom_id/cdrom_id.c 2011-06-17 03:28:33.251601571 +0200
|
|
||||||
+++ udev-175-fix/extras/cdrom_id/cdrom_id.c 2019-04-02 12:24:40.131653700 +0200
|
|
||||||
@@ -37,6 +37,7 @@
|
|
||||||
#include <sys/time.h>
|
|
||||||
#include <sys/ioctl.h>
|
|
||||||
#include <linux/cdrom.h>
|
|
||||||
+#include <sys/sysmacros.h>
|
|
||||||
|
|
||||||
#include "libudev.h"
|
|
||||||
#include "libudev-private.h"
|
|
||||||
diff -Naur udev-175/extras/scsi_id/scsi_serial.c udev-175-fix/extras/scsi_id/scsi_serial.c
|
|
||||||
--- udev-175/extras/scsi_id/scsi_serial.c 2011-04-15 00:14:23.739780499 +0200
|
|
||||||
+++ udev-175-fix/extras/scsi_id/scsi_serial.c 2019-04-02 12:24:18.781548109 +0200
|
|
||||||
@@ -33,6 +33,7 @@
|
|
||||||
#include <scsi/sg.h>
|
|
||||||
#include <linux/types.h>
|
|
||||||
#include <linux/bsg.h>
|
|
||||||
+#include <sys/sysmacros.h>
|
|
||||||
|
|
||||||
#include "libudev.h"
|
|
||||||
#include "libudev-private.h"
|
|
||||||
diff -Naur udev-175/libudev/libudev-device.c udev-175-fix/libudev/libudev-device.c
|
|
||||||
--- udev-175/libudev/libudev-device.c 2011-09-23 14:43:44.305381687 +0200
|
|
||||||
+++ udev-175-fix/libudev/libudev-device.c 2019-04-02 12:19:17.220061349 +0200
|
|
||||||
@@ -24,6 +24,7 @@
|
|
||||||
#include <sys/ioctl.h>
|
|
||||||
#include <sys/socket.h>
|
|
||||||
#include <linux/sockios.h>
|
|
||||||
+#include <sys/sysmacros.h>
|
|
||||||
|
|
||||||
#include "libudev.h"
|
|
||||||
#include "libudev-private.h"
|
|
||||||
diff -Naur udev-175/libudev/libudev-device-private.c udev-175-fix/libudev/libudev-device-private.c
|
|
||||||
--- udev-175/libudev/libudev-device-private.c 2011-04-24 00:13:02.466797877 +0200
|
|
||||||
+++ udev-175-fix/libudev/libudev-device-private.c 2019-04-02 12:19:38.570166315 +0200
|
|
||||||
@@ -18,6 +18,7 @@
|
|
||||||
#include <fcntl.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
+#include <sys/sysmacros.h>
|
|
||||||
|
|
||||||
#include "libudev.h"
|
|
||||||
#include "libudev-private.h"
|
|
||||||
diff -Naur udev-175/libudev/libudev-enumerate.c udev-175-fix/libudev/libudev-enumerate.c
|
|
||||||
--- udev-175/libudev/libudev-enumerate.c 2011-08-04 04:26:50.130004746 +0200
|
|
||||||
+++ udev-175-fix/libudev/libudev-enumerate.c 2019-04-02 12:23:07.947864764 +0200
|
|
||||||
@@ -20,7 +20,7 @@
|
|
||||||
#include <stdbool.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
#include <sys/param.h>
|
|
||||||
-
|
|
||||||
+#include <sys/sysmacros.h>
|
|
||||||
#include "libudev.h"
|
|
||||||
#include "libudev-private.h"
|
|
||||||
|
|
||||||
diff -Naur udev-175/udev/udevadm-info.c udev-175-fix/udev/udevadm-info.c
|
|
||||||
--- udev-175/udev/udevadm-info.c 2011-10-09 22:49:21.817999569 +0200
|
|
||||||
+++ udev-175-fix/udev/udevadm-info.c 2019-04-02 12:25:44.908641018 +0200
|
|
||||||
@@ -28,6 +28,7 @@
|
|
||||||
#include <fcntl.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
+#include <sys/sysmacros.h>
|
|
||||||
|
|
||||||
#include "udev.h"
|
|
||||||
|
|
||||||
diff -Naur udev-175/udev/udevd.c udev-175-fix/udev/udevd.c
|
|
||||||
--- udev-175/udev/udevd.c 2011-10-11 13:25:39.619713005 +0200
|
|
||||||
+++ udev-175-fix/udev/udevd.c 2019-04-02 12:17:59.529679774 +0200
|
|
||||||
@@ -43,6 +43,7 @@
|
|
||||||
#include <sys/ioctl.h>
|
|
||||||
#include <sys/inotify.h>
|
|
||||||
#include <sys/utsname.h>
|
|
||||||
+#include <sys/sysmacros.h>
|
|
||||||
|
|
||||||
#include "udev.h"
|
|
||||||
#include "sd-daemon.h"
|
|
||||||
diff -Naur udev-175/udev/udev-event.c udev-175-fix/udev/udev-event.c
|
|
||||||
--- udev-175/udev/udev-event.c 2011-10-06 00:58:11.372582876 +0200
|
|
||||||
+++ udev-175-fix/udev/udev-event.c 2019-04-02 12:18:11.513071921 +0200
|
|
||||||
@@ -33,6 +33,7 @@
|
|
||||||
#include <sys/socket.h>
|
|
||||||
#include <sys/signalfd.h>
|
|
||||||
#include <linux/sockios.h>
|
|
||||||
+#include <sys/sysmacros.h>
|
|
||||||
|
|
||||||
#include "udev.h"
|
|
||||||
|
|
||||||
diff -Naur udev-175/udev/udev-node.c udev-175-fix/udev/udev-node.c
|
|
||||||
--- udev-175/udev/udev-node.c 2011-11-01 13:08:15.803635931 +0100
|
|
||||||
+++ udev-175-fix/udev/udev-node.c 2019-04-02 12:18:21.729788742 +0200
|
|
||||||
@@ -28,6 +28,7 @@
|
|
||||||
#include <sys/time.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
+#include <sys/sysmacros.h>
|
|
||||||
|
|
||||||
#include "udev.h"
|
|
||||||
|
|
||||||
diff -Naur udev-175/udev/udev-rules.c udev-175-fix/udev/udev-rules.c
|
|
||||||
--- udev-175/udev/udev-rules.c 2011-10-22 21:17:06.587663679 +0200
|
|
||||||
+++ udev-175-fix/udev/udev-rules.c 2019-04-02 12:18:55.866623075 +0200
|
|
||||||
@@ -29,6 +29,7 @@
|
|
||||||
#include <dirent.h>
|
|
||||||
#include <fnmatch.h>
|
|
||||||
#include <time.h>
|
|
||||||
+#include <sys/sysmacros.h>
|
|
||||||
|
|
||||||
#include "udev.h"
|
|
||||||
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user