From 2debd8f2ab177951f449f5107facc1801c627e8a Mon Sep 17 00:00:00 2001 From: LubuWest Date: Thu, 27 Jul 2023 21:52:16 +0200 Subject: [PATCH] Native colors and new message create window --- CHANGELOG.md | 6 +- README.md | 3 +- source-android/android/AndroidManifest.xml | 6 +- source-android/android/build.gradle | 16 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../android/src/FriendiqaService.java | 6 +- .../androidnativeexample/Components.qml | 62 -- .../examples/androidnativeexample/README.md | 25 - .../android-sources/AndroidManifest.xml | 56 - .../android-sources/androidnative.gradle | 34 - .../android-sources/build.gradle | 60 -- .../android-sources/gradle.properties | 9 - .../gradle/wrapper/gradle-wrapper.jar | Bin 53636 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 - .../android-sources/gradlew | 160 --- .../android-sources/gradlew.bat | 90 -- .../android-sources/local.properties | 6 - .../android-sources/res/drawable/icon.png | Bin 4627 -> 0 bytes .../android-sources/res/drawable/splash.xml | 12 - .../android-sources/res/values/apptheme.xml | 6 - .../android-sources/res/values/libs.xml | 25 - .../android-sources/src/ExampleActivity.java | 16 - .../android-sources/src/ExampleService.java | 96 -- .../androidnativeexample.pro | 38 - .../androidnativeexample.pro.user | 392 ------- .../androidnativeexample/debugwrapper.cpp | 17 - .../androidnativeexample/debugwrapper.h | 20 - .../androidnativeexample/deployment.pri | 27 - .../dialog/DialogDemo.qml | 38 - .../imagePicker/ImagePickerDemo.qml | 77 -- .../androidnativeexample/info/InfoDemo.qml | 55 - .../examples/androidnativeexample/main.cpp | 72 -- .../examples/androidnativeexample/main.qml | 76 -- .../notification/NotificationDemo.qml | 30 - .../examples/androidnativeexample/qml.qrc | 31 - .../examples/androidnativeexample/qpm.json | 10 - .../drawable-hdpi/ic_android_black_48dp.png | Bin 519 -> 0 bytes .../res/drawable-hdpi/ic_done_black_24dp.png | Bin 177 -> 0 bytes .../res/drawable-hdpi/icon.png | Bin 4627 -> 0 bytes .../drawable-mdpi/ic_android_black_48dp.png | Bin 343 -> 0 bytes .../res/drawable-mdpi/ic_done_black_24dp.png | Bin 130 -> 0 bytes .../drawable-xhdpi/ic_android_black_48dp.png | Bin 641 -> 0 bytes .../res/drawable-xhdpi/ic_done_black_24dp.png | Bin 188 -> 0 bytes .../drawable-xxhdpi/ic_android_black_48dp.png | Bin 975 -> 0 bytes .../res/drawable-xxhdpi/ic_arrow_back.png | Bin 287 -> 0 bytes .../res/drawable-xxhdpi/ic_camera.png | Bin 1866 -> 0 bytes .../drawable-xxhdpi/ic_done_black_24dp.png | Bin 227 -> 0 bytes .../res/drawable-xxhdpi/ic_image.png | Bin 1056 -> 0 bytes .../drawable-xxhdpi/ic_keyboard_backspace.png | Bin 267 -> 0 bytes .../res/drawable-xxhdpi/ic_menu.png | Bin 127 -> 0 bytes .../ic_android_black_48dp.png | Bin 1295 -> 0 bytes .../drawable-xxxhdpi/ic_done_black_24dp.png | Bin 277 -> 0 bytes .../statusbar/StatusBarDemo.qml | 47 - .../theme/ActionBarBackground.qml | 17 - .../androidnativeexample/theme/AppTheme.qml | 33 - .../androidnativeexample/theme/qmldir | 2 - .../androidnativeexample/toast/ToastDemo.qml | 33 - .../androidnative/AndroidNativeActivity.java | 31 +- .../androidnative/AndroidNativeService.java | 11 +- .../java/src/androidnative/Util.java | 68 +- source-android/common/oauth.cpp | 2 +- source-android/common/oauth.h | 2 +- source-linux/CMakeLists.txt | 31 +- source-linux/common/alarmandroid.cpp | 1 + source-linux/common/documenthandler.cpp | 262 +++++ source-linux/common/documenthandler.h | 114 ++ source-linux/common/filesystem.cpp | 8 +- source-linux/common/friendiqa.cpp | 89 +- source-linux/common/updatenews.cpp | 11 + source-linux/common/updatenews.h | 1 + source-linux/common/xhr.cpp | 6 +- source-linux/images/friendica-tray-black.svg | 707 +++++++++++++ source-linux/images/friendica-tray-white.svg | 707 +++++++++++++ source-linux/js/helper.js | 2 +- source-linux/js/news.js | 3 + source-linux/qml/calendarqml/CalendarDay.qml | 3 +- source-linux/qml/calendarqml/CalendarTab.qml | 19 +- source-linux/qml/calendarqml/EventCreate.qml | 11 +- source-linux/qml/calendarqml/EventList.qml | 4 +- .../qml/calendarqml/EventListItem.qml | 9 +- source-linux/qml/configqml/AcceptRules.qml | 5 +- source-linux/qml/configqml/AccountPage.qml | 994 +++++++++--------- .../qml/configqml/ConfigAppearancePage.qml | 341 +++--- source-linux/qml/configqml/ConfigPage.qml | 5 +- .../qml/configqml/ConfigStartPage.qml | 2 - source-linux/qml/configqml/InfoBox.qml | 5 +- .../qml/configqml/LeftDrawerScrollview.qml | 3 + .../qml/configqml/OSSettingsAndroid.qml | 24 + .../qml/configqml/OSSettingsLinux.qml | 25 +- source-linux/qml/configqml/SyncComponent.qml | 3 +- source-linux/qml/configqml/SyncConfig.qml | 5 +- .../qml/contactqml/ContactsSearchPage.qml | 7 +- .../qml/contactqml/FriendsListTab.qml | 15 +- source-linux/qml/contactqml/FriendsTab.qml | 3 +- .../qml/contactqml/GroupComponent.qml | 9 +- .../qml/contactqml/ProfileComponent.qml | 14 +- source-linux/qml/friendiqa.qml | 52 +- source-linux/qml/genericqml/BlueButton.qml | 5 +- .../qml/genericqml/ContactComponent.qml | 11 +- .../qml/genericqml/DrawerAccountComponent.qml | 14 +- source-linux/qml/genericqml/ImagePicker.qml | 3 +- .../qml/genericqml/ImagePickerLinux.qml | 14 +- .../qml/genericqml/LeftDrawerLinux.qml | 5 +- source-linux/qml/genericqml/MButton.qml | 14 +- .../qml/genericqml/PermissionDialog.qml | 23 +- source-linux/qml/genericqml/Search.qml | 5 +- source-linux/qml/newsqml/BlockUser.qml | 1 - source-linux/qml/newsqml/ContactPage.qml | 9 +- .../qml/newsqml/FriendicaActivities.qml | 11 +- source-linux/qml/newsqml/Hashtag.qml | 5 +- .../qml/newsqml/MessageImageUploadDialog.qml | 15 +- source-linux/qml/newsqml/MessageSend.qml | 738 +++++++------ source-linux/qml/newsqml/MoreComments.qml | 4 +- source-linux/qml/newsqml/NewsPhotolist.qml | 3 +- source-linux/qml/newsqml/NewsStack.qml | 41 +- source-linux/qml/newsqml/NewsTab.qml | 185 +++- source-linux/qml/newsqml/Newsitem.qml | 79 +- source-linux/qml/newsqml/ReportUser.qml | 1 - source-linux/qml/newsqml/SmileyDialog.qml | 109 +- .../qml/photoqml/ImageUploadDialog.qml | 7 +- source-linux/qml/photoqml/PhotoTab.qml | 11 +- source-linux/qtquickcontrols2.conf | 3 +- 122 files changed, 3525 insertions(+), 3122 deletions(-) delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/Components.qml delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/README.md delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/android-sources/AndroidManifest.xml delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/android-sources/androidnative.gradle delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/android-sources/build.gradle delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/android-sources/gradle.properties delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/android-sources/gradle/wrapper/gradle-wrapper.jar delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/android-sources/gradle/wrapper/gradle-wrapper.properties delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/android-sources/gradlew delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/android-sources/gradlew.bat delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/android-sources/local.properties delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/android-sources/res/drawable/icon.png delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/android-sources/res/drawable/splash.xml delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/android-sources/res/values/apptheme.xml delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/android-sources/res/values/libs.xml delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/android-sources/src/ExampleActivity.java delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/android-sources/src/ExampleService.java delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/androidnativeexample.pro delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/androidnativeexample.pro.user delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/debugwrapper.cpp delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/debugwrapper.h delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/deployment.pri delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/dialog/DialogDemo.qml delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/imagePicker/ImagePickerDemo.qml delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/info/InfoDemo.qml delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/main.cpp delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/main.qml delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/notification/NotificationDemo.qml delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/qml.qrc delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/qpm.json delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/res/drawable-hdpi/ic_android_black_48dp.png delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/res/drawable-hdpi/ic_done_black_24dp.png delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/res/drawable-hdpi/icon.png delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/res/drawable-mdpi/ic_android_black_48dp.png delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/res/drawable-mdpi/ic_done_black_24dp.png delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/res/drawable-xhdpi/ic_android_black_48dp.png delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/res/drawable-xhdpi/ic_done_black_24dp.png delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/res/drawable-xxhdpi/ic_android_black_48dp.png delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/res/drawable-xxhdpi/ic_arrow_back.png delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/res/drawable-xxhdpi/ic_camera.png delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/res/drawable-xxhdpi/ic_done_black_24dp.png delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/res/drawable-xxhdpi/ic_image.png delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/res/drawable-xxhdpi/ic_keyboard_backspace.png delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/res/drawable-xxhdpi/ic_menu.png delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/res/drawable-xxxhdpi/ic_android_black_48dp.png delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/res/drawable-xxxhdpi/ic_done_black_24dp.png delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/statusbar/StatusBarDemo.qml delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/theme/ActionBarBackground.qml delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/theme/AppTheme.qml delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/theme/qmldir delete mode 100644 source-android/androidnative.pri/examples/androidnativeexample/toast/ToastDemo.qml create mode 100644 source-linux/common/documenthandler.cpp create mode 100644 source-linux/common/documenthandler.h create mode 100644 source-linux/images/friendica-tray-black.svg create mode 100644 source-linux/images/friendica-tray-white.svg diff --git a/CHANGELOG.md b/CHANGELOG.md index d8d791e..491a5e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ ## v0.6.8 -* OAuth -* New translation: netherland +* OAuth2 as signup method +* New translation: Dutch ## v0.6.7 @@ -210,4 +210,4 @@ # Translations -* German, Spanish \ No newline at end of file +* German, Spanish diff --git a/README.md b/README.md index feb79cb..e09c9ba 100644 --- a/README.md +++ b/README.md @@ -127,7 +127,8 @@ ToDo * [Google Playstore](https://play.google.com/store/apps/details?id=org.qtproject.friendiqa) * Arch User Repository: * Flatpak: +* Flatpak for Mobile Linux: ## License -Pubished under the [GPL v3](http://gplv3.fsf.org) with the exception of the Openssl library, which is published under OpenSSL License. \ No newline at end of file +Pubished under the [GPL v3](http://gplv3.fsf.org) with the exception of the Openssl library, which is published under OpenSSL License. diff --git a/source-android/android/AndroidManifest.xml b/source-android/android/AndroidManifest.xml index cbfb09a..277b677 100644 --- a/source-android/android/AndroidManifest.xml +++ b/source-android/android/AndroidManifest.xml @@ -1,6 +1,6 @@ - + @@ -132,5 +132,9 @@ + + + + diff --git a/source-android/android/build.gradle b/source-android/android/build.gradle index 9f47fcd..01264a5 100644 --- a/source-android/android/build.gradle +++ b/source-android/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.2' + classpath "com.android.tools.build:gradle:4.1.0" } } @@ -25,7 +25,7 @@ dependencies { } dependencies { - compile 'androidx.appcompat:appcompat:1.1.0' + compile 'androidx.appcompat:appcompat:1.4.2' } android { @@ -44,8 +44,14 @@ android { compileSdkVersion androidCompileSdkVersion.toInteger() - buildToolsVersion '28.0.3' + buildToolsVersion '31.0.0' + compileSdkVersion 33 + defaultConfig { + minSdkVersion 26 + targetSdkVersion 31 + resConfigs "en" + } sourceSets { main { manifest.srcFile 'AndroidManifest.xml' @@ -67,10 +73,6 @@ android { aaptOptions { noCompress 'rcc' } - - defaultConfig { - resConfigs "en" - } } apply from: "androidnative.gradle" setAndroidNativePath("/../androidnative.pri"); diff --git a/source-android/android/gradle/wrapper/gradle-wrapper.properties b/source-android/android/gradle/wrapper/gradle-wrapper.properties index 4b7e1f3..186b715 100644 --- a/source-android/android/gradle/wrapper/gradle-wrapper.properties +++ b/source-android/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/source-android/android/src/FriendiqaService.java b/source-android/android/src/FriendiqaService.java index 9115a03..4dc2dda 100644 --- a/source-android/android/src/FriendiqaService.java +++ b/source-android/android/src/FriendiqaService.java @@ -10,15 +10,15 @@ import org.qtproject.qt5.android.QtNative; //import androidnative.friendiqa.FriendiqaQtService; public class FriendiqaService extends JobService{ - private static String TAG = "AndroidNative"; + private static String TAG = "FriendiqaService"; //Log.e(TAG,"Service"); @Override public boolean onStartJob(JobParameters params) { - //Log.d(TAG,"Friendiqa JobService"); + Log.d(TAG,"Friendiqa JobService"); Context context = this.getApplicationContext(); - AndroidNativeService fs = new AndroidNativeService(); + AndroidNativeService fs = new AndroidNativeService(); fs.startQtService(context); jobFinished(params,false); //Intent serviceIntent = new Intent(this, AndroidNativeService.class); diff --git a/source-android/androidnative.pri/examples/androidnativeexample/Components.qml b/source-android/androidnative.pri/examples/androidnativeexample/Components.qml deleted file mode 100644 index cdd7880..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/Components.qml +++ /dev/null @@ -1,62 +0,0 @@ -import QtQuick 2.2 -import QtQuick.Window 2.1 -import QuickAndroid 0.1 -import QuickAndroid.Styles 0.1 -import "./theme" - -Page { - objectName: "ComponentPage"; - - property var pages: [ - { - name: "Image Picker", - demo: "imagePicker/ImagePickerDemo.qml", - description: "Pick photo via Java language binding" - },{ - name: "Toast", - demo: "toast/ToastDemo.qml", - description: "Toast Demonstration" - },{ - name: "Notification", - demo: "notification/NotificationDemo.qml", - description: "Demonstrate how to use SystemDispatcher to send notification" - },{ - name: "Information", - demo: "info/InfoDemo.qml", - description: "Android System Information" - },{ - name: "Status Bar", - demo: "statusbar/StatusBarDemo.qml", - description: "Config Status Bar" - } - - ]; - - actionBar: ActionBar { - id : actionBar - iconSource: A.drawable("ic_menu",Constants.black87) - title: "AndroidNative Component List" - showIcon: false - actionButtonEnabled: false - } - - VisualDataModel { - id: visualDataModel - delegate: ListItem { - title: modelData.name - subtitle: modelData.description - onClicked: { - present(Qt.resolvedUrl(modelData.demo)); - } - } - - model: pages; - } - - ListView { - anchors.fill: parent - - model : visualDataModel - } - -} diff --git a/source-android/androidnative.pri/examples/androidnativeexample/README.md b/source-android/androidnative.pri/examples/androidnativeexample/README.md deleted file mode 100644 index e3a9f38..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/README.md +++ /dev/null @@ -1,25 +0,0 @@ -AndroidNative Example Program -===================== - -Prerequisites -------------- - - * Qt Android SDK >= 5.6 - * Android SDK - -Check this article for how to setup Qt and Android SDK: - -[Getting Started with Qt for Android](http://qt-project.org/doc/qt-5/androidgs.html) - -Build Instruction ------------------ - - 1. Run `qpm install` to get required packages - 1. Open androidnativeexample.pro by Qt Creator - 1. Press the "Projects" tab. Make sure the "Android for xxx" kit has been selected - 1. Plug a Android device to your computer - 1. Press "Build" -> "Run" - 1. The program will be deployed to your device. It is so easy! - -![Screenshot](https://raw.githubusercontent.com/benlau/androidnative.pri/master/docs/screenshots/example1.png) - diff --git a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/AndroidManifest.xml b/source-android/androidnative.pri/examples/androidnativeexample/android-sources/AndroidManifest.xml deleted file mode 100644 index 5ecf270..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/AndroidManifest.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/androidnative.gradle b/source-android/androidnative.pri/examples/androidnativeexample/android-sources/androidnative.gradle deleted file mode 100644 index 8fe9786..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/androidnative.gradle +++ /dev/null @@ -1,34 +0,0 @@ - -// Obtain androidPackageSourceDir -// androidPackageSourceDir is the absolute path of the folder containing build.gradle and AndroidManifests.xml -// This code also works with androiddeployqt. - -import groovy.json.JsonSlurper - -String getAndroidPackageSourceDir() { - String res = System.getProperty("user.dir"); - - FileTree tree = fileTree(dir: res + "/..").include("android*deployment-settings.json"); - - if (tree.getFiles().size() > 0) { - def inputFile = tree.getFiles().toArray()[0]; - def InputJSON = new JsonSlurper().parseText(inputFile.text); - res = InputJSON["android-package-source-directory"] - } else { - println("android*deployment-settings.json not found. Set androidPackageSourceDir to user.dir"); - } - - return res; -} - -String setAndroidNativePath(String path) { - String androidPackageSourceDir = getAndroidPackageSourceDir(); - String androidNativePath = androidPackageSourceDir + path + "/java/src"; - LinkedHashSet hash = android.sourceSets.main.java.srcDirs; - hash.add(androidNativePath); - android.sourceSets.main.java.srcDirs = hash; -} - -ext { - setAndroidNativePath = this.&setAndroidNativePath; -} diff --git a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/build.gradle b/source-android/androidnative.pri/examples/androidnativeexample/android-sources/build.gradle deleted file mode 100644 index 4ce7902..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/build.gradle +++ /dev/null @@ -1,60 +0,0 @@ - -buildscript { - repositories { - jcenter() - } - - dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' - } -} - -allprojects { - repositories { - jcenter() - } -} - -apply plugin: 'com.android.application' - -dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) -} - -android { - /******************************************************* - * The following variables: - * - androidBuildToolsVersion, - * - androidCompileSdkVersion - * - qt5AndroidDir - holds the path to qt android files - * needed to build any Qt application - * on Android. - * - * are defined in gradle.properties file. This file is - * updated by QtCreator and androiddeployqt tools. - * Changing them manually might break the compilation! - *******************************************************/ - - compileSdkVersion androidCompileSdkVersion.toInteger() - - buildToolsVersion androidBuildToolsVersion - - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = [qt5AndroidDir + '/src', 'src', 'java'] - aidl.srcDirs = [qt5AndroidDir + '/src', 'src', 'aidl'] - res.srcDirs = [qt5AndroidDir + '/res', 'res'] - resources.srcDirs = ['src'] - renderscript.srcDirs = ['src'] - assets.srcDirs = ['assets'] - jniLibs.srcDirs = ['libs'] - } - } - lintOptions { - abortOnError false - } -} - -apply from: "androidnative.gradle" -setAndroidNativePath("/../../.."); diff --git a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/gradle.properties b/source-android/androidnative.pri/examples/androidnativeexample/android-sources/gradle.properties deleted file mode 100644 index 798b77d..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/gradle.properties +++ /dev/null @@ -1,9 +0,0 @@ -## This file is automatically generated by QtCreator. -# -# This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. - -androidBuildToolsVersion=25.0.3 -androidCompileSdkVersion=25 -buildDir=.build -qt5AndroidDir=/home/pankraz/Qt/5.9.1/android_armv7/src/android/java diff --git a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/gradle/wrapper/gradle-wrapper.jar b/source-android/androidnative.pri/examples/androidnativeexample/android-sources/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 13372aef5e24af05341d49695ee84e5f9b594659..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53636 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ⅅ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 H-+%o-(+5aQ diff --git a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/gradle/wrapper/gradle-wrapper.properties b/source-android/androidnative.pri/examples/androidnativeexample/android-sources/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 9f2bca4..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Thu Feb 16 01:04:18 HKT 2017 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip diff --git a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/gradlew b/source-android/androidnative.pri/examples/androidnativeexample/android-sources/gradlew deleted file mode 100644 index 9d82f78..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/gradlew +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; -esac - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/gradlew.bat b/source-android/androidnative.pri/examples/androidnativeexample/android-sources/gradlew.bat deleted file mode 100644 index aec9973..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/gradlew.bat +++ /dev/null @@ -1,90 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/local.properties b/source-android/androidnative.pri/examples/androidnativeexample/android-sources/local.properties deleted file mode 100644 index 4277a61..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/local.properties +++ /dev/null @@ -1,6 +0,0 @@ -## This file is automatically generated by QtCreator. -# -# This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. - -sdk.dir=/home/pankraz/android-sdk_alt diff --git a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/res/drawable/icon.png b/source-android/androidnative.pri/examples/androidnativeexample/android-sources/res/drawable/icon.png deleted file mode 100644 index 156243d7b7199fecc70e9313537f5f39efb7261f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4627 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 JPDHLkV1j6B1l#}s diff --git a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/res/drawable/splash.xml b/source-android/androidnative.pri/examples/androidnativeexample/android-sources/res/drawable/splash.xml deleted file mode 100644 index c1bd6fc..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/res/drawable/splash.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/res/values/apptheme.xml b/source-android/androidnative.pri/examples/androidnativeexample/android-sources/res/values/apptheme.xml deleted file mode 100644 index 455b965..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/res/values/apptheme.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/res/values/libs.xml b/source-android/androidnative.pri/examples/androidnativeexample/android-sources/res/values/libs.xml deleted file mode 100644 index 4d68673..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/res/values/libs.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - https://download.qt-project.org/ministro/android/qt5/qt-5.4 - - - - - - - - - - - - - - - - - - - - diff --git a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/src/ExampleActivity.java b/source-android/androidnative.pri/examples/androidnativeexample/android-sources/src/ExampleActivity.java deleted file mode 100644 index ffa8952..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/src/ExampleActivity.java +++ /dev/null @@ -1,16 +0,0 @@ -package androidnative.example; - -import androidnative.AndroidNativeActivity; - -/** - * Created by benlau on 8/3/2017. - */ - -public class ExampleActivity extends AndroidNativeActivity { - public ExampleActivity() { - super(); - - QT_ANDROID_THEMES = new String[] {""}; - QT_ANDROID_DEFAULT_THEME = ""; - } -} diff --git a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/src/ExampleService.java b/source-android/androidnative.pri/examples/androidnativeexample/android-sources/src/ExampleService.java deleted file mode 100644 index 082ff10..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/android-sources/src/ExampleService.java +++ /dev/null @@ -1,96 +0,0 @@ -package androidnative.example; -import androidnative.SystemDispatcher; -import android.app.Notification; -import android.app.NotificationManager; -import android.util.Log; -import android.os.Handler; -import android.app.Activity; -import android.view.View; -import android.content.Context; -import java.util.Map; -import org.qtproject.qt5.android.QtNative; - -public class ExampleService { - - static { - - SystemDispatcher.addListener(new SystemDispatcher.Listener() { - - NotificationManager m_notificationManager; - Notification.Builder m_builder; - - private void notificationManagerNotify(Map data) { - - final Activity activity = QtNative.activity(); - final Map messageData = data; - - Runnable runnable = new Runnable () { - public void run() { - try { - String title = (String) messageData.get("title"); - - String message = (String) messageData.get("message"); - - if (m_notificationManager == null) { - m_notificationManager = (NotificationManager) activity.getSystemService(Context.NOTIFICATION_SERVICE); - m_builder = new Notification.Builder(activity); - - // Small Icon is a must to make notification works. - // And that is why you need to inherit QtActivity - m_builder.setSmallIcon(R.drawable.icon); - } - - m_builder.setContentTitle(title); - m_builder.setContentText(message); - m_notificationManager.notify(1, m_builder.build()); - - // Test function. Remove it later. - SystemDispatcher.dispatch("Notifier.notifyFinished"); - } catch (Exception e) { - Log.d("",e.getMessage()); - } - - }; - }; - activity.runOnUiThread(runnable); - } - - private void hapticFeedbackPerform(Map data) { - - final Activity activity = QtNative.activity(); - final Map messageData = data; - Runnable runnable = new Runnable () { - public void run() { - int feedbackConstant = (Integer) messageData.get("feedbackConstant"); - int flags = (Integer) messageData.get("flags"); - - Log.d("",String.format("hapticFeedbackPerform(%d,%d)",feedbackConstant,flags)); - - View rootView = activity.getWindow().getDecorView().getRootView(); - rootView.performHapticFeedback(feedbackConstant, flags); - - // Test function. Remove it later. - SystemDispatcher.dispatch("hapticFeedbackPerformFinished"); - }; - }; - activity.runOnUiThread(runnable); - } - - public void onDispatched(String name , Map data) { - - if (name.equals("Notifier.notify")) { - notificationManagerNotify(data); - return; - } else if (name.equals("hapticFeedbackPerform")) { - hapticFeedbackPerform(data); - return; - } - - return; - } - }); - - } - -} - diff --git a/source-android/androidnative.pri/examples/androidnativeexample/androidnativeexample.pro b/source-android/androidnative.pri/examples/androidnativeexample/androidnativeexample.pro deleted file mode 100644 index cec26e5..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/androidnativeexample.pro +++ /dev/null @@ -1,38 +0,0 @@ -TEMPLATE = app - -QT += qml quick - -SOURCES += main.cpp \ - debugwrapper.cpp - -RESOURCES += qml.qrc - -# Additional import path used to resolve QML modules in Qt Creator's code model -QML_IMPORT_PATH += ../.. - -android { - ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android-sources -} - -# include(vendor/vendor.pri) -# Default rules for deployment. -include(deployment.pri) -include(../../androidnative.pri) -include(../../../../../../quickandroid/quickandroid.pri) - -DISTFILES += \ - android-sources/AndroidManifest.xml \ - android-sources/src/quickandroid/example/ExampleService.java \ - README.md \ - android-sources/gradle/wrapper/gradle-wrapper.jar \ - android-sources/gradlew \ - android-sources/res/values/libs.xml \ - android-sources/build.gradle \ - android-sources/gradle/wrapper/gradle-wrapper.properties \ - android-sources/gradlew.bat \ - android-sources/settings.gradle \ - android-sources/src/androidnative/example/ExampleService.java - -HEADERS += \ - ../../README.md \ - debugwrapper.h diff --git a/source-android/androidnative.pri/examples/androidnativeexample/androidnativeexample.pro.user b/source-android/androidnative.pri/examples/androidnativeexample/androidnativeexample.pro.user deleted file mode 100644 index 1693b53..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/androidnativeexample.pro.user +++ /dev/null @@ -1,392 +0,0 @@ - - - - - - EnvironmentId - {8825bc46-5cad-4a59-be78-bf9eeaa7217a} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Android - Android - {8e3757e7-5698-4d0f-9f13-55359b1a832e} - 0 - 0 - 0 - - /home/pankraz/build/debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - - true - Anwendungsdaten kopieren - - Qt4ProjectManager.AndroidPackageInstallationStep - - - android-25 - - true - Android-APK erstellen - - QmakeProjectManager.AndroidBuildApkStep - 2 - true - false - - 4 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Bereinigen - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /home/pankraz/ownCloud/clientsync/Friendiqa/v0.005/source-android/androidnative.pri/examples/build-androidnativeexample-Android-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - - true - Anwendungsdaten kopieren - - Qt4ProjectManager.AndroidPackageInstallationStep - - - android-25 - - true - Android-APK erstellen - - QmakeProjectManager.AndroidBuildApkStep - 2 - true - false - - 4 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Bereinigen - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - /home/pankraz/ownCloud/clientsync/Friendiqa/v0.005/source-android/androidnative.pri/examples/build-androidnativeexample-Android-Profile - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - true - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - - true - Anwendungsdaten kopieren - - Qt4ProjectManager.AndroidPackageInstallationStep - - - android-25 - - true - Android-APK erstellen - - QmakeProjectManager.AndroidBuildApkStep - 2 - true - false - - 4 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Bereinigen - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 3 - - - - true - Deployment auf Android-Gerät - - Qt4ProjectManager.AndroidDeployQtStep - false - - 1 - Deployment - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deployment auf Android-Gerät - Deployment auf Android-Gerät - Qt4ProjectManager.AndroidDeployConfiguration2 - - 1 - - CB5A22HSB9 - - - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - - - - androidnativeexample - - Qt4ProjectManager.AndroidRunConfiguration:/home/pankraz/ownCloud/clientsync/Friendiqa/v0.005/source-android/androidnative.pri/examples/androidnativeexample/androidnativeexample.pro - androidnativeexample.pro - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 18 - - - Version - 18 - - diff --git a/source-android/androidnative.pri/examples/androidnativeexample/debugwrapper.cpp b/source-android/androidnative.pri/examples/androidnativeexample/debugwrapper.cpp deleted file mode 100644 index 8aaf024..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/debugwrapper.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "debugwrapper.h" -#include "AndroidNative/debug.h" - -DebugWrapper::DebugWrapper(QObject *parent) : QObject(parent) -{ - -} - -long DebugWrapper::getNativeHeapSize() const -{ - return AndroidNative::Debug::getNativeHeapSize(); -} - -long DebugWrapper::getNativeHeapAllocatedSize() const -{ - return AndroidNative::Debug::getNativeHeapAllocatedSize(); -} diff --git a/source-android/androidnative.pri/examples/androidnativeexample/debugwrapper.h b/source-android/androidnative.pri/examples/androidnativeexample/debugwrapper.h deleted file mode 100644 index 80c3424..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/debugwrapper.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef DEBUGWRAPPER_H -#define DEBUGWRAPPER_H - -#include - -class DebugWrapper : public QObject -{ - Q_OBJECT -public: - explicit DebugWrapper(QObject *parent = 0); - -signals: - -public slots: - long getNativeHeapSize() const; - - long getNativeHeapAllocatedSize() const; -}; - -#endif // DEBUGWRAPPER_H diff --git a/source-android/androidnative.pri/examples/androidnativeexample/deployment.pri b/source-android/androidnative.pri/examples/androidnativeexample/deployment.pri deleted file mode 100644 index 5441b63..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/deployment.pri +++ /dev/null @@ -1,27 +0,0 @@ -android-no-sdk { - target.path = /data/user/qt - export(target.path) - INSTALLS += target -} else:android { - x86 { - target.path = /libs/x86 - } else: armeabi-v7a { - target.path = /libs/armeabi-v7a - } else { - target.path = /libs/armeabi - } - export(target.path) - INSTALLS += target -} else:unix { - isEmpty(target.path) { - qnx { - target.path = /tmp/$${TARGET}/bin - } else { - target.path = /opt/$${TARGET}/bin - } - export(target.path) - } - INSTALLS += target -} - -export(INSTALLS) diff --git a/source-android/androidnative.pri/examples/androidnativeexample/dialog/DialogDemo.qml b/source-android/androidnative.pri/examples/androidnativeexample/dialog/DialogDemo.qml deleted file mode 100644 index 8ee22be..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/dialog/DialogDemo.qml +++ /dev/null @@ -1,38 +0,0 @@ -import QtQuick 2.0 -import QuickAndroid 0.1 -import QuickAndroid.Styles 0.1 -import "../theme" - -Page { - actionBar: ActionBar { - id: actionBar - upEnabled: true - title: qsTr("Dialog Demo") - showTitle: true - - onActionButtonClicked: back(); - z: 10 - - } - - Button { - id: label - text : "Press to launch dialog" - anchors.centerIn: parent - onClicked: { - dialog.open(); - } - } - - Dialog { - id: dialog - anchors.centerIn: parent - title: "Dialog" - Text { - text: "Demo" - } - z: 20 - - acceptButtonText: "OK" - } -} diff --git a/source-android/androidnative.pri/examples/androidnativeexample/imagePicker/ImagePickerDemo.qml b/source-android/androidnative.pri/examples/androidnativeexample/imagePicker/ImagePickerDemo.qml deleted file mode 100644 index e38c7a3..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/imagePicker/ImagePickerDemo.qml +++ /dev/null @@ -1,77 +0,0 @@ -import QtQuick 2.0 -import QuickAndroid 0.1 -import AndroidNative 1.0 as AN -import "../theme" - -Page { - id: demo - actionBar: ActionBar { - title: "Image Picker Demo" - onActionButtonClicked: back(); - } - - AN.ImagePicker { - id: imagePicker; - multiple : true - } - - Rectangle { - anchors.fill: parent - color: Constants.black100 - - Image { - id: image - anchors.fill: parent - source: imagePicker.imageUrl - fillMode: Image.PreserveAspectFit - visible: imagePicker.imageUrls.length <= 1 - } - - Grid { - columns: 3 - spacing: 0 - visible: !image.visible - - Repeater { - model: imagePicker.imageUrls - delegate: Image { - width: demo.width / 3 - height: width / 4 * 3 - source: modelData - asynchronous: true - fillMode: Image.PreserveAspectCrop - } - } - } - - Column { - anchors.right: parent.right - anchors.rightMargin: 16 * A.dp - anchors.bottom: parent.bottom - anchors.bottomMargin: 32 * A.dp - - spacing: 16 * A.dp - - FloatingActionButton { - iconSource: A.drawable("ic_camera",Constants.black87); - size: Constants.small - backgroundColor: Constants.white100 - onClicked: { - imagePicker.takePhoto(); - } - } - - FloatingActionButton { - iconSource: A.drawable("ic_image",Constants.black87); - size: Constants.small - backgroundColor: Constants.white100 - onClicked: { - imagePicker.pickImage(); - } - } - - } - - } -} - diff --git a/source-android/androidnative.pri/examples/androidnativeexample/info/InfoDemo.qml b/source-android/androidnative.pri/examples/androidnativeexample/info/InfoDemo.qml deleted file mode 100644 index d86a319..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/info/InfoDemo.qml +++ /dev/null @@ -1,55 +0,0 @@ -import QtQuick 2.0 -import QuickAndroid 0.1 -import QuickAndroid.Styles 0.1 -import "../theme" - -Page { - id: page - actionBar: ActionBar { - id: actionBar - upEnabled: true - title: qsTr("Information") - showTitle: true - - onActionButtonClicked: back(); - z: 10 - } - - VisualItemModel { - id: itemModel - - ListItem { - title: "Environment.DIRECTORY_DCIM" - subtitle: Environment.DIRECTORY_DCIM - interactive: false - width: page.width - } - - ListItem { - title: "Debug.getNativeHeapSize" - subtitle: (Debug.getNativeHeapSize() / 1024 / 1024).toFixed(2) + "MB"; - interactive: false - width: page.width - } - - ListItem { - title: "Debug.getNativeHeapAllocatedSize" - subtitle: (Debug.getNativeHeapAllocatedSize() / 1024 / 1024).toFixed(2) + "MB"; - interactive: false - width: page.width - } - - ListItem { - title: "QThread.idealThreadCount" - subtitle: Misc.idealThreadCount; - interactive: false - width: page.width - } - } - - - ListView { - anchors.fill: parent - model: itemModel - } -} diff --git a/source-android/androidnative.pri/examples/androidnativeexample/main.cpp b/source-android/androidnative.pri/examples/androidnativeexample/main.cpp deleted file mode 100644 index 062572b..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/main.cpp +++ /dev/null @@ -1,72 +0,0 @@ -#include -#include -#include -#include -#include -#include -//#include "qadrawableprovider.h" -#include "AndroidNative/systemdispatcher.h" -#include "AndroidNative/environment.h" -#include "AndroidNative/debug.h" -#include "AndroidNative/mediascannerconnection.h" -#include "debugwrapper.h" - -using namespace AndroidNative; - -#ifdef Q_OS_ANDROID -#include -#include - -JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void*) { - Q_UNUSED(vm); - qDebug("NativeInterface::JNI_OnLoad()"); - - // It must call this function within JNI_OnLoad to enable System Dispatcher - SystemDispatcher::registerNatives(); - return JNI_VERSION_1_6; -} -#endif - -int main(int argc, char *argv[]) -{ -#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) - QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -#endif - - QGuiApplication app(argc, argv); - app.setApplicationName("Android Native Example"); - app.setOrganizationDomain("com.github.benlau.androidnative"); - - QSettings settings; - - settings.setValue("firstTimeLoading", false); - settings.sync(); - - QVariantMap env; - env["DIRECTORY_DCIM"] = Environment::getExternalStoragePublicDirectory(Environment::DIRECTORY_DCIM); - - QVariantMap misc; - misc["idealThreadCount"] = QThread::idealThreadCount(); - - MediaScannerConnection::scanFile(""); - - SystemDispatcher::instance()->loadClass("androidnative.example.ExampleService"); - - QQmlApplicationEngine engine; - - /* QuickAndroid Initialization */ - engine.addImportPath("qrc:///"); // Add QuickAndroid into the import path - engine.rootContext()->setContextProperty("Environment", env); - engine.rootContext()->setContextProperty("Misc", misc); - engine.rootContext()->setContextProperty("Debug", new DebugWrapper(&engine)); - - /* End of QuickAndroid Initialization */ - - // Extra features: - //QADrawableProvider* provider = new QADrawableProvider(); - //provider->setBasePath("qrc://res"); - //engine.addImageProvider("drawable",provider); - engine.load(QUrl(QStringLiteral("qrc:///main.qml"))); - - return app.exec(); -} diff --git a/source-android/androidnative.pri/examples/androidnativeexample/main.qml b/source-android/androidnative.pri/examples/androidnativeexample/main.qml deleted file mode 100644 index 9a08956..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/main.qml +++ /dev/null @@ -1,76 +0,0 @@ -import QtQuick 2.2 -import QtQuick.Window 2.2 -import QuickAndroid 0.1 -import QuickAndroid.Styles 0.1 -import "./theme" - -Window { - id: window; - width: 480 - height: 640 - - color: "#FFFFFF" - - visible: false; - - /* Fast Splash Screen Setup Instruction - - 1. Create a custom theme (apptheme.qml) and set windowBackground to @drawable/splash.xml (Your splash screen drawable) - - 2. Within AndroidManifest.xml, set android.app.splash_screen_drawable to @drawable/splash.xml - - - - - - That will show a splash screen while Qt is loading. However, screen flicker will happen when your Window - item is shown. To prevent screen flicker completely, you could setup your main.qml accoroding to step 3. - - 3. In your main.qml (the one with Window component) - - 3.1. Set Window.color to a color which is similar to splash screen / Theme.windowBackground - - 3.2. Set visible of Window to false until your content is loaded. (Keep Android splash screen while loading) - - 3.3. Use an asynchronous Loader for your content. Set opacity to 0. - - 3.4. Once everything is ready, set Window.visible to true and perform a fade-in animation on Loader - - */ - - Loader { - id: loader - parent: null - width: window.width - height: window.height - asynchronous: true - opacity: 0 - focus: true; - - sourceComponent: PageStack { - id: stack - objectName: "PageStack"; - initialPage: Components { - - onPresented: { - window.visible = true; - A.setTimeout(function() { - loader.parent = window.contentItem; - loader.opacity = 1; - }, 34); - } - } - } - - Behavior on opacity { - NumberAnimation { - duration: 200 - easing.type: Easing.OutQuad; - } - } - } - - Component.onCompleted: { - ThemeManager.currentTheme = AppTheme - } -} diff --git a/source-android/androidnative.pri/examples/androidnativeexample/notification/NotificationDemo.qml b/source-android/androidnative.pri/examples/androidnativeexample/notification/NotificationDemo.qml deleted file mode 100644 index 174a5a0..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/notification/NotificationDemo.qml +++ /dev/null @@ -1,30 +0,0 @@ -import QtQuick 2.2 -import QtQuick.Window 2.1 -import QuickAndroid 0.1 -import QuickAndroid.Styles 0.1 -import AndroidNative 1.0 as AN -import "../theme" - -Page { - - actionBar: ActionBar { - id : actionBar - title: "Notification" - z: 10 - upEnabled: true - onActionButtonClicked: back(); - } - - Button { - id: label - text : "Press to send notification" - anchors.centerIn: parent - onClicked: { - AN.SystemDispatcher.dispatch("Notifier.notify",{ - title: "Quick Android Example", - message: "Hello!" - }); - } - } - -} diff --git a/source-android/androidnative.pri/examples/androidnativeexample/qml.qrc b/source-android/androidnative.pri/examples/androidnativeexample/qml.qrc deleted file mode 100644 index 225e836..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/qml.qrc +++ /dev/null @@ -1,31 +0,0 @@ - - - main.qml - res/drawable-hdpi/icon.png - Components.qml - res/drawable-xxhdpi/ic_menu.png - dialog/DialogDemo.qml - notification/NotificationDemo.qml - theme/AppTheme.qml - theme/qmldir - res/drawable-hdpi/ic_android_black_48dp.png - res/drawable-xxhdpi/ic_android_black_48dp.png - res/drawable-mdpi/ic_android_black_48dp.png - res/drawable-xhdpi/ic_android_black_48dp.png - res/drawable-xxxhdpi/ic_android_black_48dp.png - res/drawable-hdpi/ic_done_black_24dp.png - res/drawable-mdpi/ic_done_black_24dp.png - res/drawable-xhdpi/ic_done_black_24dp.png - res/drawable-xxhdpi/ic_done_black_24dp.png - res/drawable-xxxhdpi/ic_done_black_24dp.png - theme/ActionBarBackground.qml - res/drawable-xxhdpi/ic_keyboard_backspace.png - res/drawable-xxhdpi/ic_arrow_back.png - res/drawable-xxhdpi/ic_image.png - res/drawable-xxhdpi/ic_camera.png - imagePicker/ImagePickerDemo.qml - info/InfoDemo.qml - toast/ToastDemo.qml - statusbar/StatusBarDemo.qml - - diff --git a/source-android/androidnative.pri/examples/androidnativeexample/qpm.json b/source-android/androidnative.pri/examples/androidnativeexample/qpm.json deleted file mode 100644 index 9ff04fd..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/qpm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "", - "description": "", - "dependencies": [ - "com.github.benlau.quickandroid@0.1.7" - ], - "license": "NONE", - "pri_filename": "", - "webpage": "" -} \ No newline at end of file diff --git a/source-android/androidnative.pri/examples/androidnativeexample/res/drawable-hdpi/ic_android_black_48dp.png b/source-android/androidnative.pri/examples/androidnativeexample/res/drawable-hdpi/ic_android_black_48dp.png deleted file mode 100644 index 6006b1207e3c1471237ada0e1b334b1e3b2bafee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 519 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXoKNzmJMD1F8*dI zU@ZM$bMDLs$+yA`S1!$~Thgu_9lki4^_QD#q@^y?D`1@n9+ zG`}xQ?vnY_C0%{uVEi9`mE#d*`u z;mu6jyPrTJCTo}X=1B_eWY^eb#NVZA2e)rds%jPHUByGA|k0wldT1B8K8g{O;SNCo5DGlpDEh5{}R!&SuQ zX|-?oV07r-F(+5sYxQj19uA4F0*7@nHs;@YsQf$gW>+px@zP|&GZEd1Z}?}-I>Y|V z=y1-BV5J$-bD3R}6Ta_|*W@zZWWK6sUb;=`BCRvpTf-#$b)_C_PW(7UG2P#7{m0nI aGWJPksgEnI&wc~Cfx*+&&t;ucLK6Uc3_uP5 diff --git a/source-android/androidnative.pri/examples/androidnativeexample/res/drawable-hdpi/icon.png b/source-android/androidnative.pri/examples/androidnativeexample/res/drawable-hdpi/icon.png deleted file mode 100644 index 156243d7b7199fecc70e9313537f5f39efb7261f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4627 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 JPDHLkV1j6B1l#}s diff --git a/source-android/androidnative.pri/examples/androidnativeexample/res/drawable-mdpi/ic_android_black_48dp.png b/source-android/androidnative.pri/examples/androidnativeexample/res/drawable-mdpi/ic_android_black_48dp.png deleted file mode 100644 index 41558f251fd6babe4e97b5c54ca1c26cb13508c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 343 zcmV-d0jU0oP)+BViG|2@UF_*Oo3z=fL znJX-A-*mIfd)=TixWP%EZ$g8qIK#zLQ~*+YuzSS81>44fnsdzL z1jFQ*DNKO^GoPlw2WEaufnPenF%vdajOhUoj3XTqCh_aY8xRh`CO)p+0qKZHp)VjE zDUbpwkOEx{RPkx$4G4!|93O|?fN%(Uj99Z`$dNlB9V$zcevX-I76$zlUJgXsE(KEH p9|Q8f$ejcIM#-H6^+s85&L4HEN0QEFeg^;m002ovPDHLkV1k-liMs#* diff --git a/source-android/androidnative.pri/examples/androidnativeexample/res/drawable-mdpi/ic_done_black_24dp.png b/source-android/androidnative.pri/examples/androidnativeexample/res/drawable-mdpi/ic_done_black_24dp.png deleted file mode 100644 index 5e5e7cf2b14732802095661e2de6a8c6eac3e8b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 130 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 diff --git a/source-android/androidnative.pri/examples/androidnativeexample/res/drawable-xxhdpi/ic_done_black_24dp.png b/source-android/androidnative.pri/examples/androidnativeexample/res/drawable-xxhdpi/ic_done_black_24dp.png deleted file mode 100644 index c9c017410928bb4c9ee56d705130377537886c81..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawR(ZNOhEy=Vy}Xh4P=JVY;Pow> z)eh4Z*LH7YPT^1c;c>xMY3CR5UF8g~O~MqEfWRtq)wx@t#f5EcS$cj=DHe>A9+n8m zSQI=s(8$bw&b3_ExG+wt$|R_#_-}!m@==T1(=U4%_LXEm_Sb!xepO%dfZ-C;lZ8td zj!$Hgapx-N^Vofj<@f|98RxE|K99&g#i>rA^B#LHEf9Sw5tKPe>yY6RAwfaGi}hdF Y%FU*83Z;v716|GF>FVdQ&MBb@0A~SHegFUf diff --git a/source-android/androidnative.pri/examples/androidnativeexample/res/drawable-xxhdpi/ic_image.png b/source-android/androidnative.pri/examples/androidnativeexample/res/drawable-xxhdpi/ic_image.png deleted file mode 100644 index b32fafffd65497b53aba10fed5a238f557b03505..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1056 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoY)RhkE(}8pX7+2iB`GtXjd9|mDV@SoVw{v~Hr2|FU&d+2ETA{FI^{$mA z!ZCdp=H`A@e{(7RLj7gmT>`s;4(9F-H)K(HoS^W+Xh(p6&X3m4;O8X^w=Fz2t9sJT zbf0_alF#Gb@8!3A-r5qQ1hfVU4D>!M5N=7dIC`eo#pLjr^)5>?_O8@PeAd??BYbgP zN6xXr8iNZpw;G=o?JOuNGCF@oo_*%?PGzM{c9xbqcWvAD&D;2(@!17MJ7X+tZU3G* z^FE`7e||^D%*tJtU+&SJ>h(2j_0(N{0vZ2a|NQyWM(}LJdpq|tbLP&iy~I-@CeZe9 zN=MCxdxd=R<0D0C{Gpkd4ZxW?=plgpE(U-dqBJb>LhXET?4<*bQ8wC`ULX}oUu3s$9`kJ*O!Jeb(Y1!_xN0SO? zb;L#Mub3TJ&mJSf)#@eU>bd#mo}_2%T}o2-uE=wXY>0`E*U!t%mA$`L!1dz74xLE- zHM0Z7J|w57FaP14@4c9KgG!011iBzw0 z+B$>Hr{C+nVRziHCbFf}-azm}gjeUH41M3rQ|*?&)=SpX`Q2E~_;-nj(jtq#>%TqR zzMq;Qwz}>?w8MSP){YhZDOWc4WNv)H9>=<4naD4HqpCGMnHyfP-($%L_FA8EC13LL zgWd8!gckT|x_qBBF&N0*EdN8mpukJ<*X$mVRG-%MbrZHWEL>Xx7@XWzY@X|Z^h z^Rla1OP2<%yqC8<-r%#e)cxv|cX}UxF57#A{d$C@(VOfwunfe&aNx%W>7Ily!cP=r Qu7X58UHx3vIVCg!0Og^^MgRZ+ diff --git a/source-android/androidnative.pri/examples/androidnativeexample/res/drawable-xxhdpi/ic_keyboard_backspace.png b/source-android/androidnative.pri/examples/androidnativeexample/res/drawable-xxhdpi/ic_keyboard_backspace.png deleted file mode 100644 index a49c20c1d59742c35ca6ef8c73680cbd18a87ab8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ(KnOP(%{Ar*{oZ=c=RvLV^ec$G#;;%MIUHIhX&L=NjK6!{#YE87+ zJK1KdedUvh?sAyKbL~$jl>2Rt&$OwYyj=bKy(ceEDo=1f<9#dro@1awIPdhU@jfaO zU4%SK=COJ}7&Db8cqnzMO!8RtdW|25aU%br&|Ni;DU~X_{3mF9_V_YGA@JG67nY7n fl`zLKF#M}!$iLt>-Jr2Y1SII`>gTe~DWM4fKxSi3 diff --git a/source-android/androidnative.pri/examples/androidnativeexample/res/drawable-xxhdpi/ic_menu.png b/source-android/androidnative.pri/examples/androidnativeexample/res/drawable-xxhdpi/ic_menu.png deleted file mode 100644 index ab83be5891b038ab4b387fcf3700159e5646eb6b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^6F``e8A#skDEJMe*aCb)T!AzYEKT2e9!N2k1o;Is zI6S+N2IQ!Fx;TbZFeXb_C5ZGe{r>Oq;QR++CH|hKi&Kox9LzW+>1(+-L4<)pMeWv_ Tg1t}YgUs=C^>bP0l+XkK;QA$* diff --git a/source-android/androidnative.pri/examples/androidnativeexample/res/drawable-xxxhdpi/ic_android_black_48dp.png b/source-android/androidnative.pri/examples/androidnativeexample/res/drawable-xxxhdpi/ic_android_black_48dp.png deleted file mode 100644 index ded531fc556e77087c7a6d939e0550e6cfd32017..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1295 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE1xWt5x}=AJf#sT~i(^Oy1z&`=+wJ|F)^L8#wG+#4e!XZ6_;?1p#V>${` z&OWv|ckcLEy=$KHQa}CKxBvdy1udWPhgp2UzuM~-)ozt4ikk$wWjz5hqf64vnOF?6JNI=mU!*i9pPNaU;|J!6b=aF3M7xAM#myT&KPx&mpLt*y)KdeB`tDUX? zik+`aVob2r58%4HbRtjmkDj1a2iTad`?dtF@nC1P_K{o~bHtCSw8ip?gZ&NP1}jZv z_pTdW3AZ{XIM*(n*|6rRa?u(lUY14k(oY z2Or+a%lIlf)5{ct**p057$v=H(5_fAannxbq_D@mmro=d|8R^sWrKBvlE0*+j#|5T z)r5oJ*vM-h^j}lh6 zp`2&->Vd0gLrwpJ*MaQMRT)3oHcea1r>DjAq?+X@e+;+6eP$K`2L?u(69>e%oBe-u zZ8gvpR~atZ{`-D<_jzxSE8g~7?FbiAxUZZsx9-EvYBg7o8_%)H+cYi$`rc7?d-J)! zPeKzxUYP61zI~yI!#?*5$KB8GZT|$4f4?L0#ufY%-hT|yoi*=&-?QHrO%AA@{k}7^L3!4D-TkxY?oaP#k~QZp z@aT;Du=eE7^fiG?rpuUr6AwJEm_6kc@BAOgL1qhgV3Wtvj3$|{I-5zF7Tn_N4~-FVdQ&MBb@0A~n0 ALI3~& diff --git a/source-android/androidnative.pri/examples/androidnativeexample/res/drawable-xxxhdpi/ic_done_black_24dp.png b/source-android/androidnative.pri/examples/androidnativeexample/res/drawable-xxxhdpi/ic_done_black_24dp.png deleted file mode 100644 index 2f6d6386de9510fa6dd8c83cbb61a6f2e0fab9b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcg?s&R5hEy=VJ?|UH<|x2&QEUS@ zUqF*g%NA{xn*DVG1~S@B-uDxXPUtYNKXnEQ>b^wD=lt6oW;%QS1o1=daUAyI8~(&3 zd|u96v#;i-{{JTZcp&}h>FMeJ8GvN{`tw#N{;ZEGUD<;p)-Lh7=#>`kZ6pLOOe=>Nw L`njxgN@xNAv*3Ko diff --git a/source-android/androidnative.pri/examples/androidnativeexample/statusbar/StatusBarDemo.qml b/source-android/androidnative.pri/examples/androidnativeexample/statusbar/StatusBarDemo.qml deleted file mode 100644 index 0d82d01..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/statusbar/StatusBarDemo.qml +++ /dev/null @@ -1,47 +0,0 @@ -import QtQuick 2.2 -import QtQuick.Window 2.1 -import QtQuick.Controls 2.1 as QQC2 -import QuickAndroid 0.1 -import QuickAndroid.Styles 0.1 -import AndroidNative 1.0 as AN -import "../theme" - -Page { - - actionBar: ActionBar { - id : actionBar - title: "Status Bar" - z: 10 - upEnabled: true - onActionButtonClicked: back(); - } - - Column { - anchors.centerIn: parent - - QQC2.Switch { - text: "Translucent Status Bar" - checked: false - - onCheckedChanged: { - AN.SystemDispatcher.dispatch("androidnative.Util.setTranslucentStatusBar", {value: checked}); - } - } - - QQC2.Switch { - text: "Status Bar Visible" - checked: true - - onCheckedChanged: { - AN.SystemDispatcher.dispatch("androidnative.Util.setFullScreen", {value: checked}); - } - } - - } - - Component.onCompleted: { - AN.SystemDispatcher.loadClass("androidnative.Util"); - } - - -} diff --git a/source-android/androidnative.pri/examples/androidnativeexample/theme/ActionBarBackground.qml b/source-android/androidnative.pri/examples/androidnativeexample/theme/ActionBarBackground.qml deleted file mode 100644 index 1adb0f1..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/theme/ActionBarBackground.qml +++ /dev/null @@ -1,17 +0,0 @@ -import QtQuick 2.0 -import QuickAndroid 0.1 - -Item { - - MaterialShadow { - asynchronous: true - anchors.fill: parent - depth: 1 - } - - Rectangle { - color: "#cddc39" // Lime 500 - anchors.fill: parent - } -} - diff --git a/source-android/androidnative.pri/examples/androidnativeexample/theme/AppTheme.qml b/source-android/androidnative.pri/examples/androidnativeexample/theme/AppTheme.qml deleted file mode 100644 index 9ee92c2..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/theme/AppTheme.qml +++ /dev/null @@ -1,33 +0,0 @@ -import QtQuick 2.0 -import QuickAndroid 0.1 -import QuickAndroid.Styles 0.1 -pragma Singleton - -Theme { - mediumText.textSize: 18 * A.dp - smallText.textSize : 14 * A.dp - - colorPrimary: "#cddc39" // Lime 500 - textColorPrimary: Constants.black87 - windowBackground: "#eeeeee"; - - // The default icon of ActionBar is a "back" image - actionBar.iconSource: A.drawable("ic_arrow_back",Constants.black87) - - // Background with shadow - actionBar.background: ActionBarBackground { - } - - // actionBar.title.textSize is not allowed in QML. You should declare your own TextMaterial and assign directly. - // or modify text , smallText , mediumText and largetText - actionBar.title : customTextMaterial1; - actionBar.iconSourceSize: Qt.size(24 * A.dp , 24 * A.dp) - - // Custom Style object. - TextMaterial { - id : customTextMaterial1 - textSize: 18 * A.dp - textColor : Constants.black87 - } -} - diff --git a/source-android/androidnative.pri/examples/androidnativeexample/theme/qmldir b/source-android/androidnative.pri/examples/androidnativeexample/theme/qmldir deleted file mode 100644 index 5a1f2f4..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/theme/qmldir +++ /dev/null @@ -1,2 +0,0 @@ -module theme -singleton AppTheme 0.1 AppTheme.qml diff --git a/source-android/androidnative.pri/examples/androidnativeexample/toast/ToastDemo.qml b/source-android/androidnative.pri/examples/androidnativeexample/toast/ToastDemo.qml deleted file mode 100644 index f5e23bd..0000000 --- a/source-android/androidnative.pri/examples/androidnativeexample/toast/ToastDemo.qml +++ /dev/null @@ -1,33 +0,0 @@ -import QtQuick 2.2 -import QtQuick.Window 2.1 -import QuickAndroid 0.1 -import QuickAndroid.Styles 0.1 -import AndroidNative 1.0 as AN -import "../theme" - -Page { - - actionBar: ActionBar { - id : actionBar - title: "Toast" - z: 10 - upEnabled: true - onActionButtonClicked: back(); - } - - AN.Toast { - id: toast - text: "Toast" - longDuration: true - } - - Button { - id: label - text : "Press to show toast" - anchors.centerIn: parent - onClicked: { - toast.show(); - } - } - -} diff --git a/source-android/androidnative.pri/java/src/androidnative/AndroidNativeActivity.java b/source-android/androidnative.pri/java/src/androidnative/AndroidNativeActivity.java index ae44267..01833c2 100644 --- a/source-android/androidnative.pri/java/src/androidnative/AndroidNativeActivity.java +++ b/source-android/androidnative.pri/java/src/androidnative/AndroidNativeActivity.java @@ -10,6 +10,7 @@ import android.content.Context; import android.Manifest.permission; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; +import androidnative.AndroidNativeService; /** An alternative Activity class for Qt applicaiton. @@ -18,7 +19,8 @@ import androidx.core.content.ContextCompat; public class AndroidNativeActivity extends org.qtproject.qt5.android.bindings.QtActivity { public static final int MY_PERMISSIONS_REQUEST_READ_STORAGE = 0x245285a8; - + public static final int MY_PERMISSIONS_REQUEST_POST_NOTIFICATIONS = 0x245285a9; + private static final String TAG = "AndroidNativeActivity"; @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { @@ -29,6 +31,11 @@ public class AndroidNativeActivity extends org.qtproject.qt5.android.bindings.Qt protected void onResume() { super.onResume(); + + + + AndroidNativeService fs = new AndroidNativeService(); + fs.startQtService(this); //if (ContextCompat.checkSelfPermission(this,android.Manifest.permission.WRITE_EXTERNAL_STORAGE)!= PackageManager.PERMISSION_GRANTED) { // Permission is not granted @@ -75,19 +82,29 @@ public class AndroidNativeActivity extends org.qtproject.qt5.android.bindings.Qt @Override public void onRequestPermissionsResult(int requestCode,String permissions[], int[] grantResults) { + Log.d(TAG,"onRequestPermissionsResult"); switch (requestCode) { case MY_PERMISSIONS_REQUEST_READ_STORAGE: { // If request is cancelled, the result arrays are empty. - if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { - Map message = new HashMap(); - message.put("multiple",false); - SystemDispatcher.dispatch("androidnative.ImagePicker.pickImage",message); - } else { + if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { + Map message = new HashMap(); + message.put("multiple",false); + SystemDispatcher.dispatch("androidnative.ImagePicker.pickImage",message); + } else { + } } + case MY_PERMISSIONS_REQUEST_POST_NOTIFICATIONS: { + // If request is cancelled, the result arrays are empty. + if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { + Map message = new HashMap(); + message.put("multiple",false); + SystemDispatcher.dispatch("androidnative.Util.setPostNotification",message); + } else { + } + } return; } } -} diff --git a/source-android/androidnative.pri/java/src/androidnative/AndroidNativeService.java b/source-android/androidnative.pri/java/src/androidnative/AndroidNativeService.java index 55ef5db..eeca21e 100644 --- a/source-android/androidnative.pri/java/src/androidnative/AndroidNativeService.java +++ b/source-android/androidnative.pri/java/src/androidnative/AndroidNativeService.java @@ -20,14 +20,14 @@ public class AndroidNativeService extends QtService private static String TAG = "AndroidNative"; public void startQtService(Context ctx) { - //Log.d(TAG, "QtActivity active "+String.valueOf(QtNative.activity()!=null)); + Log.d(TAG, "QtActivity active "+String.valueOf(QtNative.activity()!=null)); if (QtNative.activity()==null){ - //Log.d(TAG,"Friendiqasync Stop existing QtService"); + Log.d(TAG,"Friendiqasync Stop existing QtService"); ctx.stopService(new Intent(ctx, AndroidNativeService.class)); } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - //Log.d(TAG,"Friendiqasync startForegroundService"); + Log.d(TAG,"Friendiqasync startForegroundService"); ctx.startForegroundService(new Intent(ctx, AndroidNativeService.class)); } else { ctx.startService(new Intent(ctx, AndroidNativeService.class)); @@ -35,7 +35,7 @@ public class AndroidNativeService extends QtService } public static void stopQtService(Context ctx) { - //Log.d(TAG,"Friendiqasync QtServiceStop"); + Log.d(TAG,"Friendiqasync QtServiceStop"); ctx.stopService(new Intent(ctx, AndroidNativeService.class)); } @@ -44,11 +44,12 @@ public class AndroidNativeService extends QtService { Context context; context = this.getApplicationContext(); + Log.d(TAG,"Friendiqa onCreate"); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { Intent intent = new Intent(context,FriendiqaActivity.class); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); - PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, 0); + PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE); String CHANNEL_ID = "channel_02"; NotificationChannel channel = new NotificationChannel(CHANNEL_ID, "Sync Channel", diff --git a/source-android/androidnative.pri/java/src/androidnative/Util.java b/source-android/androidnative.pri/java/src/androidnative/Util.java index 6ea90cf..3d77096 100644 --- a/source-android/androidnative.pri/java/src/androidnative/Util.java +++ b/source-android/androidnative.pri/java/src/androidnative/Util.java @@ -25,6 +25,11 @@ import android.content.Intent; import java.util.Map; import org.qtproject.friendiqa.R; +import android.content.pm.PackageManager; +import android.Manifest; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; + public class Util { private static final String TAG = "androidnative.Util"; @@ -33,7 +38,8 @@ public class Util { public static final String SET_FULL_SCREEN = "androidnative.Util.setFullScreen"; public static final String SET_SCHEDULE = "androidnative.Util.setSchedule"; public static final String SET_NOTIFICATION = "androidnative.Util.setNotification"; - + public static final String SET_POST_NOTIFICATION = "androidnative.Util.setPostNotification"; + public static final int MY_PERMISSIONS_REQUEST_POST_NOTIFICATIONS = 0x245285a9; static { SystemDispatcher.addListener(new SystemDispatcher.Listener() { @@ -46,6 +52,8 @@ public class Util { setSchedule(message); } else if (type.equals(SET_NOTIFICATION)) { setNotification(message); + } else if (type.equals(SET_POST_NOTIFICATION)) { + setPostNotification(message); } } }); @@ -110,14 +118,14 @@ public class Util { } static void setNotification(Map message) { - //Log.d(TAG,"setNotification"); + Log.d(TAG,"setNotification"); Context context; //Context appcontext; context = QtNative.service().getApplicationContext(); //appcontext = QtNative.activity().getApplicationContext(); Intent intent = new Intent(context,FriendiqaActivity.class); //intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); - PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, 0); + PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE); final String textTitle = (String) message.get("title"); final String textContent = (String) message.get("message"); @@ -171,14 +179,23 @@ public class Util { } else { context = QtNative.activity().getApplicationContext(); } + + + + //AndroidNativeService fs = new AndroidNativeService(); + //fs.startQtService(context); + + if (value==0){ JobScheduler jobScheduler = (JobScheduler) context.getSystemService(Context.JOB_SCHEDULER_SERVICE); jobScheduler.cancelAll(); - //Log.d(TAG,"Friendiqasync deleting Androidnative jobscheduler"); + Log.d(TAG,"Friendiqasync deleting Androidnative jobscheduler"); } else { - //Log.d(TAG,"Friendiqasync schedule Androidnative jobscheduler"); + Log.d(TAG,"Friendiqasync schedule Androidnative jobscheduler"); ComponentName component = new ComponentName(context, FriendiqaService.class); JobScheduler jobScheduler = (JobScheduler) context.getSystemService(Context.JOB_SCHEDULER_SERVICE); + + //Log.d(TAG,"Jobinfolist size " + String.valueOf(jobScheduler.getAllPendingJobs().size())); if (jobScheduler.getAllPendingJobs().size()==0){ JobInfo.Builder builder = new JobInfo.Builder(2, component) @@ -186,7 +203,7 @@ public class Util { .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY) .setPersisted(true) .setPrefetch(true); - //Log.d(TAG,"Friendiqa schedule Androidnative sync schedule"+ (value * ONE_MIN)); + Log.d(TAG,"1 Friendiqa schedule Androidnative sync schedule"+ (value * ONE_MIN)); jobScheduler.schedule(builder.build()); } else { for ( JobInfo jobInfo : jobScheduler.getAllPendingJobs() ) { @@ -197,23 +214,42 @@ public class Util { .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY) .setPersisted(true) .setPrefetch(true); - //Log.d(TAG,"Friendiqa schedule Androidnative sync schedule"+ (value * ONE_MIN)); + Log.d(TAG,"2 Friendiqa schedule Androidnative sync schedule"+ (value * ONE_MIN)); jobScheduler.schedule(builder.build()); } } } //Log.d(TAG,"Active service " + String.valueOf(QtNative.service()!=null)); - if (QtNative.service() != null){ - //Log.d(TAG,"Schedule Stopping Friendiqa Androidnative service"); - ComponentName componentStopper = new ComponentName(context, FriendiqaStopService.class); - JobInfo.Builder stopbuilder = new JobInfo.Builder(1, componentStopper) - .setMinimumLatency(50) - .setOverrideDeadline(100); + //if (QtNative.service() != null){ + // Log.d(TAG,"Schedule Stopping Friendiqa Androidnative service"); + // ComponentName componentStopper = new ComponentName(context, FriendiqaStopService.class); + // JobInfo.Builder stopbuilder = new JobInfo.Builder(1, componentStopper) + // .setMinimumLatency(50) + // .setOverrideDeadline(100); - JobScheduler jobStopScheduler = (JobScheduler) context.getSystemService(Context.JOB_SCHEDULER_SERVICE); - jobStopScheduler.schedule(stopbuilder.build()); - } + // JobScheduler jobStopScheduler = (JobScheduler) context.getSystemService(Context.JOB_SCHEDULER_SERVICE); + // jobStopScheduler.schedule(stopbuilder.build()); + //} } + NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context); + notificationManager.cancelAll(); //context.stopService(new Intent(context, AndroidNativeService.class)); } + + static void setPostNotification(Map message) { + Log.d(TAG,"setPostNotification"); + Context context; + if (QtNative.activity() == null){ + context = QtNative.service().getApplicationContext(); + } else { + context = QtNative.activity().getApplicationContext(); + } + Activity activity = org.qtproject.qt5.android.QtNative.activity(); + Log.d(TAG,String.valueOf(ContextCompat.checkSelfPermission(context,Manifest.permission.POST_NOTIFICATIONS))); + if (ContextCompat.checkSelfPermission(context,Manifest.permission.POST_NOTIFICATIONS)!= PackageManager.PERMISSION_GRANTED) { + // Permission is not granted + Log.d(TAG,String.valueOf(PackageManager.PERMISSION_GRANTED)); + ActivityCompat.requestPermissions(activity,new String[]{Manifest.permission.POST_NOTIFICATIONS},MY_PERMISSIONS_REQUEST_POST_NOTIFICATIONS); + } + } } diff --git a/source-android/common/oauth.cpp b/source-android/common/oauth.cpp index 52faaff..7e5af5f 120000 --- a/source-android/common/oauth.cpp +++ b/source-android/common/oauth.cpp @@ -1 +1 @@ -/home/pankraz/ownCloud/clientsync/Friendiqa/v0.6/source-linux/common/oauth.cpp \ No newline at end of file +../../source-linux/common/oauth.cpp \ No newline at end of file diff --git a/source-android/common/oauth.h b/source-android/common/oauth.h index 5c2bab8..607b211 120000 --- a/source-android/common/oauth.h +++ b/source-android/common/oauth.h @@ -1 +1 @@ -/home/pankraz/ownCloud/clientsync/Friendiqa/v0.6/source-linux/common/oauth.h \ No newline at end of file +../../source-linux/common/oauth.h \ No newline at end of file diff --git a/source-linux/CMakeLists.txt b/source-linux/CMakeLists.txt index 6477d1b..6a79957 100644 --- a/source-linux/CMakeLists.txt +++ b/source-linux/CMakeLists.txt @@ -1,8 +1,8 @@ -cmake_minimum_required(VERSION 3.1.0) +cmake_minimum_required(VERSION 3.16.0) project(friendiqa VERSION 0.6 LANGUAGES CXX) -set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_AUTOMOC ON) @@ -13,35 +13,38 @@ if(CMAKE_VERSION VERSION_LESS "3.7.0") set(CMAKE_INCLUDE_CURRENT_DIR ON) endif() -find_package(Qt5 COMPONENTS Widgets Quick Sql DBus NetworkAuth REQUIRED) +find_package(Qt6 REQUIRED COMPONENTS Core Widgets Quick QuickControls2 Sql DBus NetworkAuth REQUIRED) + +qt_standard_project_setup() set(MOC_SOURCES common/uploadableimage.h common/xhr.h common/filesystem.h - common/remoteauthasyncimageprovider.h common/updatenews.h common/alarm.h - common/oauth.h) + common/oauth.h + common/documenthandler.h) set(SOURCES common/friendiqa.cpp common/uploadableimage.cpp common/xhr.cpp common/filesystem.cpp - common/remoteauthasyncimageprovider.cpp common/updatenews.cpp common/alarmlinux.cpp - common/oauth.cpp) + common/oauth.cpp + common/documenthandler.cpp) include_directories(common) -add_executable(friendiqa ${SOURCES} ${MOC_SOURCES} application.qrc) +qt_add_executable(friendiqa ${SOURCES} ${MOC_SOURCES} application.qrc) -target_link_libraries(friendiqa Qt::Core) -target_link_libraries(friendiqa Qt::Widgets) -target_link_libraries(friendiqa Qt::Quick) -target_link_libraries(friendiqa Qt::Sql) -target_link_libraries(friendiqa Qt::DBus) -target_link_libraries(friendiqa Qt::NetworkAuth) +target_link_libraries(friendiqa PRIVATE Qt6::Core) +target_link_libraries(friendiqa PRIVATE Qt6::Widgets) +target_link_libraries(friendiqa PRIVATE Qt6::Quick) +target_link_libraries(friendiqa PRIVATE Qt6::QuickControls2) +target_link_libraries(friendiqa PRIVATE Qt6::Sql) +target_link_libraries(friendiqa PRIVATE Qt6::DBus) +target_link_libraries(friendiqa PRIVATE Qt6::NetworkAuth) install(TARGETS friendiqa DESTINATION ${CMAKE_INSTALL_BINDIR}) install(FILES images/de.manic.Friendiqa.desktop DESTINATION share/applications) diff --git a/source-linux/common/alarmandroid.cpp b/source-linux/common/alarmandroid.cpp index 1bbc515..0c7c36d 100644 --- a/source-linux/common/alarmandroid.cpp +++ b/source-linux/common/alarmandroid.cpp @@ -47,6 +47,7 @@ void ALARM::setAlarm(int interval) QVariantMap message; message["value"] = interval; AndroidNative::SystemDispatcher::instance()->loadClass("androidnative.Util"); + AndroidNative::SystemDispatcher::instance()->dispatch("androidnative.Util.setPostNotification", message); AndroidNative::SystemDispatcher::instance()->dispatch("androidnative.Util.setSchedule", message); AndroidNative::SystemDispatcher::instance()->dispatch("androidnative.Util.stopService", message); } diff --git a/source-linux/common/documenthandler.cpp b/source-linux/common/documenthandler.cpp new file mode 100644 index 0000000..f2e8163 --- /dev/null +++ b/source-linux/common/documenthandler.cpp @@ -0,0 +1,262 @@ +// This file is part of Friendiqa +// https://github.com/lubuwest/Friendiqa +// Copyright (C) 2020 Marco R. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// In addition, as a special exception, the copyright holders give +// permission to link the code of portions of this program with the +// OpenSSL library under certain conditions as described in each +// individual source file, and distribute linked combinations including +// the two. +// +// You must obey the GNU General Public License in all respects for all +// of the code used other than OpenSSL. If you modify file(s) with this +// exception, you may extend this exception to your version of the +// file(s), but you are not obligated to do so. If you do not wish to do +// so, delete this exception statement from your version. If you delete +// this exception statement from all source files in the program, then +// also delete it here. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +#include +#include +#include +#include +#include +#include +#include +#include "documenthandler.h" + +DocumentHandler::DocumentHandler(QObject *parent) + : QObject(parent) + , m_document(nullptr) + , m_cursorPosition(-1) + , m_selectionStart(0) + , m_selectionEnd(0) +{ +} + +QQuickTextDocument *DocumentHandler::document() const +{ + return m_document; +} + +void DocumentHandler::setDocument(QQuickTextDocument *document) +{ + if (document == m_document) + return; + + if (m_document) + disconnect(m_document->textDocument(), &QTextDocument::modificationChanged, this, &DocumentHandler::modifiedChanged); + m_document = document; + if (m_document) + connect(m_document->textDocument(), &QTextDocument::modificationChanged, this, &DocumentHandler::modifiedChanged); + emit documentChanged(); +} + +int DocumentHandler::cursorPosition() const +{ + return m_cursorPosition; +} + +void DocumentHandler::setCursorPosition(int position) +{ + if (position == m_cursorPosition) + return; + + m_cursorPosition = position; + emit cursorPositionChanged(); +} + +int DocumentHandler::selectionStart() const +{ + return m_selectionStart; +} + +void DocumentHandler::setSelectionStart(int position) +{ + if (position == m_selectionStart) + return; + + m_selectionStart = position; + emit selectionStartChanged(); +} + +int DocumentHandler::selectionEnd() const +{ + return m_selectionEnd; +} + +void DocumentHandler::setSelectionEnd(int position) +{ + if (position == m_selectionEnd) + return; + + m_selectionEnd = position; + emit selectionEndChanged(); +} + +QTextCursor DocumentHandler::textCursor() const +{ + QTextDocument *doc = textDocument(); + if (!doc) + return QTextCursor(); + QTextCursor cursor = QTextCursor(doc); + if (m_selectionStart != m_selectionEnd) { + cursor.setPosition(m_selectionStart); + cursor.setPosition(m_selectionEnd, QTextCursor::KeepAnchor); + } else { + cursor.setPosition(m_cursorPosition); + } + return cursor; +} + +QTextDocument *DocumentHandler::textDocument() const +{ + if (!m_document) + return nullptr; + + return m_document->textDocument(); +} + +void DocumentHandler::mergeFormatOnWordOrSelection(const QTextCharFormat &format) +{ + QTextCursor cursor = textCursor(); + if (!cursor.hasSelection()) + cursor.select(QTextCursor::WordUnderCursor); + cursor.mergeCharFormat(format); +} + +bool DocumentHandler::modified() const +{ + return m_document && m_document->textDocument()->isModified(); +} + +void DocumentHandler::setModified(bool m) +{ + if (m_document) + m_document->textDocument()->setModified(m); +} + +QFont DocumentHandler::font() const +{ + QTextCursor cursor = textCursor(); + if (cursor.isNull()) + return m_document->textDocument()->defaultFont(); + QTextCharFormat format = cursor.charFormat(); + return format.font(); +} + +void DocumentHandler::setFont(const QFont & font){ + + QTextCursor cursor = textCursor(); + if (!cursor.isNull() && cursor.charFormat().font() == font) + return; + + QTextCharFormat format; + format.setFont(font); + mergeFormatOnWordOrSelection(format); + + emit fontChanged(); +} + +bool DocumentHandler::bold() const +{ + const QTextCursor cursor = textCursor(); + if (cursor.isNull()) + return m_document->textDocument()->defaultFont().bold(); + return cursor.charFormat().font().bold(); +} + +void DocumentHandler::setBold(bool bold) +{ + const QTextCursor cursor = textCursor(); + if (!cursor.isNull() && cursor.charFormat().font().bold() == bold) + return; + + QFont font = cursor.charFormat().font(); + font.setBold(bold); + QTextCharFormat format; + format.setFont(font); + mergeFormatOnWordOrSelection(format); + + emit boldChanged(); +} + +bool DocumentHandler::italic() const +{ + const QTextCursor cursor = textCursor(); + if (cursor.isNull()) + return m_document->textDocument()->defaultFont().italic(); + return cursor.charFormat().font().italic(); +} + +void DocumentHandler::setItalic(bool italic) +{ + const QTextCursor cursor = textCursor(); + if (!cursor.isNull() && cursor.charFormat().font().italic() == italic) + return; + + QFont font = cursor.charFormat().font(); + font.setItalic(italic); + QTextCharFormat format; + format.setFont(font); + mergeFormatOnWordOrSelection(format); + + emit italicChanged(); +} + +bool DocumentHandler::liststyle() const +{ + const QTextCursor cursor = textCursor(); + if (cursor.isNull()) + return false; + return bool(cursor.currentList()); +} + +void DocumentHandler::setListstyle(bool liststyle) +{ + QTextCursor cursor = textCursor(); + if (!cursor.isNull() && !liststyle){ + cursor.currentList()->remove(cursor.block()); + emit liststyleChanged(); + }else{ + cursor.createList(QTextListFormat::ListDisc); + emit liststyleChanged(); + } +} + +bool DocumentHandler::codeblock() const +{ + const QTextCursor cursor = textCursor(); + if (cursor.isNull()) + return false; + qDebug()<< QTextDocumentFragment(cursor).toPlainText(); + return bool(QTextDocumentFragment(cursor).toMarkdown().contains("```")); +} + +void DocumentHandler::setCodeblock(bool codeblock) +{ + QTextCursor cursor = textCursor(); + if (!cursor.isNull() && !codeblock){ + qDebug()<< "!codeblock ```\n" + QTextDocumentFragment(cursor).toMarkdown() + "\n```"; + cursor.insertMarkdown("```\n" + QTextDocumentFragment(cursor).toMarkdown() + "\n```"); + emit codeblockChanged(); + } + else{ + qDebug()<< "```\n" + QTextDocumentFragment(cursor).toMarkdown() + "\n```"; + cursor.insertMarkdown(QTextDocumentFragment(cursor).toMarkdown().remove("```")); + emit codeblockChanged(); + } +} diff --git a/source-linux/common/documenthandler.h b/source-linux/common/documenthandler.h new file mode 100644 index 0000000..d74c6b9 --- /dev/null +++ b/source-linux/common/documenthandler.h @@ -0,0 +1,114 @@ +// This file is part of Friendiqa +// https://github.com/lubuwest/Friendiqa +// Copyright (C) 2020 Marco R. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// In addition, as a special exception, the copyright holders give +// permission to link the code of portions of this program with the +// OpenSSL library under certain conditions as described in each +// individual source file, and distribute linked combinations including +// the two. +// +// You must obey the GNU General Public License in all respects for all +// of the code used other than OpenSSL. If you modify file(s) with this +// exception, you may extend this exception to your version of the +// file(s), but you are not obligated to do so. If you do not wish to do +// so, delete this exception statement from your version. If you delete +// this exception statement from all source files in the program, then +// also delete it here. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +#ifndef DOCUMENTHANDLER_H +#define DOCUMENTHANDLER_H + +//#include +#include +#include +#include +#include +//QT_BEGIN_NAMESPACE +//class QTextDocument; +//class QQuickTextDocument; +//QT_END_NAMESPACE + +class DocumentHandler : public QObject{ + Q_OBJECT + Q_PROPERTY(QQuickTextDocument *document READ document WRITE setDocument NOTIFY documentChanged) + Q_PROPERTY(int cursorPosition READ cursorPosition WRITE setCursorPosition NOTIFY cursorPositionChanged) + Q_PROPERTY(int selectionStart READ selectionStart WRITE setSelectionStart NOTIFY selectionStartChanged) + Q_PROPERTY(int selectionEnd READ selectionEnd WRITE setSelectionEnd NOTIFY selectionEndChanged) + Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) + Q_PROPERTY(bool bold READ bold WRITE setBold NOTIFY boldChanged) + Q_PROPERTY(bool italic READ italic WRITE setItalic NOTIFY italicChanged) + Q_PROPERTY(bool liststyle READ liststyle WRITE setListstyle NOTIFY liststyleChanged) + Q_PROPERTY(bool codeblock READ codeblock WRITE setCodeblock NOTIFY codeblockChanged) + Q_PROPERTY(bool modified READ modified WRITE setModified NOTIFY modifiedChanged) + +public: + explicit DocumentHandler(QObject *parent = nullptr); + + QQuickTextDocument *document() const; + void setDocument(QQuickTextDocument *document); + + int cursorPosition() const; + void setCursorPosition(int position); + + int selectionStart() const; + void setSelectionStart(int position); + + int selectionEnd() const; + void setSelectionEnd(int position); + + QFont font() const; + void setFont(const QFont & font); + + bool bold() const; + void setBold(bool bold); + + bool italic() const; + void setItalic(bool italic); + + bool liststyle() const; + void setListstyle(bool liststyle); + + bool modified() const; + void setModified(bool m); + + bool codeblock() const; + void setCodeblock(bool codeblock); + +signals: + void documentChanged(); + void cursorPositionChanged(); + void selectionStartChanged(); + void selectionEndChanged(); + void fontChanged(); + void boldChanged(); + void italicChanged(); + void liststyleChanged(); + void codeblockChanged(); + void error(const QString &message); + void modifiedChanged(); + +private: + QTextCursor textCursor() const; + QTextDocument *textDocument() const; + void mergeFormatOnWordOrSelection(const QTextCharFormat &format); + QQuickTextDocument *m_document; + int m_cursorPosition; + int m_selectionStart; + int m_selectionEnd; +}; + +#endif // DOCUMENTHANDLER_H diff --git a/source-linux/common/filesystem.cpp b/source-linux/common/filesystem.cpp index 560dc72..2ce9919 100644 --- a/source-linux/common/filesystem.cpp +++ b/source-linux/common/filesystem.cpp @@ -177,7 +177,13 @@ void FILESYSTEM::setAutostart(bool autostart) { QString FILESYSTEM::osType() const { - return QSysInfo::productType(); + QString m_osType; + if(QSysInfo::productType()==QString("android")){ + m_osType="Android"; + }else{ + m_osType="Linux"; + } + return m_osType; } QString FILESYSTEM::hostname() const diff --git a/source-linux/common/friendiqa.cpp b/source-linux/common/friendiqa.cpp index 0fb235e..465aae3 100644 --- a/source-linux/common/friendiqa.cpp +++ b/source-linux/common/friendiqa.cpp @@ -31,6 +31,7 @@ #include #include +#include //#include //#include //#include @@ -38,9 +39,10 @@ #include "xhr.h" #include "updatenews.h" #include "filesystem.h" -#include "remoteauthasyncimageprovider.h" +//#include "remoteauthasyncimageprovider.h" #include "alarm.h" #include "oauth.h" +#include "documenthandler.h" //#include "AndroidNative/systemdispatcher.h" //#include "AndroidNative/environment.h" //#include "AndroidNative/debug.h" @@ -48,6 +50,7 @@ //#include #include #include +#include // Declare a user-defined data type to work with an icon in QML Q_DECLARE_METATYPE(QSystemTrayIcon::ActivationReason) @@ -59,11 +62,11 @@ Q_DECLARE_METATYPE(QSystemTrayIcon::ActivationReason) #include JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void*) { Q_UNUSED(vm); - qDebug("NativeInterface::JNI_OnLoad()"); // It must call this function within JNI_OnLoad to enable System Dispatcher + qDebug("NativeInterface::JNI_OnLoad()"); // It must call this function within JNI_OnLoad to enable System Dispatcher - AndroidNative::SystemDispatcher::registerNatives(); - return JNI_VERSION_1_6; - } + AndroidNative::SystemDispatcher::registerNatives(); + return JNI_VERSION_1_6; +} #endif @@ -83,45 +86,47 @@ int main(int argc, char *argv[]) { //return app.exec(); } else{ - //QtWebEngine::initialize(); - QApplication app(argc, argv); - QQmlApplicationEngine view; - //QQuickView view; - //view.setResizeMode(QQuickView::SizeRootObjectToView); - app.setWindowIcon(QIcon(":/images/Friendiqa.ico")); - QTranslator qtTranslator; - qtTranslator.load("friendiqa-" + QLocale::system().name(),":/translations"); - app.installTranslator(&qtTranslator); - RemoteAuthAsyncImageProvider *imageProvider = new RemoteAuthAsyncImageProvider; - view.addImageProvider("remoteauthimage",imageProvider); - view.rootContext()->setContextProperty("remoteauth", imageProvider); - XHR* xhr = XHR::instance(); - view.rootContext()->setContextProperty("xhr", xhr); - FILESYSTEM* filesystem = FILESYSTEM::instance(); - if (qstrcmp(argv[1],"-background")==0){ - filesystem->setVisibility(false); - } else{filesystem->setVisibility(true);} + //QtWebEngine::initialize(); + QGuiApplication::setApplicationName("Friendiqa"); + QGuiApplication::setOrganizationName("Friendiqa"); + QApplication app(argc, argv); + QQmlApplicationEngine view; + //view.setResizeMode(QQuickView::SizeRootObjectToView); + app.setWindowIcon(QIcon(":/images/Friendiqa.ico")); + QTranslator qtTranslator; + qtTranslator.load("friendiqa-" + QLocale::system().name(),":/translations"); + app.installTranslator(&qtTranslator); + // RemoteAuthAsyncImageProvider *imageProvider = new RemoteAuthAsyncImageProvider; + // view.addImageProvider("remoteauthimage",imageProvider); + // view.rootContext()->setContextProperty("remoteauth", imageProvider); + XHR* xhr = XHR::instance(); + view.rootContext()->setContextProperty("xhr", xhr); + FILESYSTEM* filesystem = FILESYSTEM::instance(); + if (qstrcmp(argv[1],"-background")==0){ + filesystem->setVisibility(false); + } else{filesystem->setVisibility(true);} - view.rootContext()->setContextProperty("filesystem", filesystem); - ALARM* alarm = ALARM::instance(); - view.rootContext()->setContextProperty("alarm", alarm); - UPDATENEWS* updatenews = UPDATENEWS::instance(); - view.rootContext()->setContextProperty("updatenews", updatenews); + view.rootContext()->setContextProperty("filesystem", filesystem); + ALARM* alarm = ALARM::instance(); + view.rootContext()->setContextProperty("alarm", alarm); + UPDATENEWS* updatenews = UPDATENEWS::instance(); + view.rootContext()->setContextProperty("updatenews", updatenews); + updatenews->setDatabase(); + OAuthWrapper* oauth2 = OAuthWrapper::instance(); + view.rootContext()->setContextProperty("oauth2", oauth2); + qmlRegisterType("io.qt.examples.texteditor", 1, 0, "DocumentHandler"); + qmlRegisterType("QSystemTrayIcon", 1, 0, "QSystemTrayIcon"); + qRegisterMetaType("ActivationReason"); + view.rootContext()->setContextProperty("iconTrayBlack", QIcon(QPixmap(":/images/friendica-tray-black.svg"))); + view.rootContext()->setContextProperty("iconTrayWhite", QIcon(QPixmap(":/images/friendica-tray-white.svg"))); - OAuthWrapper* oauth2 = OAuthWrapper::instance(); - view.rootContext()->setContextProperty("oauth2", oauth2); - - qmlRegisterType("QSystemTrayIcon", 1, 0, "QSystemTrayIcon"); - qRegisterMetaType("ActivationReason"); - view.rootContext()->setContextProperty("iconTray", QIcon(":/images/Friendica_monochrome.png")); - view.rootContext()->setContextProperty("iconTrayAvailable", QSystemTrayIcon::isSystemTrayAvailable()); - - view.load(QUrl("qrc:/qml/friendiqa.qml")); - //view.show(); - - view.connect(view.rootContext()->engine(), SIGNAL(quit()), &app, SLOT(quit())); - return app.exec(); + view.rootContext()->setContextProperty("iconTrayAvailable", QSystemTrayIcon::isSystemTrayAvailable()); + if(updatenews->getStyle() != 0){ + QQuickStyle::setStyle("Material"); + } + view.load(QUrl("qrc:/qml/friendiqa.qml")); + view.connect(view.rootContext()->engine(), SIGNAL(quit()), &app, SLOT(quit())); + return app.exec(); } } - diff --git a/source-linux/common/updatenews.cpp b/source-linux/common/updatenews.cpp index 454320e..8dae238 100644 --- a/source-linux/common/updatenews.cpp +++ b/source-linux/common/updatenews.cpp @@ -89,6 +89,17 @@ void UPDATENEWS::setDatabase() } } +int UPDATENEWS::getStyle() +{ + QSqlQuery syncquery("SELECT * FROM globaloptions",m_db); + while (syncquery.next()){ + if (syncquery.value(0).toString()=="view_darkmode"){ + return syncquery.value(1).toInt(); + } + } + return 0; +} + QJsonArray UPDATENEWS::getAccounts(QString filtername, QString filtervalue){ QString filterstring=""; diff --git a/source-linux/common/updatenews.h b/source-linux/common/updatenews.h index 9f857d7..d046aa1 100644 --- a/source-linux/common/updatenews.h +++ b/source-linux/common/updatenews.h @@ -57,6 +57,7 @@ signals: public slots: void setSyncAll(bool syncAll); void setDatabase(); + int getStyle(); void login(); void timeline(); void replies(); diff --git a/source-linux/common/xhr.cpp b/source-linux/common/xhr.cpp index ace30a0..adaba69 100644 --- a/source-linux/common/xhr.cpp +++ b/source-linux/common/xhr.cpp @@ -227,7 +227,7 @@ void XHR::download() //connect(reply,SIGNAL(downloadProgress(qint64,qint64)), this,SLOT(updateDownloadProgress(qint64,qint64))); connect(reply, &QNetworkReply::finished,this, &XHR::onRequestFinished); connect(reply, &QNetworkReply::sslErrors, this, &XHR::onSSLError); - connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onReplyError(QNetworkReply::NetworkError))); + connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), this, SLOT(onReplyError(QNetworkReply::NetworkError))); } void XHR::get() @@ -254,7 +254,7 @@ void XHR::get() reply = manager.get(request); connect(reply, &QNetworkReply::finished, this, &XHR::onReplySuccess); //connect(reply,SIGNAL(downloadProgress(qint64,qint64)), this,SLOT(updateDownloadProgress(qint64,qint64))); - connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onReplyError(QNetworkReply::NetworkError))); + connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), this, SLOT(onReplyError(QNetworkReply::NetworkError))); connect(reply, &QNetworkReply::readyRead, this, &XHR::onReadyRead); connect(reply, &QNetworkReply::sslErrors, this, &XHR::onSSLError); } @@ -312,7 +312,7 @@ void XHR::post() reply = manager.post(request, multiPart); qDebug() << "\t request sent"; connect(reply, &QNetworkReply::finished, this, &XHR::onReplySuccess); - connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onReplyError(QNetworkReply::NetworkError))); + connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), this, SLOT(onReplyError(QNetworkReply::NetworkError))); connect(reply, &QNetworkReply::readyRead, this, &XHR::onReadyRead); connect(reply, &QNetworkReply::sslErrors, this, &XHR::onSSLError); } diff --git a/source-linux/images/friendica-tray-black.svg b/source-linux/images/friendica-tray-black.svg new file mode 100644 index 0000000..b9b9428 --- /dev/null +++ b/source-linux/images/friendica-tray-black.svg @@ -0,0 +1,707 @@ + + + + + + Friendiqa/friendica-tray-black.svg an master - Friendiqa - Friendica + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source-linux/images/friendica-tray-white.svg b/source-linux/images/friendica-tray-white.svg new file mode 100644 index 0000000..2abd781 --- /dev/null +++ b/source-linux/images/friendica-tray-white.svg @@ -0,0 +1,707 @@ + + + + + + Friendiqa/friendica-tray-white.svg an master - Friendiqa - Friendica + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + +
+ + +
+ + + + +
+
+ +
+
+
+
+ + +
+ + + + + +
+ + + MorsMortium +
/
+ Friendiqa + + + +
+ + + + + + +
+
+ +
geforkt von lubuwest/Friendiqa
+ +
+ +
+ +
+ +
+ + + 1 + +
+
+ +
+ +
+ + + 0 + +
+
+ + +
+ + Fork + + + + 0 + +
+ +
+ +
+
+ +
+ +
+ + + Code + + + + + + Issues + + + + + + + + + Pull-Requests + + + + + + + + + Pakete + + + + + + Projekte + + + + + + + Releases + + + + + + + Wiki + + + + + + Aktivität + + + + + + +
+ +
+
+
+ +
+ + + + + + + +
+ Du kannst nicht mehr als 25 Themen auswählen + Themen müssen entweder mit einem Buchstaben oder einer Ziffer beginnen. Sie können Bindestriche („-“) enthalten und bis zu 35 Zeichen lang sein. +
+ + + +
+
+ + + + +
+
+ +
+ + +
master
+ + + + + +
v0.001
+ + + +
v0.002
+ + + +
v0.004
+ + + +
v0.1
+ + + +
v0.1.2
+ + + +
v0.2
+ + + +
v0.2.1
+ + + +
v0.2.2
+ + + +
v0.3.1
+ + + +
v0.3.2
+ + + +
v0.3.3
+ + + +
v0.3.4
+ + + +
v0.5
+ + + +
v0.5.1
+ + + +
v0.5.2
+ + + +
v0.5.3
+ + + +
v0.5.4
+ + + +
v0.5.4.1
+ + + +
v0.6
+ + + +
v0.6.1
+ + + +
v0.6.2
+ + + +
v0.6.3
+ + + +
v0.6.5
+ + + +
v0.6.6
+ + + +
+
+
+ + +
+ +
+
+
+ + + Branches + + + + + + Tags + + + +
+
+
+ +
+
${ item.name }
+
+ +
+ + Tag ${ searchTerm } erstellen +
+
+ + Erstelle Branch ${ searchTerm } +
+
+ + von „master“ + +
+ +
+ + + + + + +
+
+
+
${ noResults }
+
+
+
+ + + + + + + + + Friendiqa/source-linux/images/friendica-tray-white.svg + +
+
+ + + +
+
+ +
+

+
+ +
+ + +
+ 42 Zeilen +
+ + +
+ 1.7 KiB +
+ + + +
+ XML +
+ +
+ + +
+
+ +
+ + +
+ + +
+ Originalformat + + Permalink + + + Blame + + Verlauf + +
+ + + + + + + + + + + +
+

+
+ + + + + + +
+ +
+ + + +
+ +
+
+
+ + +
+
+ + + + +
+ + + + + + + + + + + + + diff --git a/source-linux/js/helper.js b/source-linux/js/helper.js index ff662da..e8fea06 100644 --- a/source-linux/js/helper.js +++ b/source-linux/js/helper.js @@ -180,7 +180,7 @@ function updateData(database,table, username, key, value, callback,filter,filter function showMessage(header,message,rootwindow){//print(message); var cleanmessage=message.replace(/"/g,"-"); if(cleanmessage.length>200){cleanmessage=cleanmessage.slice(0,200)+'...'} - var messageString='import QtQuick 2.0; import QtQuick.Controls 2.15; import QtQuick.Controls.Material 2.12; Dialog{ visible: true; title:"'+header+'";standardButtons: Dialog.Ok;anchors.centerIn: parent;Label{text:" '+cleanmessage+'"}}'; + var messageString='import QtQuick 2.0; import QtQuick.Controls 2.15; Dialog{ visible: true; title:"'+header+'";standardButtons: Dialog.Ok;anchors.centerIn: parent;Label{text:" '+cleanmessage+'"}}'; var messageObject=Qt.createQmlObject(messageString,rootwindow,"messageOutput"); } diff --git a/source-linux/js/news.js b/source-linux/js/news.js index 992aae7..bbaa08f 100644 --- a/source-linux/js/news.js +++ b/source-linux/js/news.js @@ -313,6 +313,9 @@ function newsfromdb(database,login,messagetype,callback,contact,stop_time){ for(var i = 0; i < newsrs.rows.length; i++) { newsArray.push(newsrs.rows.item(i)); + if(newsArray[i].statusnet_html==""){ + newsArray[i].statusnet_html=newsArray[i].text + } newsArray[i].statusnet_html=Qt.atob(newsArray[i].statusnet_html); newsArray[i].text=Qt.atob(newsArray[i].text); newsArray[i].id=newsArray[i].status_id; diff --git a/source-linux/qml/calendarqml/CalendarDay.qml b/source-linux/qml/calendarqml/CalendarDay.qml index 9265845..b13d785 100644 --- a/source-linux/qml/calendarqml/CalendarDay.qml +++ b/source-linux/qml/calendarqml/CalendarDay.qml @@ -30,7 +30,6 @@ // along with this program. If not, see . import QtQuick 2.11 -import QtQuick.Controls.Material 2.12 //import QtQuick.Controls 2.4 Item { @@ -51,7 +50,7 @@ Item { id:daytext anchors.right: parent.right anchors.margins: 0.5*mm - color:(model.month==monthgrid.month)?Material.primaryTextColor:Material.secondaryTextColor + color:(model.month==monthgrid.month)?osSettings.primaryTextColor:osSettings.secondaryTextColor wrapMode: Text.WrapAnywhere text: model.day font.bold: model.today diff --git a/source-linux/qml/calendarqml/CalendarTab.qml b/source-linux/qml/calendarqml/CalendarTab.qml index 7ee5421..b19f11f 100644 --- a/source-linux/qml/calendarqml/CalendarTab.qml +++ b/source-linux/qml/calendarqml/CalendarTab.qml @@ -29,11 +29,10 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -import QtQuick 2.0 -import QtQuick.Controls 2.15 -import QtQuick.Controls.Material 2.12 -import QtQml 2.2 -import Qt.labs.calendar 1.0 +import QtQuick 2.15 +import QtQuick.Controls 6.3 + +//import Qt.labs.calendar 1.0 //import QtQuick.Layouts 1.3 import "qrc:/js/service.js" as Service import "qrc:/js/helper.js" as Helperjs @@ -45,7 +44,7 @@ Rectangle { // y:1 width:parent.width height:parent.height - color: Material.backgroundColor + color: osSettings.backgroundColor property date currentTime: new Date() property int offsetTime: currentTime.getTimezoneOffset() * 60 * 1000 property var events:[] @@ -128,7 +127,7 @@ Rectangle { anchors.topMargin: 0.5*mm anchors.right:calendartabstatusButton.left anchors.rightMargin:mm - width: 2*root.fontFactor*osSettings.bigFontSize; + //width: 2*root.fontFactor*osSettings.bigFontSize; text:"\uf021" onClicked: { calBusy.running=true; @@ -223,7 +222,7 @@ Rectangle { orientation: ListView.Horizontal highlightRangeMode: ListView.StrictlyEnforceRange - model: CalendarModel {id:calendarModel + model: CalendarModel {id:calendarModel from: new Date() to: new Date(new Date().valueOf()+93312000000) } @@ -236,7 +235,7 @@ Rectangle { //Layout.fillWidth: true width: parent.width-root.fontFactor*osSettings.bigFontSize horizontalAlignment:Text.AlignHCenter - color: Material.primaryTextColor + color: osSettings.primaryTextColor text: model.year font.pointSize: osSettings.systemFontSize } @@ -244,7 +243,7 @@ Rectangle { width: parent.width-osSettings.bigFontSize text: Qt.locale().standaloneMonthName(model.month) //Layout.fillWidth: true - color: Material.primaryTextColor + color: osSettings.primaryTextColor horizontalAlignment:Text.AlignHCenter font.pointSize: osSettings.systemFontSize } diff --git a/source-linux/qml/calendarqml/EventCreate.qml b/source-linux/qml/calendarqml/EventCreate.qml index 7459209..0c40c6a 100644 --- a/source-linux/qml/calendarqml/EventCreate.qml +++ b/source-linux/qml/calendarqml/EventCreate.qml @@ -31,7 +31,6 @@ import QtQuick 2.0 import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 import QtQuick.Controls 1.4 as Oldcontrols import "qrc:/js/service.js" as Service import "qrc:/js/helper.js" as Helperjs @@ -56,7 +55,7 @@ Flickable{ id: eventRect width: root.width height: textColumn.height + 6*root.fontFactor*osSettings.bigFontSize - color: Material.backgroundColor + color: osSettings.backgroundColor MButton{ id:closeButton anchors.top: parent.top @@ -74,7 +73,7 @@ Flickable{ height: root.fontFactor*osSettings.bigFontSize font.pointSize: osSettings.systemFontSize //verticalAlignment: TextInput.AlignBottom - color: Material.primaryTextColor + color: osSettings.primaryTextColor text:qsTr("Start") } @@ -139,7 +138,7 @@ Flickable{ width: 3*root.fontFactor*osSettings.bigFontSize height: root.fontFactor*osSettings.bigFontSize font.pointSize: osSettings.systemFontSize - color: Material.primaryTextColor + color: osSettings.primaryTextColor text:qsTr("End") } TextField { @@ -293,7 +292,7 @@ Flickable{ } Rectangle{ - color: Material.backgroundColor + color: osSettings.backgroundColor radius: 0.5*mm width: parent.width-root.fontFactor*osSettings.bigFontSize height:Math.max(bodyField.contentHeight+root.fontFactor*osSettings.bigFontSize,2.5*root.fontFactor*osSettings.bigFontSize) @@ -391,7 +390,7 @@ Flickable{ Label { text: formatText(Tumbler.tumbler.count, modelData) opacity: 1.0 - Math.abs(Tumbler.displacement) / (Tumbler.tumbler.visibleItemCount / 2) - color:Material.primaryTextColor + color: osSettings.primaryTextColor horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter font.pointSize: osSettings.systemFontSize diff --git a/source-linux/qml/calendarqml/EventList.qml b/source-linux/qml/calendarqml/EventList.qml index 4fe00b8..aa17a10 100644 --- a/source-linux/qml/calendarqml/EventList.qml +++ b/source-linux/qml/calendarqml/EventList.qml @@ -31,7 +31,6 @@ import QtQuick 2.0 import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 import "qrc:/js/service.js" as Service import "qrc:/js/helper.js" as Helperjs import "qrc:/qml/genericqml" @@ -39,7 +38,7 @@ import "qrc:/qml/calendarqml" Rectangle{ id:eventList - color: Material.backgroundColor + color: osSettings.backgroundColor property var daylist:[] property int dayint: 0 property var events:[] @@ -50,6 +49,7 @@ Rectangle{ anchors.topMargin: 1*mm anchors.right: parent.right anchors.rightMargin: 1*mm + width: 2*root.fontFactor*osSettings.bigFontSize; text: "\uf057" onClicked:{rootstackView.pop()} } diff --git a/source-linux/qml/calendarqml/EventListItem.qml b/source-linux/qml/calendarqml/EventListItem.qml index b7248f8..4db3d2d 100644 --- a/source-linux/qml/calendarqml/EventListItem.qml +++ b/source-linux/qml/calendarqml/EventListItem.qml @@ -31,7 +31,6 @@ import QtQuick 2.0 import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 import "qrc:/js/service.js" as Service import "qrc:/js/helper.js" as Helperjs import "qrc:/qml/genericqml" @@ -43,8 +42,8 @@ Rectangle{ property var currEvent: event width:parent.width height:Math.max(eventNameText.height+eventDetailsText.height,profileImage.height)+mm - border.color: Material.backgroundDimColor - color: Material.backgroundColor + //border.color: osSettings.backgroundDimColor + color: osSettings.backgroundColor border.width: 1 radius: 0.5*mm Image { @@ -61,7 +60,7 @@ Rectangle{ x: 8*mm width:parent.width-8*mm height:contentHeight - color: Material.primaryTextColor + color: osSettings.primaryTextColor textFormat: Text.RichText font.pointSize: osSettings.systemFontSize text: new Date(event.start).toLocaleString(Qt.locale(),Locale.NarrowFormat)+ " - " +((event.end>0)&&(event.end!=null)?new Date(event.end).toLocaleString(Qt.locale(),Locale.NarrowFormat):"\u221E")+":
"+(status=="large"?""+event.title+"":event.title) @@ -74,7 +73,7 @@ Rectangle{ z:4 width: parent.width-8*mm height: contentHeight - color: Material.primaryTextColor + color: osSettings.primaryTextColor textFormat: Text.RichText text: status!="large"?"":Qt.atob(event.desc) + (event.location==""?"":"

"+qsTr("Location")+": "+event.location) anchors.top: eventNameText.bottom diff --git a/source-linux/qml/configqml/AcceptRules.qml b/source-linux/qml/configqml/AcceptRules.qml index 1036802..ef96842 100644 --- a/source-linux/qml/configqml/AcceptRules.qml +++ b/source-linux/qml/configqml/AcceptRules.qml @@ -31,7 +31,6 @@ import QtQuick 2.0 import QtQuick.Controls 2.15 -import QtQuick.Controls.Material 2.12 Dialog { id: rulesDialog @@ -57,8 +56,8 @@ Dialog { x:1; y:1 width: root.width-4*root.fontFactor*osSettings.bigFontSize wrapMode: TextEdit.Wrap - color: Material.primaryTextColor - linkColor: Material.accentColor + color: osSettings.primaryTextColor + linkColor: osSettings.secondaryTextColor textFormat: Text.PlainText font.family: "Noto Sans" font.pointSize: osSettings.systemFontSize diff --git a/source-linux/qml/configqml/AccountPage.qml b/source-linux/qml/configqml/AccountPage.qml index a1ab175..d076d37 100644 --- a/source-linux/qml/configqml/AccountPage.qml +++ b/source-linux/qml/configqml/AccountPage.qml @@ -29,11 +29,12 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -import QtQuick 2.7 -import QtQuick.Dialogs 1.2 -import QtQuick.Controls 2.12 +import QtQuick 6.3 +import QtCore 6.3 +import QtQuick.Dialogs 6.3 +import QtQuick.Controls 6.3 import QtQuick.Layouts 1.12 -import QtQml.Models 2.15 +import QtQml.Models 6.3 import "qrc:/js/service.js" as Service import "qrc:/js/helper.js" as Helperjs import "qrc:/qml/configqml" @@ -55,495 +56,494 @@ Page{ xhr.clearParams(); xhr.get(); } - } + } function verify(userconfig){ Helperjs.friendicaRequest(userconfig,"/api/v1/accounts/verify_credentials",root,function(obj){ - accountBusy.running=false; - try{var credentials=JSON.parse(obj); - if (credentials.hasOwnProperty('error')){ - Helperjs.showMessage(qsTr("Error"),qsTr("Wrong password or 2FA enabled!"),root) - } - else{ - if (users.length==0){Service.setDefaultOptions(db);} - if (userconfig.APIVersion!=""){userconfig.password=""} - if (imagestoredir==""){ - imagestoredir=filesystem.homePath+"/"+credentials.username+"/"; - userconfig.imagestore=imagestoredir + accountBusy.running=false; + try{var credentials=JSON.parse(obj); + if (credentials.hasOwnProperty('error')){ + Helperjs.showMessage(qsTr("Error"),qsTr("Wrong password or 2FA enabled!"),root) } - if(userconfig.imagestore == filesystem.homePath+"/"+credentials.username+"/") + else{ + if (users.length==0){Service.setDefaultOptions(db);} + if (userconfig.APIVersion!=""){userconfig.password=""} + if (imagestoredir==""){ + imagestoredir=filesystem.homePath+"/"+credentials.username+"/"; + userconfig.imagestore=imagestoredir + } + if(userconfig.imagestore == filesystem.homePath+"/"+credentials.username+"/") {filesystem.makePath(filesystem.homePath+"/"+credentials.username);} - print("imagestoredir "+imagestoredir) - filesystem.Directory=imagestoredir; - filesystem.makeDir("contacts"); - filesystem.makeDir("albums"); - userconfig.accountId=credentials.id; - userconfig.username=credentials.username; - Service.storeConfig(db,userconfig); + print("imagestoredir "+imagestoredir) + filesystem.Directory=imagestoredir; + filesystem.makeDir("contacts"); + filesystem.makeDir("albums"); + userconfig.accountId=credentials.id; + userconfig.username=credentials.username; + Service.storeConfig(db,userconfig); + Service.readConfig(db,function(userconfig){ + Helperjs.readData(db,"config","",function(storedUsers){ + storedUsers.sort(function(obj1, obj2) { + return obj1.isActive - obj2.isActive; + }); + accountPage.users=storedUsers}); + //reset values + login=userconfig; + news=[]; + contactlist=[]; + rootstack.currentIndex=0; + newstypeSignal("refresh"); + },"isActive",0); + Helperjs.showMessage(qsTr("Success"),qsTr("Name")+": "+credentials.display_name+"\nScreen Name: "+credentials.username,root) + rootstackView.pop() + } + }catch(e){Helperjs.showMessage(qsTr("Error"),qsTr("Wrong password or 2FA enabled!"),root)}; + }) + } + + BusyIndicator{ + id: accountBusy + anchors.centerIn: parent + width: 5*root.fontFactor*osSettings.bigFontSize + height: 5*root.fontFactor*osSettings.bigFontSize + running: false + } + + ColumnLayout{ + x: root.fontFactor*osSettings.bigFontSize + width: root.width - 2*mm + y: root.fontFactor*osSettings.bigFontSize + spacing: root.fontFactor*osSettings.bigFontSize + + Row{ + spacing:0.5*mm + height: userButton.height + width: parent.width + + MButton{ + id:userButton + text:qsTr("User") + font.pointSize: osSettings.bigFontSize + visible: users.length>0 + onClicked:{ + var useritems=""; + for (var i=0;i0 + text: "-" + font.pointSize: osSettings.bigFontSize + onClicked:{ + var userconfig={server: servername.text, username: username.text, password: Qt.btoa(password.text)}; + + Service.readConfig(db,function(user){ + if(userdata.token!=""){xhr.setUrl(servername.text); + xhr.setApi("/oauth/revoke"); + xhr.clearParams(); + xhr.setParam("client_id",user.client.client_id); + xhr.setParam("client_secret",user.client.client_secret); + xhr.setParam("token",user.token); + xhr.post(); + } + },"username",username.text); + + + Service.deleteConfig(db,userconfig,function(){ + filesystem.Directory=imagestore.text+"contacts"; + filesystem.rmDir(); + filesystem.Directory=imagestore.text+"albums"; + filesystem.rmDir(); + servername.text="https://"; + servericon.visible=false; + servericon.source=""; + username.text=""; + password.text=""; + imagestore.text=""; + userButton.text=qsTr("User"); + Helperjs.readData(db,"config","",function(storedUsers){ + storedUsers.sort(function(obj1, obj2) { + return obj1.isActive - obj2.isActive; + }) + accountPage.users=storedUsers;}) + accountPage.state="new_oauth" + }) + }} + + MButton { + visible: users.length>0 + text: "+" + font.pointSize: osSettings.bigFontSize + onClicked:{ + servername.text="https://" + servericon.visible=false; + servericon.source=""; + username.text="" + password.text="" + imagestore.text="" + userButton.text=qsTr("User") + accountPage.state="new_oauth" + } + } + + MButton { + text: "?" + font.pointSize: osSettings.bigFontSize + onClicked:{ + rootstackView.push("qrc:/qml/configqml/InfoBox.qml"); + } + } + MButton{ + id:closeButton + visible: users.length>0 + text: "\uf057" + font.pointSize: osSettings.bigFontSize + onClicked:{rootstackView.pop()} + } + } + Row{ + spacing:0.5*mm + height: 3*root.fontFactor*osSettings.bigFontSize + width: parent.width + Image{ + id:servericon + width:2.5*root.fontFactor*osSettings.bigFontSize; height: 2.5*root.fontFactor*osSettings.bigFontSize + visible: false + source:"" + property var serverconfig:({}) + MouseArea{ + anchors.fill:parent + onClicked:{ + let serverConfigString="import QtQuick 2.0; import QtQuick.Dialogs 6.3; MessageDialog{ visible: true; title:'Server';buttons: MessageDialog.Ok;text: 'Name: "+ + servericon.serverconfig.site.name+"\nLanguage: "+servericon.serverconfig.site.language+ + "\nEmail: "+servericon.serverconfig.site.email+"\nTimezone: "+servericon.serverconfig.site.timezone+"\nClosed: "+servericon.serverconfig.site.closed+ + "\nText limit: "+servericon.serverconfig.site.textlimit+"\nShort Url length: "+servericon.serverconfig.site.shorturllength+ + "\nFriendica version: "+servericon.serverconfig.site.friendica.FRIENDICA_VERSION+ + "\nDB Update version: "+servericon.serverconfig.site.friendica.DB_UPDATE_VERSION+"'}"; + + var serverconfigObject=Qt.createQmlObject(serverConfigString,accountPage,"serverconfigOutput"); + } + } + } + FontLoader{id: fontAwesome; source: "qrc:/images/fontawesome-webfont.ttf"} + MButton{ + id:serverSearchButton + width: 3*root.fontFactor*osSettings.bigFontSize; height: 2.5*root.fontFactor*osSettings.bigFontSize + text:"\uf002" + icon.name: "search" + font.pointSize: osSettings.bigFontSize + visible: servericon.visible?false:true + onClicked:{Qt.openUrlExternally(Qt.resolvedUrl("https://dir.friendica.social/servers"))} + } + + // ComboBox{ + // id: servername + // x: 4*root.fontFactor*osSettings.bigFontSize + // y: 3.5*root.fontFactor*osSettings.bigFontSize + // width: root.width-5*root.fontFactor*osSettings.bigFontSize + // height: 2.5*root.fontFactor*osSettings.bigFontSize//5*mm; + // font.pointSize: osSettings.systemFontSize + // editable:true + // model: serverModel + // onAccepted: { + // let cleanText =currentText;if(currentText==""){cleanText=editText} + // if((cleanText).substring(0,8) !=="https://"){ + // cleanText="https://"+cleanText + // } + // if (find(cleanText) === -1) { + // serverModel.append({text: cleanText}) + // currentIndex = find(cleanText) + // displayText=cleanText + // } + // if (cleanText!=""){accountPage.setServericon(cleanText)} + // } + // onFocusChanged: { + // if(focus==false){ + // onAccepted() + // } + // } + // } + TextField { + id: servername + width: root.width-5*root.fontFactor*osSettings.bigFontSize + height: 2.5*root.fontFactor*osSettings.bigFontSize + font.pointSize: osSettings.systemFontSize + text:"https://" + onFocusChanged:{ + if (focus){servermenu.open()} + else{ + if((servername.text).substring(0,11) =="https://http"){ + servername.text= (servername.text).substring(8) + } + if (servername.text!="https://"){ + accountPage.setServericon(servername.text)} + } + } + } + Menu { + id:servermenu + width: 13*root.fontFactor*osSettings.bigFontSize + Instantiator{ + model:serverModel + MenuItem{ + text: modelData + onTriggered: {servername.text=modelData} + } + onObjectAdded:{servermenu.insertItem(index,object)} + onObjectRemoved:{servermenu.removeItem(object)} + } + } + + ListModel{id:serverModel + ListElement{text:"https://anonsys.net"} + ListElement{text:"https://asaps-sm.lafayettegroup.com"} + ListElement{text:"https://f.freinetz.ch"} + ListElement{text:"https://friendica.chilemasto.casa"} + ListElement{text:"https://friendica.eskimo.com"} + ListElement{text:"https://friendica.me"} + ListElement{text:"https://friendica.opensocial.space"} + ListElement{text:"https://friendica.utzer.de"} + ListElement{text:"https://friendica.vrije-mens.org"} + ListElement{text:"https://libranet.de"} + ListElement{text:"https://loma.ml"} + ListElement{text:"https://nerdica.net"} + ListElement{text:"https://nsfw.wnymathguy.com"} + ListElement{text:"https://opensocial.at"} + ListElement{text:"https://poliverso.org"} + ListElement{text:"https://social.isurf.ca"} + ListElement{text:"https://social.trom.tf"} + ListElement{text:"https://squeet.me"} + ListElement{text:"https://venera.social"} + } + } + MButton { + id: ruleButton + width: parent.width + visible: (osSettings.osType=="Android") && (userButton.text== qsTr("User")) + height: 2*root.fontFactor*osSettings.bigFontSize; + text: qsTr("Instance rules") + font.pointSize: osSettings.bigFontSize + onClicked:{ + xhr.setUrl(servername.text); + xhr.setApi("/api/v1/instance/rules"); + xhr.clearParams(); + xhr.get(); + } + } + + TextField { + id: username + width: root.width-5*root.fontFactor*osSettings.bigFontSize + height: servername.height + Layout.leftMargin: 3*root.fontFactor*osSettings.bigFontSize; + font.pointSize: osSettings.systemFontSize + visible: (osSettings.osType=="Android")?(text!= ""):true + placeholderText: qsTr("Nickname") + selectByMouse: true + onEditingFinished: { + if (username.text.indexOf('@')>-1){ + Helperjs.showMessage(qsTr("Error"),qsTr("Nicknames containing @ symbol currently not supported"),accountPage) + } + imagestoredir=filesystem.homePath+"/"+username.text+"/" + } + } + + TextField { + id: password + width: root.width-9*mm; height: 2.5*root.fontFactor*osSettings.bigFontSize; + font.pointSize: osSettings.systemFontSize + visible: (osSettings.osType=="Android")?(userButton.text!= qsTr("User")):true + selectByMouse: true + echoMode: TextInput.Password + placeholderText: qsTr("Password") + inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText | Qt.ImhSensitiveData + } + + Row{ + spacing:0.5*mm + height: 3*root.fontFactor*osSettings.bigFontSize + width: parent.width + Label { + id: imagedirlabel + visible: imagestore.text!="" + text: qsTr("Image dir.") + font.pointSize: osSettings.systemFontSize + } + + TextField { + id: imagestore + width: root.width-17*mm; + height: 2.5*root.fontFactor*osSettings.bigFontSize; + visible:imagestore.text!="" + font.pointSize: osSettings.systemFontSize + selectByMouse: true + text: "" + wrapMode: TextEdit.NoWrap + onTextChanged: imagestoredir=imagestore.text + } + + MButton { + visible:imagestore.text!="" + text: "..." + font.pointSize: osSettings.bigFontSize + onClicked:{imagestoreDialog.open()} + } + + FolderDialog { + id: imagestoreDialog + title: "Please choose a directory" + currentFolder: StandardPaths.standardLocations(StandardPaths.PicturesLocation)[0] + //selectFolder: true + onAccepted: { + var imagestoreString=imagestoreDialog.selectedFolder.toString(); + imagestoreString=imagestoreString.replace(/^(file:\/{2})/,"")+"/" + imagestore.text=imagestoreString + } + } + } + + + MButton { + id:confirmationOAuth + width: parent.width + text: qsTr("Connect") + font.pointSize: osSettings.bigFontSize + visible: (osSettings.osType=="Android")?userButton.text!= qsTr("User"):true + onClicked:{ + if (servername.text==""){Helperjs.showMessage(qsTr("Error"), qsTr("No server given!"),root)} + else{ + xhr.setUrl(servername.text); + xhr.setApi("/api/v1/apps"); + xhr.clearParams(); + if (osSettings.osType=="Android"){ + xhr.setParam("client_name","Friendiqa-Android"); + } else { + xhr.setParam("client_name","Friendiqa-"+filesystem.hostname); + } + xhr.setParam("redirect_uris","http://127.0.0.1:1337/"); + xhr.setParam("scopes","read write follow push"); + xhr.setParam("website","https://friendiqa.ma-nic.de"); + xhr.post(); + } + } + } + + Connections{ + target: xhr + function onSuccess(text,api){ + if(api=="/api/v1/instance/rules"){ + let rulestext=""; + let rulesarray=JSON.parse(text) + for (let rule in rulesarray){ + rulestext=rulestext+rulesarray[rule].text+"\n" + } + var component = Qt.createComponent("qrc:/qml/configqml/AcceptRules.qml"); + var rulesdialog = component.createObject(accountPage,{"rules": rulestext}); + rulesdialog.open(); + } + else if(api=="/api/statusnet/config"){ + try{let serverdata = JSON.parse(text); + servericon.visible=true; + servericon.source=serverdata.site.logo; + servericon.serverconfig=serverdata; + } + catch(e){print(e)} + } + + else if (api=="/api/v1/apps"){print("/api/v1/apps text "+text) + let app=JSON.parse(text); + accountPage.appdata=app; + oauth2.setClientId(app.client_id); + oauth2.setClientSecret(app.client_secret); + oauth2.setServer(servername.text); + oauth2.grant(); + } + } + function onError(text,api){ + print(api + " Error "+ text) + } + } + + Connections{ + target: oauth2 + function onSuccess(text){ + var userconfig={server: servername.displayText, username:"", password:"", imagestore: imagestoredir,interval:"",token: text,client:Qt.btoa(JSON.stringify(appdata))} + verify(userconfig) + } + function onError(text){ + Helperjs.showMessage(qsTr("Error"), qsTr("Couldn't connect to server"),root) + print ("oauth2 onerror "+text) + } + } + + MButton { + id:confirmation + width: 10*root.fontFactor*osSettings.bigFontSize; + text: qsTr("Confirm") + font.pointSize: osSettings.bigFontSize + visible: false// (osSettings.osType=="Android")?userButton.text!= qsTr("User"):true + onClicked:{ + accountBusy.running=true; + var userconfig={server: servername.displayText, username: username.text, password:Qt.btoa(password.text), imagestore:imagestoredir,interval:""}; + var errormessage=""; + if (servername.text==""){errormessage=qsTr("No server given! ")} + else if (username.text==""){errormessage+=qsTr("No nickname given! ")} + else if (password.text=="") {errormessage+=qsTr("No password given! ")} + else if (imagestoredir=="") {errormessage+=qsTr("No image directory given!")} + else {errormessage=""} + if (errormessage=="") {verify(userconfig)} + else {Helperjs.showMessage(qsTr("Error"), errormessage,root)} + }} + + MButton { + id: setDefault + width: 10*root.fontFactor*osSettings.bigFontSize; + text: qsTr("Set as default") + font.pointSize: osSettings.bigFontSize + visible: false + onClicked:{ + accountBusy.running=true; + let users=updatenews.getAccounts("username",username.text) + Service.storeConfig(db,users[0]); Service.readConfig(db,function(userconfig){ - Helperjs.readData(db,"config","",function(storedUsers){ - storedUsers.sort(function(obj1, obj2) { - return obj1.isActive - obj2.isActive; - }); - accountPage.users=storedUsers}); - //reset values + //reset values login=userconfig; news=[]; contactlist=[]; rootstack.currentIndex=0; newstypeSignal("refresh"); },"isActive",0); - Helperjs.showMessage(qsTr("Success"),qsTr("Name")+": "+credentials.display_name+"\nScreen Name: "+credentials.username,root) + Helperjs.showMessage(qsTr("Success"),"Screen Name: "+users[0].username,root) rootstackView.pop() - } - }catch(e){Helperjs.showMessage(qsTr("Error"),qsTr("Wrong password or 2FA enabled!"),root)}; - })} - - MButton{ - id:userButton - text:qsTr("User") - font.pointSize: osSettings.bigFontSize - x: root.fontFactor*osSettings.bigFontSize - y: root.fontFactor*osSettings.bigFontSize - width: root.width/2 - 2*mm - height: 2*root.fontFactor*osSettings.bigFontSize - visible: users.length>0 - onClicked:{ - var useritems=""; - for (var i=0;i-1){ - Helperjs.showMessage(qsTr("Error"),qsTr("Nicknames containing @ symbol currently not supported"),accountPage) - } - imagestoredir=filesystem.homePath+"/"+username.text+"/" - //if (imagestore.text==filesystem.homePath+"/.friendiqa/"){imagestore.text=filesystem.homePath+"/.friendiqa/"+username.text+"/"} - } - } - - TextField { - id: password - x: root.fontFactor*osSettings.bigFontSize; y: 9*root.fontFactor*osSettings.bigFontSize; width: root.width-9*mm; //height: 5*mm; - font.pointSize: osSettings.systemFontSize - visible: (osSettings.osType=="Android")?(userButton.text!= qsTr("User")):true - selectByMouse: true - echoMode: TextInput.Password - placeholderText: qsTr("Password") - inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText | Qt.ImhSensitiveData - } - - Label { - id: imagedirlabel - visible: imagestore.text!="" - text: qsTr("Image dir.") - font.pointSize: osSettings.systemFontSize - x: root.fontFactor*osSettings.bigFontSize; y: 12*root.fontFactor*osSettings.bigFontSize - } - - TextField { - id: imagestore - x: root.fontFactor*osSettings.bigFontSize; y: 13*root.fontFactor*osSettings.bigFontSize; width: root.width-17*mm; //height: 5*mm; - visible:imagestore.text!="" - font.pointSize: osSettings.systemFontSize - selectByMouse: true - text: "" //filesystem.homePath+"/.friendiqa/"+username.text+"/" //(osSettings.osType=="Android") && (filesystem.fileexist("/storage/emulated/0/Pictures/"))?"/storage/emulated/0/Pictures/":"" - wrapMode: TextEdit.NoWrap - onTextChanged: imagestoredir=imagestore.text - } - - MButton { - x: root.width-3*root.fontFactor*osSettings.bigFontSize; y: 13*root.fontFactor*osSettings.bigFontSize; - height: 2*root.fontFactor*osSettings.bigFontSize; - visible:imagestore.text!="" - text: "..." - font.pointSize: osSettings.bigFontSize - onClicked:{imagestoreDialog.open()} - } - - FileDialog { - id: imagestoreDialog - title: "Please choose a directory" - folder: shortcuts.pictures - selectFolder: true - onAccepted: { - var imagestoreString=imagestoreDialog.folder.toString(); - imagestoreString=imagestoreString.replace(/^(file:\/{2})/,"")+"/" - imagestore.text=imagestoreString - } - } - - BusyIndicator{ - id: accountBusy - anchors.horizontalCenter: parent.horizontalCenter - y: 16*root.fontFactor*osSettings.bigFontSize - width:10*mm - height: 10*mm - running: false - } - - MButton { - id:confirmationOAuth - x: root.fontFactor*osSettings.bigFontSize; y: 16*root.fontFactor*osSettings.bigFontSize - text: qsTr("Connect") - font.pointSize: osSettings.bigFontSize - visible: (osSettings.osType=="Android")?userButton.text!= qsTr("User"):true - onClicked:{ - if (servername.text==""){Helperjs.showMessage(qsTr("Error"), qsTr("No server given!"),root)} - else{ - xhr.setUrl(servername.text); - xhr.setApi("/api/v1/apps"); - xhr.clearParams(); - if (osSettings.osType=="Android"){ - xhr.setParam("client_name","Friendiqa-Android"); - } else { - xhr.setParam("client_name","Friendiqa-"+filesystem.hostname); - } - xhr.setParam("redirect_uris","http://127.0.0.1:1337/"); - xhr.setParam("scopes","read write follow push"); - xhr.setParam("website","https://friendiqa.ma-nic.de"); - xhr.post(); - } - } - } - - Connections{ - target: xhr - function onSuccess(text,api){ - if(api=="/api/v1/instance/rules"){ - let rulestext=""; - let rulesarray=JSON.parse(text) - for (let rule in rulesarray){ - rulestext=rulestext+rulesarray[rule].text+"\n" - } - var component = Qt.createComponent("qrc:/qml/configqml/AcceptRules.qml"); - var rulesdialog = component.createObject(accountPage,{"rules": rulestext}); - rulesdialog.open(); - } - else if(api=="/api/statusnet/config"){ - try{let serverdata = JSON.parse(text); - servericon.visible=true; - servericon.source=serverdata.site.logo; - servericon.serverconfig=serverdata; - } - catch(e){print(e)} - } - - else if (api=="/api/v1/apps"){print("/api/v1/apps text "+text) - let app=JSON.parse(text); - accountPage.appdata=app; - oauth2.setClientId(app.client_id); - oauth2.setClientSecret(app.client_secret); - oauth2.setServer(servername.text); - oauth2.grant(); - } - } - function onError(text,api){ - print(api + " Error "+ text) - } - } - - Connections{ - target: oauth2 - function onSuccess(text){ - var userconfig={server: servername.displayText, username:"", password:"", imagestore: imagestoredir,interval:"",token: text,client:Qt.btoa(JSON.stringify(appdata))} - verify(userconfig) - } - function onError(text){ - Helperjs.showMessage(qsTr("Error"), qsTr("Couldn't connect to server"),root) - print ("oauth2 onerror "+text) - } - } - - MButton { - id:confirmation - x: root.fontFactor*osSettings.bigFontSize; y: 16*root.fontFactor*osSettings.bigFontSize - text: qsTr("Confirm") - font.pointSize: osSettings.bigFontSize - visible: false// (osSettings.osType=="Android")?userButton.text!= qsTr("User"):true - onClicked:{ - accountBusy.running=true; - var userconfig={server: servername.displayText, username: username.text, password:Qt.btoa(password.text), imagestore:imagestoredir,interval:""}; - var errormessage=""; - if (servername.text==""){errormessage=qsTr("No server given! ")} - else if (username.text==""){errormessage+=qsTr("No nickname given! ")} - else if (password.text=="") {errormessage+=qsTr("No password given! ")} - else if (imagestoredir=="") {errormessage+=qsTr("No image directory given!")} - else {errormessage=""} - if (errormessage=="") {verify(userconfig)} - else {Helperjs.showMessage(qsTr("Error"), errormessage,root)} - }} - - MButton { - id: setDefault - x: 10*root.fontFactor*osSettings.bigFontSize; y: 16*root.fontFactor*osSettings.bigFontSize - text: qsTr("Set as default") - font.pointSize: osSettings.bigFontSize - visible: false - onClicked:{ - accountBusy.running=true; - let users=updatenews.getAccounts("username",username.text) - Service.storeConfig(db,users[0]); - Service.readConfig(db,function(userconfig){ - //reset values - login=userconfig; - news=[]; - contactlist=[]; - rootstack.currentIndex=0; - newstypeSignal("refresh"); - },"isActive",0); - Helperjs.showMessage(qsTr("Success"),"Screen Name: "+users[0].username,root) - rootstackView.pop() - }} - - Row{ - spacing:0.5*mm - anchors.top: parent.top - anchors.topMargin: root.fontFactor*osSettings.bigFontSize - anchors.right: parent.right - anchors.rightMargin: 1*mm - MButton { - width: 5*mm; - visible: users.length>0 - text: "-" - font.pointSize: osSettings.bigFontSize - onClicked:{ - var userconfig={server: servername.text, username: username.text, password: Qt.btoa(password.text)}; - - Service.readConfig(db,function(user){ - if(userdata.token!=""){xhr.setUrl(servername.text); - xhr.setApi("/oauth/revoke"); - xhr.clearParams(); - xhr.setParam("client_id",user.client.client_id); - xhr.setParam("client_secret",user.client.client_secret); - xhr.setParam("token",user.token); - xhr.post(); - } - },"username",username.text); - - - Service.deleteConfig(db,userconfig,function(){ - filesystem.Directory=imagestore.text+"contacts"; - filesystem.rmDir(); - filesystem.Directory=imagestore.text+"albums"; - filesystem.rmDir(); - servername.text="https://"; - servericon.visible=false; - servericon.source=""; - username.text=""; - password.text=""; - imagestore.text=""; - userButton.text=qsTr("User"); - Helperjs.readData(db,"config","",function(storedUsers){ - storedUsers.sort(function(obj1, obj2) { - return obj1.isActive - obj2.isActive; - }) - accountPage.users=storedUsers;}) - accountPage.state="new_oauth" - }) - }} - - MButton { - width: 5*mm; - visible: users.length>0 - text: "+" - font.pointSize: osSettings.bigFontSize - onClicked:{ - servername.text="https://" - servericon.visible=false; - servericon.source=""; - username.text="" - password.text="" - imagestore.text="" - userButton.text=qsTr("User") - accountPage.state="new_oauth" - } - } - - MButton { - width: 5*mm; - text: "?" - font.pointSize: osSettings.bigFontSize - onClicked:{ - rootstackView.push("qrc:/qml/configqml/InfoBox.qml"); - } - } - MButton{ - id:closeButton - width: 5*mm; - visible: users.length>0 - text: "\uf057" - font.pointSize: osSettings.bigFontSize - onClicked:{rootstackView.pop()} - } - } - states: [ State { name: "new_oauth" PropertyChanges {target: username; visible: false } PropertyChanges {target: password; visible: false} PropertyChanges {target: ruleButton; visible: true} - }, + }, State { name:"oauth" PropertyChanges {target: username; visible: true} @@ -561,34 +561,34 @@ Page{ } ] - Component.onCompleted: { //print("filesystem.osType " +filesystem.osType) - try{Helperjs.readData(db,"config","",function(storedUsers){ - storedUsers.sort(function(obj1, obj2) { - return obj1.isActive - obj2.isActive; - }) - accountPage.users=storedUsers; - Service.readConfig(db,function(obj){ - if (obj==null){ - accountPage.state="new_oauth" - } - else{ - userButton.text=obj.username; - servername.text=obj.server; - serverModel.insert(0,{text:obj.server}) - accountPage.setServericon(obj.server); - username.text= obj.username; - password.text=Qt.atob(obj.password); - imagestore.text=obj.imagestore; - imagestoredir=obj.imagestore; - if( obj.isActive==0){userButton.font.bold='true'} else {userButton.font.bold='false'} - if(obj.password!=""){accountPage.state="password"} - else if (obj.token!=""){accountPage.state="oauth"} - else {accountPage.state="new_oauth"} - } + Component.onCompleted: { //print("filesystem.osType " +filesystem.osType) + try{Helperjs.readData(db,"config","",function(storedUsers){ + storedUsers.sort(function(obj1, obj2) { + return obj1.isActive - obj2.isActive; + }) + accountPage.users=storedUsers; + Service.readConfig(db,function(obj){ + if (obj==null){ + accountPage.state="new_oauth" + } + else{ + userButton.text=obj.username; + servername.text=obj.server; + serverModel.insert(0,{text:obj.server}) + accountPage.setServericon(obj.server); + username.text= obj.username; + password.text=Qt.atob(obj.password); + imagestore.text=obj.imagestore; + imagestoredir=obj.imagestore; + if( obj.isActive==0){userButton.font.bold='true'} else {userButton.font.bold='false'} + if(obj.password!=""){accountPage.state="password"} + else if (obj.token!=""){accountPage.state="oauth"} + else {accountPage.state="new_oauth"} + } - },"isActive",0) + },"isActive",0) })} catch (e){//print("onCompleted" +users.count +e) - } + } } } diff --git a/source-linux/qml/configqml/ConfigAppearancePage.qml b/source-linux/qml/configqml/ConfigAppearancePage.qml index 462df2d..c6a0ee0 100644 --- a/source-linux/qml/configqml/ConfigAppearancePage.qml +++ b/source-linux/qml/configqml/ConfigAppearancePage.qml @@ -30,179 +30,218 @@ // along with this program. If not, see . import QtQuick 2.11 -import QtQuick.Dialogs 1.2 +//import QtQuick.Dialogs 1.2 import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 import "qrc:/js/service.js" as Service import "qrc:/qml/configqml" import "qrc:/qml/genericqml" Page{ - //anchors.fill: parent - width:root.width - height:root.height + width: parent.width + height: parent.height + ScrollView{ + anchors.fill: parent + contentHeight: 40*root.fontFactor*osSettings.bigFontSize + contentWidth: root.width + clip:true - Label { - text: qsTr("News as") - font.pointSize:osSettings.systemFontSize - x: root.fontFactor*osSettings.bigFontSize; y: 2*root.fontFactor*osSettings.bigFontSize - } - - Rectangle{ - x: root.fontFactor*osSettings.bigFontSize; y: 4*root.fontFactor*osSettings.bigFontSize; - width: newsTypeField.contentWidth+2*mm; height: 2*root.fontFactor*osSettings.bigFontSize - color: Material.dialogColor//"#F3F3F3" - radius: 0.5*mm - Label{ - id: newsTypeField - anchors.fill: parent - font.pointSize:osSettings.bigFontSize - text:qsTr("Conversations") + Label { + text: qsTr("News as") + font.pointSize:osSettings.systemFontSize + x: root.fontFactor*osSettings.bigFontSize; y: 2*root.fontFactor*osSettings.bigFontSize } - MouseArea{ - anchors.fill:parent - onClicked:newstypemenu.popup() - } - } - Menu { - id:newstypemenu - width:12*root.fontFactor*osSettings.bigFontSize - MenuItem { - font.pointSize: osSettings.bigFontSize - text: qsTr("Timeline") - onTriggered: {newsTypeField.text=qsTr("Timeline"); - Service.updateglobaloptions(root.db,"newsViewType","Timeline");} - } - MenuItem { - font.pointSize: osSettings.bigFontSize - text: qsTr("Conversations") - onTriggered: {newsTypeField.text=qsTr("Conversations"); - Service.updateglobaloptions(root.db,"newsViewType","Conversations");} - } - } - - Label { - text: qsTr("Max. News") - font.pointSize: osSettings.systemFontSize - x: root.fontFactor*osSettings.bigFontSize; y:8*root.fontFactor*osSettings.bigFontSize - } - - Slider{ id: maxNews - x:6*root.fontFactor*osSettings.bigFontSize; y: 10*root.fontFactor*osSettings.bigFontSize; - width: root.width/2;height:2*root.fontFactor*osSettings.bigFontSize - from: 0;to:2000; stepSize: 100 - value: root.globaloptions.hasOwnProperty("max_news")?root.globaloptions.max_news:1000 - } - - Rectangle{ - color: Material.dialogColor - x: root.fontFactor*osSettings.bigFontSize; y: 10*root.fontFactor*osSettings.bigFontSize; - width: 4*root.fontFactor*osSettings.bigFontSize; height: 2*root.fontFactor*osSettings.bigFontSize; - radius: 0.5*mm - TextEdit{id:maxNewsText; - anchors.fill: parent - font.pointSize: osSettings.bigFontSize - verticalAlignment:TextEdit.AlignRight - color: Material.primaryTextColor - text:maxNews.value - selectByMouse: true - onTextChanged: { - Service.updateglobaloptions(root.db,"max_news",text); + Rectangle{ + x: root.fontFactor*osSettings.bigFontSize; y: 4*root.fontFactor*osSettings.bigFontSize; + width: newsTypeField.contentWidth+2*mm; height: 2*root.fontFactor*osSettings.bigFontSize + color: osSettings.backgroundDimColor//"#F3F3F3" + radius: 0.5*mm + Label{ + id: newsTypeField + anchors.fill: parent + font.pointSize:osSettings.bigFontSize + text:qsTr("Conversations") + } + MouseArea{ + anchors.fill:parent + onClicked:newstypemenu.popup() } } - } - - CheckBox{ - id: nsfwCheckbox - x: root.fontFactor*osSettings.bigFontSize - y: 14*root.fontFactor*osSettings.bigFontSize - font.pointSize: osSettings.bigFontSize - text: qsTr("Hide #nsfw?") - checked:(globaloptions["hide_nsfw"]==1)?true:false - onClicked: { - toggle(); - if(nsfwCheckbox.checked==true){ - Service.updateglobaloptions(root.db,"hide_nsfw",0);nsfwCheckbox.checked=false; + Menu { + id:newstypemenu + width:12*root.fontFactor*osSettings.bigFontSize + MenuItem { + font.pointSize: osSettings.bigFontSize + text: qsTr("Timeline") + onTriggered: {newsTypeField.text=qsTr("Timeline"); + Service.updateglobaloptions(root.db,"newsViewType","Timeline");} } - else{ - Service.updateglobaloptions(root.db,"hide_nsfw",1);nsfwCheckbox.checked=true; + MenuItem { + font.pointSize: osSettings.bigFontSize + text: qsTr("Conversations") + onTriggered: {newsTypeField.text=qsTr("Conversations"); + Service.updateglobaloptions(root.db,"newsViewType","Conversations");} } } - } -// CheckBox{ -// id: darkmodeCheckbox -// tristate:true -// x: root.fontFactor*osSettings.bigFontSize -// y: 24*root.fontFactor*osSettings.bigFontSize -// font.pointSize: osSettings.bigFontSize -// text: qsTr("Dark Mode") -// checked:(globaloptions["view_darkmode"]==1)?true:false -// onClicked: { -// toggle(); -// if(darkmodeCheckbox.checked==true){ -// Service.updateglobaloptions(root.db,"view_darkmode",0);darkmodeCheckbox.checked=false; -// root.Material.theme=Material.Light -// } -// else{ -// Service.updateglobaloptions(root.db,"view_darkmode",1);darkmodeCheckbox.checked=true; -// root.Material.theme=Material.Dark -// } -// } -// } - Column{ - x: root.fontFactor*osSettings.bigFontSize - y: 18*root.fontFactor*osSettings.bigFontSize - Label{ - text: qsTr("Dark Mode") - font.pointSize: osSettings.systemFontSize} + Label { + text: qsTr("Max. News") + font.pointSize: osSettings.systemFontSize + x: root.fontFactor*osSettings.bigFontSize; y:8*root.fontFactor*osSettings.bigFontSize + } - RadioButton{ - text: qsTr("System") - checked: (globaloptions["view_darkmode"]==0 || globaloptions["view_darkmode"]==undefined)?true:false + Slider{ id: maxNews + x:6*root.fontFactor*osSettings.bigFontSize; y: 10*root.fontFactor*osSettings.bigFontSize; + width: root.width/2;height:2*root.fontFactor*osSettings.bigFontSize + from: 0;to:2000; stepSize: 100 + value: root.globaloptions.hasOwnProperty("max_news")?root.globaloptions.max_news:1000 + } + + Rectangle{ + color: osSettings.backgroundDimColor + x: root.fontFactor*osSettings.bigFontSize; y: 10*root.fontFactor*osSettings.bigFontSize; + width: 4*root.fontFactor*osSettings.bigFontSize; height: 2*root.fontFactor*osSettings.bigFontSize; + radius: 0.5*mm + TextEdit{id:maxNewsText; + anchors.fill: parent + font.pointSize: osSettings.bigFontSize + verticalAlignment:TextEdit.AlignRight + color: osSettings.primaryTextColor + text:maxNews.value + selectByMouse: true + onTextChanged: { + Service.updateglobaloptions(root.db,"max_news",text); + } + } + } + + CheckBox{ + id: nsfwCheckbox + x: root.fontFactor*osSettings.bigFontSize + y: 14*root.fontFactor*osSettings.bigFontSize font.pointSize: osSettings.bigFontSize + text: qsTr("Hide #nsfw?") + checked:(globaloptions["hide_nsfw"]==1)?true:false onClicked: { - if(checked==true){ - Service.updateglobaloptions(root.db,"view_darkmode",0); - root.Material.theme=Material.System - } + toggle(); + if(nsfwCheckbox.checked==true){ + Service.updateglobaloptions(root.db,"hide_nsfw",0);nsfwCheckbox.checked=false; + } + else{ + Service.updateglobaloptions(root.db,"hide_nsfw",1);nsfwCheckbox.checked=true; + } } } - RadioButton{ - text: qsTr("Dark") - checked: (globaloptions["view_darkmode"]==1)?true:false - font.pointSize: osSettings.bigFontSize - onClicked: { - if(checked==true){ - Service.updateglobaloptions(root.db,"view_darkmode",1); - root.Material.theme=Material.Dark - } - } - } - RadioButton{ - text: qsTr("Light") - checked: (globaloptions["view_darkmode"]==2)?true:false - font.pointSize: osSettings.bigFontSize - onClicked: { - if(checked==true){ - Service.updateglobaloptions(root.db,"view_darkmode",2); - root.Material.theme=Material.Light - } - } - } - } - MButton { - anchors.right: parent.right; //anchors.rightMargin: mm; - anchors.top: parent.top - anchors.topMargin: 2*root.fontFactor*osSettings.bigFontSize - width: 2*root.fontFactor*osSettings.bigFontSize; - text: "?" - font.pointSize: osSettings.bigFontSize - onClicked:{ - rootstackView.push("qrc:/qml/configqml/InfoBox.qml"); + + // CheckBox{ + // id: darkmodeCheckbox + // tristate:true + // x: root.fontFactor*osSettings.bigFontSize + // y: 24*root.fontFactor*osSettings.bigFontSize + // font.pointSize: osSettings.bigFontSize + // text: qsTr("Dark Mode") + // checked:(globaloptions["view_darkmode"]==1)?true:false + // onClicked: { + // toggle(); + // if(darkmodeCheckbox.checked==true){ + // Service.updateglobaloptions(root.db,"view_darkmode",0);darkmodeCheckbox.checked=false; + // root.Material.theme=Material.Light + // } + // else{ + // Service.updateglobaloptions(root.db,"view_darkmode",1);darkmodeCheckbox.checked=true; + // root.Material.theme=Material.Dark + // } + // } + // } + Column{ + visible: osSettings.osType=="Android" + x: root.fontFactor*osSettings.bigFontSize + y: 18*root.fontFactor*osSettings.bigFontSize + Label{ + text: qsTr("Dark Mode") + font.pointSize: osSettings.systemFontSize} + + RadioButton{ + text: qsTr("System") + checked: (globaloptions["view_darkmode"]==0 || globaloptions["view_darkmode"]==undefined)?true:false + font.pointSize: osSettings.bigFontSize + onClicked: { + if(checked==true){ + Service.updateglobaloptions(root.db,"view_darkmode",0); + root.Material.theme=Material.System + } + } + } + RadioButton{ + text: qsTr("Dark") + checked: (globaloptions["view_darkmode"]==1)?true:false + font.pointSize: osSettings.bigFontSize + onClicked: { + if(checked==true){ + Service.updateglobaloptions(root.db,"view_darkmode",1); + root.Material.theme=Material.Dark + } + } + } + RadioButton{ + text: qsTr("Light") + checked: (globaloptions["view_darkmode"]==2)?true:false + font.pointSize: osSettings.bigFontSize + onClicked: { + if(checked==true){ + Service.updateglobaloptions(root.db,"view_darkmode",2); + root.Material.theme=Material.Light + } + } + } + } + + Column{ + x: root.fontFactor*osSettings.bigFontSize + y: 28*root.fontFactor*osSettings.bigFontSize + Label{ + text: qsTr("Toolbar Postion") + font.pointSize: osSettings.systemFontSize} + + RadioButton{ + text: qsTr("Top") + checked: (globaloptions["toolbarposition"]==0 || globaloptions["toolbarposition"]==undefined)?true:false + font.pointSize: osSettings.bigFontSize + onClicked: { + if(checked==true){ + Service.updateglobaloptions(root.db,"roottoolbarposition",0); + globaloptions.toolbarposition=0; + root.roottoolbar.position=ToolBar.Header + } + } + } + RadioButton{ + text: qsTr("Bottom") + checked: (globaloptions["toolbarposition"]==1)?true:false + font.pointSize: osSettings.bigFontSize + onClicked: { + if(checked==true){ + Service.updateglobaloptions(root.db,"roottoolbarposition",1); + globaloptions.toolbarposition=1; + root.roottoolbar.position=ToolBar.Footer + } + } + } + } + + + MButton { + anchors.right: parent.right; anchors.rightMargin: mm; + anchors.top: parent.top + anchors.topMargin: 3*root.fontFactor*osSettings.bigFontSize + //width: 2*root.fontFactor*osSettings.bigFontSize; + text: "?" + font.pointSize: osSettings.bigFontSize + onClicked:{ + rootstackView.push("qrc:/qml/configqml/InfoBox.qml"); + } } } // MButton{ diff --git a/source-linux/qml/configqml/ConfigPage.qml b/source-linux/qml/configqml/ConfigPage.qml index 9b2fdd8..7b762fb 100644 --- a/source-linux/qml/configqml/ConfigPage.qml +++ b/source-linux/qml/configqml/ConfigPage.qml @@ -30,10 +30,9 @@ // along with this program. If not, see . import QtQuick 2.11 -import QtQuick.Dialogs 1.2 +//import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.11 import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 import "qrc:/js/service.js" as Service import "qrc:/qml/configqml" import "qrc:/qml/genericqml" @@ -119,7 +118,7 @@ Page{ MButton{ id:closeButton // height: 2*root.fontFactor*osSettings.bigFontSize - width: 2*root.fontFactor*osSettings.bigFontSize; + //width: 2*root.fontFactor*osSettings.bigFontSize; anchors.top: parent.top anchors.topMargin:2*root.fontFactor*osSettings.bigFontSize anchors.right: parent.right diff --git a/source-linux/qml/configqml/ConfigStartPage.qml b/source-linux/qml/configqml/ConfigStartPage.qml index e0ca51c..ac56145 100644 --- a/source-linux/qml/configqml/ConfigStartPage.qml +++ b/source-linux/qml/configqml/ConfigStartPage.qml @@ -31,8 +31,6 @@ import QtQuick 2.11 import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 - Page{ //anchors.fill: parent diff --git a/source-linux/qml/configqml/InfoBox.qml b/source-linux/qml/configqml/InfoBox.qml index 4677d96..010b346 100644 --- a/source-linux/qml/configqml/InfoBox.qml +++ b/source-linux/qml/configqml/InfoBox.qml @@ -31,7 +31,6 @@ import QtQuick 2.0 import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 import "qrc:/qml/genericqml" Page{ @@ -41,9 +40,9 @@ Page{ textFormat: Text.RichText width: root.width-mm font.pointSize: osSettings.systemFontSize - color:Material.primaryTextColor + color: osSettings.primaryTextColor wrapMode: Text.WrapAtWordBoundaryOrAnywhere - text: "Friendiqa v0.6.8
Licensed under GPL 3 with the exception of OpenSSL
"+ + text: "Friendiqa v0.6.9
Licensed under GPL 3 with the exception of OpenSSL
"+ "Website https://friendiqa.ma-nic.de
"+ "Sourcecode: https://git.friendi.ca/LubuWest/Friendiqa
"+ "Privacy Policy: http://git.friendi.ca/lubuwest/Friendiqa/src/branch/master/PrivacyPolicy.md
"+ diff --git a/source-linux/qml/configqml/LeftDrawerScrollview.qml b/source-linux/qml/configqml/LeftDrawerScrollview.qml index 8a11dce..674f8db 100644 --- a/source-linux/qml/configqml/LeftDrawerScrollview.qml +++ b/source-linux/qml/configqml/LeftDrawerScrollview.qml @@ -51,6 +51,7 @@ ScrollView{ spacing: 0.7*root.fontFactor*osSettings.bigFontSize Label{ width:implicitWidth + font.family: fontAwesome.name font.pointSize: osSettings.systemFontSize text: "\uf085 "+ qsTr("Settings") MouseArea{ @@ -63,6 +64,7 @@ ScrollView{ Label{y: 2*root.fontFactor*osSettings.bigFontSize width:implicitWidth + font.family: fontAwesome.name font.pointSize: osSettings.systemFontSize text: "\uf2bb " + qsTr("Accounts") MouseArea{ @@ -75,6 +77,7 @@ ScrollView{ Label{y: 4*root.fontFactor*osSettings.bigFontSize width:implicitWidth + font.family: fontAwesome.name font.pointSize: osSettings.systemFontSize text: "\uf08b " +qsTr("Quit") MouseArea{ diff --git a/source-linux/qml/configqml/OSSettingsAndroid.qml b/source-linux/qml/configqml/OSSettingsAndroid.qml index 4c5b9de..8777672 100644 --- a/source-linux/qml/configqml/OSSettingsAndroid.qml +++ b/source-linux/qml/configqml/OSSettingsAndroid.qml @@ -31,16 +31,40 @@ import QtQuick.Window 2.0 import QtQuick 2.0 +import QtQuick.Controls.Material 2.12 + QtObject{ property int appWidth: Screen.desktopAvailableWidth property int appHeight: Screen.desktopAvailableHeight property int backKey: Qt.Key_Back //property string attachImageDir:filesystem.cameraPath+"/" property string osType: "Android" + property int systemFontSize: root.font.pointSize*1.1 property int bigFontSize: systemFontSize*1.3 property string imagePickQml: "ImagePicker" property string imagePicker:'import QtQuick 2.0; import "qrc:/qml/genericqml";'+ imagePickQml+'{multiple : true;onReady: {attachImageURLs.push(imageUrl);'+ 'attachImage(imageUrl)}}' + + Material.theme: Material.System + property color backgroundColor: Material.backgroundColor + property color backgroundDimColor:Material.backgroundDimColor + property color primaryTextColor: Material.primaryTextColor + property color secondaryTextColor: Material.secondaryTextColor + property color dialogColor: Material.dialogColor + property color accentColor: Material.accentColor + property color buttonColor: Material.buttonColor + + function setTheme(theme){ + if (theme=="system"){ + Material.theme=Material.System + } + else if (theme=="dark"){ + Material.theme=Material.Dark + } + else if (theme=="light"){ + Material.theme=Material.Light + } + } } diff --git a/source-linux/qml/configqml/OSSettingsLinux.qml b/source-linux/qml/configqml/OSSettingsLinux.qml index a758b26..1c1a8ea 100644 --- a/source-linux/qml/configqml/OSSettingsLinux.qml +++ b/source-linux/qml/configqml/OSSettingsLinux.qml @@ -30,7 +30,9 @@ // along with this program. If not, see . import QtQuick.Window 2.0 -import QtQuick 2.0 +import QtQuick 6.3 +import QtQuick.Controls 6.3 + QtObject{ property real appWidth: Screen.desktopAvailableWidth/4*3 property real appHeight: Screen.desktopAvailableHeight/4*3 @@ -40,4 +42,25 @@ QtObject{ property int bigFontSize: systemFontSize*1.5 //property string attachImageDir:filesystem.homePath+"/Pictures/" property string imagePickQml: "ImagePickerLinux" + //SystemPalette { id: sysPalette; colorGroup: SystemPalette.Active } + //property SystemPalette name: value + property color backgroundColor: palette.window + property color backgroundDimColor: palette.button + property color primaryTextColor: palette.windowText + property color secondaryTextColor: palette.buttonText + property color dialogColor: palette.base + property color accentColor: palette.highlightedText + property color buttonColor: palette.button + + function setTheme(theme){ + if (theme=="system"){ + //Material.theme=Material.System + } + else if (theme=="dark"){ + //Material.theme=Material.Dark + } + else if (theme=="light"){ + //Material.theme=Material.Light + } + } } diff --git a/source-linux/qml/configqml/SyncComponent.qml b/source-linux/qml/configqml/SyncComponent.qml index 473a04d..388d72e 100644 --- a/source-linux/qml/configqml/SyncComponent.qml +++ b/source-linux/qml/configqml/SyncComponent.qml @@ -32,12 +32,11 @@ import QtQuick 2.11 import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 import "qrc:/qml/configqml" import "qrc:/js/service.js" as Service Rectangle{ - color: Material.dialogColor + color: osSettings.dialogColor property string adapter: "" width: parent.width height: 4*root.fontFactor*osSettings.bigFontSize diff --git a/source-linux/qml/configqml/SyncConfig.qml b/source-linux/qml/configqml/SyncConfig.qml index e01dff9..7e0378d 100644 --- a/source-linux/qml/configqml/SyncConfig.qml +++ b/source-linux/qml/configqml/SyncConfig.qml @@ -31,7 +31,6 @@ import QtQuick 2.11 import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 import "qrc:/qml/configqml" import "qrc:/qml/genericqml" import "qrc:/js/service.js" as Service @@ -59,14 +58,14 @@ Page{ Rectangle{ x: root.fontFactor*osSettings.bigFontSize; y:4*root.fontFactor*osSettings.bigFontSize; width: 4*root.fontFactor*osSettings.bigFontSize; height: 2*root.fontFactor*osSettings.bigFontSize; - color: Material.dialogColor + color: osSettings.dialogColor radius: 0.5*mm TextEdit{ id: messageIntervalField anchors.fill: parent font.pointSize: osSettings.bigFontSize verticalAlignment:TextEdit.AlignRight - color: Material.primaryTextColor + color: osSettings.primaryTextColor text:messageIntervalSlider.value focus: true selectByMouse: true diff --git a/source-linux/qml/contactqml/ContactsSearchPage.qml b/source-linux/qml/contactqml/ContactsSearchPage.qml index 3096fbc..85dce63 100644 --- a/source-linux/qml/contactqml/ContactsSearchPage.qml +++ b/source-linux/qml/contactqml/ContactsSearchPage.qml @@ -31,7 +31,6 @@ import QtQuick 2.11 import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 import QtQuick.Layouts 1.11 import QtQuick.LocalStorage 2.0 import "qrc:/js/helper.js" as Helperjs @@ -115,7 +114,7 @@ Page{ x:1.5*root.fontFactor*osSettings.systemFontSize; width:root.width-(7*root.fontFactor*osSettings.systemFontSize+mm); height: 2.5*root.fontFactor*osSettings.systemFontSize; - color:Material.dialogColor + color:osSettings.dialogColor selfdestroying:false } @@ -132,10 +131,10 @@ Page{ Rectangle { width: contactsSearchView.width height: childrenRect.height - color: Material.backgroundColor + color: osSettings.backgroundColor required property string section Text { - color: Material.secondaryTextColor + color: osSettings.secondaryTextColor text: parent.section font.bold: true font.pointSize: osSettings.bigFontSize diff --git a/source-linux/qml/contactqml/FriendsListTab.qml b/source-linux/qml/contactqml/FriendsListTab.qml index 71c562e..b7be66c 100644 --- a/source-linux/qml/contactqml/FriendsListTab.qml +++ b/source-linux/qml/contactqml/FriendsListTab.qml @@ -31,7 +31,6 @@ import QtQuick 2.11 import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 import QtQuick.Layouts 1.11 import QtQuick.LocalStorage 2.0 import "qrc:/js/helper.js" as Helperjs @@ -146,14 +145,15 @@ Item{ Rectangle { id:searchComponent x: mm; y:mm - color: Material.backgroundColor + color: osSettings.backgroundColor radius:0.5*mm width: 10*root.fontFactor*osSettings.bigFontSize height: 2*root.fontFactor*osSettings.bigFontSize TextField { id: searchText - color: Material.primaryTextColor + color: osSettings.primaryTextColor focus: true + font.family: fontAwesome.name font.pointSize: osSettings.systemFontSize wrapMode: Text.Wrap anchors.fill:parent @@ -193,10 +193,10 @@ Item{ Rectangle { width: friendsView.width height: childrenRect.height - color: Material.backgroundColor + color: osSettings.backgroundColor required property string section Text { - color: Material.secondaryTextColor + color: osSettings.secondaryTextColor text: parent.section font.bold: true font.pointSize: osSettings.bigFontSize @@ -208,11 +208,12 @@ Item{ Component { id:headerComponent Rectangle{ - color: Material.dialogColor + color: osSettings.dialogColor width:friendsView.width height:6*mm Text{ - color: Material.primaryTextColor + color: osSettings.primaryTextColor + font.family: fontAwesome.name font.pointSize: osSettings.bigFontSize anchors.centerIn: parent text:"\uf234" diff --git a/source-linux/qml/contactqml/FriendsTab.qml b/source-linux/qml/contactqml/FriendsTab.qml index d8b7e9e..d163c73 100644 --- a/source-linux/qml/contactqml/FriendsTab.qml +++ b/source-linux/qml/contactqml/FriendsTab.qml @@ -31,7 +31,6 @@ import QtQuick 2.11 import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 import QtQuick.Layouts 1.11 import QtQuick.LocalStorage 2.0 import "qrc:/js/helper.js" as Helperjs @@ -42,7 +41,7 @@ import "qrc:/qml/genericqml" Rectangle { y:1 - color: Material.backgroundColor//"white" + color: osSettings.backgroundColor function showContactdetails(contact){ // rootstack.currentIndex=0; diff --git a/source-linux/qml/contactqml/GroupComponent.qml b/source-linux/qml/contactqml/GroupComponent.qml index b7bc434..99d4e81 100644 --- a/source-linux/qml/contactqml/GroupComponent.qml +++ b/source-linux/qml/contactqml/GroupComponent.qml @@ -31,7 +31,6 @@ import QtQuick 2.11 import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 import "qrc:/js/helper.js" as Helperjs import "qrc:/js/news.js" as Newsjs import "qrc:/qml/genericqml" @@ -56,7 +55,7 @@ Item { height: parent.height-mm radius: 0.5*mm border.color: "grey" - color:Material.backgroundColor + color:osSettings.backgroundColor Rectangle{ id:namelabelRect @@ -65,13 +64,13 @@ Item { width: wrapper.width-2 height: 3*root.fontFactor*osSettings.bigFontSize //border.color: "light grey" - color:Material.backgroundColor + color: osSettings.backgroundColor TextInput { id: namelabel anchors.fill: parent readOnly: true text: group.new?"":group.groupname - color: Material.secondaryTextColor//"#303030" + color: osSettings.secondaryTextColor//"#303030" font.pointSize: osSettings.bigFontSize } } @@ -122,7 +121,7 @@ Item { Rectangle{ id: detailsrectangle anchors.top: namelabelRect.bottom - color: Material.backgroundColor + color: osSettings.backgroundColor //anchors.topMargin: mm x:mm width: parent.width-2*mm diff --git a/source-linux/qml/contactqml/ProfileComponent.qml b/source-linux/qml/contactqml/ProfileComponent.qml index afe5c36..3eaded9 100644 --- a/source-linux/qml/contactqml/ProfileComponent.qml +++ b/source-linux/qml/contactqml/ProfileComponent.qml @@ -31,7 +31,6 @@ import QtQuick 2.0 import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 import "qrc:/qml/genericqml" import "qrc:/js/service.js" as Service @@ -39,7 +38,7 @@ Rectangle { // width:parent.width-2*mm // height:parent.height-14*mm anchors.fill:parent - color: Material.backgroundColor//color:"white" + color: osSettings.backgroundColor property var profile:({}) property var attachImageURLs:[] property var createdAtDate: new Date(profile.friendica_owner.created_at) @@ -176,6 +175,7 @@ Rectangle { Text { id:phototext z:4 + font.family: fontAwesome.name text: "\uf040" width:5*mm anchors.top: photoImage.top @@ -206,7 +206,7 @@ Rectangle { anchors.topMargin: 0 anchors.left: photoImage.left wrapMode: Text.Wrap - color: Material.secondaryTextColor//"#303030" + color: osSettings.secondaryTextColor font.pointSize: osSettings.bigFontSize anchors.top: photoImage.bottom } @@ -217,13 +217,13 @@ Rectangle { Rectangle{ id:profileRect width:profileView.width - color: Material.backgroundColor + color: osSettings.backgroundColor height: 5*mm+profiletextfield.height Text{ y:mm font.pointSize: osSettings.systemFontSize text:""+qsTr("profile id")+": "+profileid+"
" - color:Material.primaryTextColor//"black" + color:osSettings.primaryTextColor } Text{ id:profiletextfield @@ -233,7 +233,7 @@ Rectangle { wrapMode: Text.Wrap font.pointSize: osSettings.systemFontSize text:profiletext - color:Material.primaryTextColor + color: osSettings.primaryTextColor onLinkActivated: Qt.openUrlExternally(link) } } @@ -242,7 +242,7 @@ Rectangle { id:textcomponent Text{ id:namelabeltext - color:Material.primaryTextColor + color: osSettings.primaryTextColor width: namelabelflickable.width height: implicitHeight font.pointSize: osSettings.bigFontSize diff --git a/source-linux/qml/friendiqa.qml b/source-linux/qml/friendiqa.qml index 3893f30..c47c75c 100644 --- a/source-linux/qml/friendiqa.qml +++ b/source-linux/qml/friendiqa.qml @@ -33,7 +33,7 @@ import QtQuick 2.5 import QtQuick.LocalStorage 2.0 import QtQuick.Window 2.0 import QtQuick.Controls 2.4 -import QtQuick.Controls.Material 2.12 + import QtQuick.Layouts 1.11 import QSystemTrayIcon 1.0 import "qrc:/js/news.js" as Newsjs @@ -45,7 +45,7 @@ ApplicationWindow{ id:root title: "Friendiqa" property var globaloptions: Service.readGO(db) - property QtObject osSettings: {var tmp=Qt.createComponent("qrc:/qml/configqml/OSSettingsLinux.qml");return tmp.createObject(root)} + property QtObject osSettings: {var tmp=Qt.createComponent("qrc:/qml/configqml/OSSettings"+filesystem.osType+".qml");return tmp.createObject(root)} width: globaloptions.hasOwnProperty("appWidth")?globaloptions.appWidth:osSettings.appWidth height:globaloptions.hasOwnProperty("appHeight")?globaloptions.appHeight:osSettings.appHeight visible: filesystem.Visibility// true @@ -75,10 +75,6 @@ ApplicationWindow{ property var contactposts:[] property bool imagePicking: false - - Material.theme: Material.System - color: Material.backgroundColor - function onLoginChanged(login){ if(login=="" || login==null){rootstackView.push("qrc:/qml/configqml/AccountPage.qml")} else{ @@ -187,16 +183,18 @@ ApplicationWindow{ else {rootstack.currentIndex=0;close.accepted=false} } - Rectangle{ anchors.fill: parent - color: Material.backgroundColor + color: osSettings.backgroundColor } - header: ToolBar{ + footer: ToolBar{ + id: roottoolbar + //position: ToolBar.Footer//globaloptions.roottoolbarposition==0 || globaloptions.roottoolbarposition==undefined?ToolBar.Header:ToolBar.Footer + width:root.width background: Rectangle{ anchors.fill: parent - color: Material.backgroundDimColor + color: osSettings.backgroundDimColor } RowLayout{ anchors.fill: parent @@ -209,38 +207,42 @@ ApplicationWindow{ try{while(rootstackView.depth>1){rootstackView.pop()}}catch(e){} } TabButton { + font.family: fontAwesome.name text: "\uf03a" background:Rectangle{ anchors.fill: parent - color: Material.backgroundDimColor + color: osSettings.backgroundDimColor } ToolTip.visible: pressed || hovered ToolTip.text: qsTr("Posts") onDoubleClicked: {newstypeSignal("refresh")} } TabButton { + font.family: fontAwesome.name text: "\uf0c0" background:Rectangle{ anchors.fill: parent - color: Material.backgroundDimColor + color: osSettings.backgroundDimColor } ToolTip.visible: pressed || hovered ToolTip.text: qsTr("Contacts") } TabButton { + font.family: fontAwesome.name text: "\uf03e" background:Rectangle{ anchors.fill: parent - color: Material.backgroundDimColor + color: osSettings.backgroundDimColor } ToolTip.visible: pressed || hovered ToolTip.text: qsTr("Photos") } TabButton { + font.family: fontAwesome.name text: "\uf073" background:Rectangle{ anchors.fill: parent - color: Material.backgroundDimColor + color: osSettings.backgroundDimColor } ToolTip.visible: pressed || hovered ToolTip.text: qsTr("Calendar") @@ -249,11 +251,12 @@ ApplicationWindow{ } } - -StackView{id:rootstackView - width:root.width - height: root.height - initialItem: StackLayout{ + StackView{id:rootstackView + //y:roottoolbar.height + //anchors.fill: parent + width:root.width + height: root.height-roottoolbar.contentHeight + initialItem: StackLayout{ id:rootstack width:rootstackView.width height: rootstackView.height @@ -283,7 +286,6 @@ StackView{id:rootstackView } } - QSystemTrayIcon { id: systemTray visible: false @@ -299,7 +301,7 @@ StackView{id:rootstackView } } Component.onCompleted: { - icon = iconTray + icon = root.color. import QtQuick 2.0 -import QtQuick.Controls.Material 2.12 Rectangle{ id: blueButton width: Math.max(mainText.width+2*mm,5*mm) @@ -48,7 +47,7 @@ Rectangle{ Text{ id:mainText - color: Material.primaryTextColor//"black" + color: osSettings.primaryTextColor anchors.centerIn: parent width: contentWidth height: contentHeight @@ -67,7 +66,7 @@ Rectangle{ states: [ State { name: "Pressed" - PropertyChanges { target: blueButton; color: Material.buttonColor} } + PropertyChanges { target: blueButton; color: osSettings.buttonColor} } ] transitions: [ Transition { to:"*" diff --git a/source-linux/qml/genericqml/ContactComponent.qml b/source-linux/qml/genericqml/ContactComponent.qml index e9542a6..2342ef5 100644 --- a/source-linux/qml/genericqml/ContactComponent.qml +++ b/source-linux/qml/genericqml/ContactComponent.qml @@ -31,7 +31,6 @@ import QtQuick 2.0 import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 import "qrc:/qml/genericqml" Item { @@ -46,8 +45,8 @@ Item { width:parent.width height: parent.height radius: 0.5*mm - border.color: Material.backgroundDimColor - color: Material.backgroundColor + border.color: osSettings.backgroundDimColor + color: osSettings.backgroundColor Image { id: photoImage x:0.5*mm @@ -70,7 +69,7 @@ Item { height: 1.1*root.fontFactor*osSettings.bigFontSize text: contact.name elide: contentWidth>wrapper.width-4*osSettings.systemFontSize?Text.ElideRight:Text.ElideNone - color: Material.secondaryTextColor + color: osSettings.secondaryTextColor font.pointSize: osSettings.bigFontSize } Label { @@ -79,7 +78,7 @@ Item { height: 1.1*root.fontFactor*osSettings.bigFontSize text: "(@"+contact.screen_name+")" elide: contentWidth>wrapper.width-4*root.fontFactor*osSettings.systemFontSize?Text.ElideRight:Text.ElideNone - color: Material.secondaryTextColor + color: osSettings.secondaryTextColor font.pointSize: osSettings.bigFontSize } Label { @@ -89,7 +88,7 @@ Item { maximumLineCount:2 text: Qt.atob(contact.description)!=""?contact.description:"" elide:Text.ElideRight - color: Material.secondaryTextColor + color: osSettings.secondaryTextColor font.pointSize: osSettings.systemFontSize } } diff --git a/source-linux/qml/genericqml/DrawerAccountComponent.qml b/source-linux/qml/genericqml/DrawerAccountComponent.qml index c01ced0..a8c9f1a 100644 --- a/source-linux/qml/genericqml/DrawerAccountComponent.qml +++ b/source-linux/qml/genericqml/DrawerAccountComponent.qml @@ -29,8 +29,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -import QtQuick 2.0 -import QtQuick.Controls 2.12 +import QtQuick 2.15 +import QtQuick.Controls 6.3 import "qrc:/qml/genericqml" Item { @@ -50,6 +50,7 @@ Item { Label{ y:2*root.fontFactor*osSettings.bigFontSize width:parent.width + font.family: fontAwesome.name font.pointSize: osSettings.systemFontSize text: "\uf021 " + qsTr("Refresh") MouseArea{ @@ -69,6 +70,7 @@ Item { Label{ y:3.5*root.fontFactor*osSettings.bigFontSize width:parent.width + font.family: fontAwesome.name font.pointSize: osSettings.systemFontSize font.bold: account.username==login.username && currentnewstabstatus=="Timeline" text: "\uf1da " + qsTr("Timeline") @@ -87,6 +89,7 @@ Item { Label{ y:5*root.fontFactor*osSettings.bigFontSize width:parent.width + font.family: fontAwesome.name font.pointSize: osSettings.systemFontSize font.bold: account.username==login.username && currentnewstabstatus=="Conversations" text: "\uf086 " + qsTr("Conversations") @@ -107,6 +110,7 @@ Item { Label{ y:6.5*root.fontFactor*osSettings.bigFontSize width:parent.width + font.family: fontAwesome.name font.pointSize: osSettings.systemFontSize font.bold: account.username==login.username && currentnewstabstatus=="Replies" text: "\uf0ec " + qsTr("Replies") @@ -125,6 +129,7 @@ Item { Label{ y:8*root.fontFactor*osSettings.bigFontSize width:parent.width + font.family: fontAwesome.name font.pointSize: osSettings.systemFontSize font.bold: account.username==login.username && currentnewstabstatus=="DirectMessages" text: "\uf0e0 " + qsTr("Direct Messages") @@ -141,6 +146,7 @@ Item { Label{ y:9.5*root.fontFactor*osSettings.bigFontSize width:parent.width + font.family: fontAwesome.name font.pointSize: osSettings.systemFontSize font.bold: account.username==login.username && currentnewstabstatus=="Favorites" text: "\uf005 " + qsTr("Favorites") @@ -159,6 +165,7 @@ Item { Label{ y:11*root.fontFactor*osSettings.bigFontSize width:parent.width + font.family: fontAwesome.name font.pointSize: osSettings.systemFontSize font.bold: account.username==login.username && currentnewstabstatus=="Public Timeline" text: "\uf0ac " + qsTr("Public Timeline") @@ -177,6 +184,7 @@ Item { Label{ y:12.5*root.fontFactor*osSettings.bigFontSize width:parent.width + font.family: fontAwesome.name font.pointSize: osSettings.systemFontSize font.bold: account.username==login.username && currentnewstabstatus=="Groupnews" text: "\uf0c0 " + qsTr("Group news") @@ -195,6 +203,7 @@ Item { Label{ y:14*root.fontFactor*osSettings.bigFontSize width:parent.width + font.family: fontAwesome.name font.pointSize: osSettings.systemFontSize font.bold: account.username==login.username && currentnewstabstatus=="Search" text: "\uf002 " + qsTr("Search") @@ -213,6 +222,7 @@ Item { Label{ y:15.5*root.fontFactor*osSettings.bigFontSize width:parent.width + font.family: fontAwesome.name font.pointSize: osSettings.systemFontSize font.bold: account.username==login.username && currentnewstabstatus=="Notifications" text: "\uf0f3 " + qsTr("Notifications") diff --git a/source-linux/qml/genericqml/ImagePicker.qml b/source-linux/qml/genericqml/ImagePicker.qml index d414c1f..f408c82 100644 --- a/source-linux/qml/genericqml/ImagePicker.qml +++ b/source-linux/qml/genericqml/ImagePicker.qml @@ -37,7 +37,8 @@ Item { Connections { target: SystemDispatcher - onDispatched: { + //onDispatched: { + function onDispatched(type, message){ if ((type === m_CHOSEN_MESSAGE) && (root.imagePicking==true)) { var h=[]; for (var n in message.imageUrls){ diff --git a/source-linux/qml/genericqml/ImagePickerLinux.qml b/source-linux/qml/genericqml/ImagePickerLinux.qml index 50aa4aa..5bbf6e8 100644 --- a/source-linux/qml/genericqml/ImagePickerLinux.qml +++ b/source-linux/qml/genericqml/ImagePickerLinux.qml @@ -30,9 +30,8 @@ // along with this program. If not, see . import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Dialogs 1.2 +import QtQuick.Controls 6.3 +import QtQuick.Dialogs 6.3 import Qt.labs.folderlistmodel 2.12 import "qrc:/js/service.js" as Service import "qrc:/js/helper.js" as Helperjs @@ -81,11 +80,12 @@ Item{ FileDialog { id: imageFileDialog title: "Please choose a file" - folder: shortcuts.pictures - selectFolder: false - selectMultiple: true + currentFolder: StandardPaths.standardLocations(StandardPaths.PicturesLocation)[0] + fileMode: FileDialog.OpenFiles + //selectMultiple: true onAccepted: { - imageUrl=imageFileDialog.fileUrls.toString(); + //imageUrl=imageFileDialog.fileUrls.toString(); + imageUrl=imageFileDialog.selectedFiles.toString(); ready(); } } diff --git a/source-linux/qml/genericqml/LeftDrawerLinux.qml b/source-linux/qml/genericqml/LeftDrawerLinux.qml index dae1e0f..cf6917b 100644 --- a/source-linux/qml/genericqml/LeftDrawerLinux.qml +++ b/source-linux/qml/genericqml/LeftDrawerLinux.qml @@ -31,7 +31,6 @@ import QtQuick 2.0 import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 import "qrc:/qml/configqml" Rectangle{ @@ -40,7 +39,7 @@ Rectangle{ // height: root.height-bar.height //y: bar.height signal opened() - color: Material.backgroundColor + color: osSettings.backgroundColor LeftDrawerScrollview{ width:parent.width-mm @@ -51,7 +50,7 @@ Rectangle{ width: 1 height: leftDrawer.height anchors.right: leftDrawer.right - color: Material.dialogColor//"#EEEEEE" + color: osSettings.dialogColor } //Component.onCompleted: {opened();} } diff --git a/source-linux/qml/genericqml/MButton.qml b/source-linux/qml/genericqml/MButton.qml index 6999941..c4e4e7b 100644 --- a/source-linux/qml/genericqml/MButton.qml +++ b/source-linux/qml/genericqml/MButton.qml @@ -28,18 +28,18 @@ // // You should have received a copy of the GNU General Public License // along with this program. If not, see . -import QtQuick 2.6 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick 2.9 +import QtQuick.Controls 6.3 Button{ id: mButton property alias color: bg.color - width: Math.max(text.width+2*mm,2*root.fontFactor*osSettings.bigFontSize) + width: Math.max(implicitContentWidth+2*mm,3*root.fontFactor*osSettings.bigFontSize) //radius: mm - height: 2*root.fontFactor*osSettings.bigFontSize - //color: Material.grey + height: 2.5*root.fontFactor*osSettings.bigFontSize + //color: Material.foreground + font.family: fontAwesome.name font.pointSize: osSettings.bigFontSize //highlighted:true - background: Rectangle{id:bg;color: Material.dialogColor//"#F3F3F3"; + background: Rectangle{id:bg;color: osSettings.dialogColor; radius: 0.5*mm} } diff --git a/source-linux/qml/genericqml/PermissionDialog.qml b/source-linux/qml/genericqml/PermissionDialog.qml index b215956..cf0ad98 100644 --- a/source-linux/qml/genericqml/PermissionDialog.qml +++ b/source-linux/qml/genericqml/PermissionDialog.qml @@ -30,14 +30,13 @@ // along with this program. If not, see . import QtQuick 2.11 -import QtQuick.Controls.Material 2.12 import "qrc:/js/service.js" as Service import "qrc:/js/helper.js" as Helperjs import "qrc:/qml/genericqml" Rectangle{ id:permissionDialog - color: Material.backgroundColor + color: osSettings.backgroundColor // x: mm width: parent.width-5*mm height:root.height/3 @@ -66,7 +65,7 @@ Rectangle{ Text{ //cid not working in Friendica 02/2022 x:0.5*mm y:0.5*mm - color: Material.primaryTextColor + color: osSettings.primaryTextColor text: qsTr("Friends") } ListView { @@ -86,7 +85,7 @@ Rectangle{ id:contactItem Rectangle{ id:contactitemRect - color: Material.backgroundColor + color: osSettings.backgroundColor width:contactView.width height: 5*mm radius: 0.5*mm @@ -94,10 +93,10 @@ Rectangle{ onContactstatusChanged:{ if(contactstatus=="positive"){contactitemRect.color="light green"} else if (contactstatus=="negative"){contactitemRect.color= "red"} - else{contactitemRect.color= Material.backgroundColor}} - border.color:Material.frameColor + else{contactitemRect.color= osSettings.backgroundColor}} + //border.color:Material.frameColor Text{ - color: Material.primaryTextColor + color: osSettings.primaryTextColor text:contact.screen_name } MouseArea{ @@ -126,7 +125,7 @@ Rectangle{ } } Text{ - color: Material.primaryTextColor + color: osSettings.primaryTextColor x:contactView.width+2*mm y:0.5*mm text: qsTr("Groups") @@ -155,11 +154,11 @@ Rectangle{ onGroupstatusChanged: {if(groupstatus=="positive"){groupitemRect.color="light green"} else if (groupstatus=="negative"){groupitemRect.color= "red"} - else{groupitemRect.color= Material.backgroundColor}} - color: Material.backgroundColor - border.color: Material.frameColor + else{groupitemRect.color= osSettings.backgroundColor}} + color: osSettings.backgroundColor + //border.color: Material.frameColor Text{ - color: Material.primaryTextColor + color: osSettings.primaryTextColor text:group.groupname } MouseArea{ diff --git a/source-linux/qml/genericqml/Search.qml b/source-linux/qml/genericqml/Search.qml index 93b85f0..5fc13d6 100644 --- a/source-linux/qml/genericqml/Search.qml +++ b/source-linux/qml/genericqml/Search.qml @@ -31,12 +31,11 @@ import QtQuick 2.7 import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 import "qrc:/qml/genericqml" Rectangle { id:searchComponent - color: Material.backgroundColor + color: osSettings.backgroundColor radius:0.5*mm property bool selfdestroying:false /* anchors.left: parent.left @@ -48,7 +47,7 @@ Rectangle { TextInput { id: searchText - color: Material.primaryTextColor + color: osSettings.primaryTextColor focus: true font.pointSize: osSettings.bigFontSize wrapMode: Text.Wrap diff --git a/source-linux/qml/newsqml/BlockUser.qml b/source-linux/qml/newsqml/BlockUser.qml index db5cd4d..e3acfac 100644 --- a/source-linux/qml/newsqml/BlockUser.qml +++ b/source-linux/qml/newsqml/BlockUser.qml @@ -31,7 +31,6 @@ import QtQuick 2.0 import QtQuick.Controls 2.15 -import QtQuick.Controls.Material 2.12 import "qrc:/js/helper.js" as Helperjs Dialog { diff --git a/source-linux/qml/newsqml/ContactPage.qml b/source-linux/qml/newsqml/ContactPage.qml index da4173c..3151d8d 100644 --- a/source-linux/qml/newsqml/ContactPage.qml +++ b/source-linux/qml/newsqml/ContactPage.qml @@ -32,7 +32,6 @@ import QtQuick 2.0 import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 import "qrc:/js/helper.js" as Helperjs import "qrc:/js/news.js" as Newsjs import "qrc:/js/service.js" as Service @@ -134,9 +133,9 @@ Page { Component { id: contactHeader Rectangle{ - border.color: Material.backgroundDimColor + border.color: osSettings.backgroundDimColor border.width: 1 - color: Material.backgroundColor + color: osSettings.backgroundColor width:contactView.width height: contactView.width<35*root.fontFactor*osSettings.systemFontSize?(profileImage.height+namelabel.height+detailtext.height+7*mm):Math.max(profileImage.height,(buttonflow.height+namelabel.height+detailtext.height))+7*mm property var createdAtDate: new Date(contact.created_at) @@ -319,7 +318,7 @@ Page { height: implicitHeight text:contact.name+" (@"+contact.screen_name+")" wrapMode: Text.Wrap - color: Material.primaryTextColor + color: osSettings.primaryTextColor font.pointSize: 1.2*osSettings.bigFontSize font.family: "Noto Sans" anchors.top: contactView.width<35*root.fontFactor*osSettings.systemFontSize?profileImage.bottom:buttonflow.bottom @@ -337,7 +336,7 @@ Page { font.family: "Noto Sans" textFormat:Text.RichText wrapMode: Text.Wrap - color: Material.primaryTextColor + color: osSettings.primaryTextColor text:""+qsTr("Description")+": "+(Qt.atob(contact.description)!=""?contact.description:"")+"
"+qsTr("Location")+": "+contact.location+"
"+qsTr("Posts")+": "+contact.statuses_count+ "
"+qsTr("URL")+": "+contact.url+"
"+ ""+qsTr("Created at")+": "+createdAtDate.toLocaleString(Qt.locale())+"
"+ diff --git a/source-linux/qml/newsqml/FriendicaActivities.qml b/source-linux/qml/newsqml/FriendicaActivities.qml index 9551137..78538f6 100644 --- a/source-linux/qml/newsqml/FriendicaActivities.qml +++ b/source-linux/qml/newsqml/FriendicaActivities.qml @@ -31,15 +31,14 @@ // List of people from Friendica Activities import QtQuick 2.0 -import QtQuick.Controls.Material 2.12 import "qrc:/js/helper.js" as Helperjs import "qrc:/qml/genericqml" Rectangle { id:activitiesRectangle property var activitymembers - color: Material.dialogColor - border.color: Material.frameColor + color: osSettings.dialogColor + //border.color: osSettings.frameColor radius:0.5*mm width:root.width/2 height:Math.min(root.height/2,(10*mm+6*activitymembers.length*mm)) @@ -61,8 +60,8 @@ Rectangle { Component { id:activitiesContact Rectangle{ - border.color: Material.frameColor - color: Material.backgroundColor + //border.color: Material.frameColor + color: osSettings.backgroundColor border.width: 1 radius:0.5*mm width:parent.width @@ -77,7 +76,7 @@ Rectangle { onStatusChanged: if (contactImage.status == Image.Error) {source="qrc:/images/defaultcontact.jpg"} } Text{ - color: Material.primaryTextColor + color: osSettings.primaryTextColor font.pointSize: osSettings.bigFontSize anchors.left: contactImage.right anchors.margins: 1*mm diff --git a/source-linux/qml/newsqml/Hashtag.qml b/source-linux/qml/newsqml/Hashtag.qml index 8490d7c..a171e7c 100644 --- a/source-linux/qml/newsqml/Hashtag.qml +++ b/source-linux/qml/newsqml/Hashtag.qml @@ -30,11 +30,10 @@ // along with this program. If not, see . import QtQuick 2.0 -import QtQuick.Controls.Material 2.12 Rectangle { id:hashtagRectangle - color:Material.dialogColor + color: osSettings.dialogColor property alias text: hashtagText.text radius:0.3*mm width:hashtagText.contentWidth+mm @@ -42,7 +41,7 @@ Rectangle { Text{ id:hashtagText font.pointSize: osSettings.systemFontSize - color: Material.secondaryTextColor + color: osSettings.secondaryTextColor anchors.centerIn: parent anchors.margins: 0.5*mm } diff --git a/source-linux/qml/newsqml/MessageImageUploadDialog.qml b/source-linux/qml/newsqml/MessageImageUploadDialog.qml index 74e7b7f..99f12ab 100644 --- a/source-linux/qml/newsqml/MessageImageUploadDialog.qml +++ b/source-linux/qml/newsqml/MessageImageUploadDialog.qml @@ -29,9 +29,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -import QtQuick 2.5 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick 2.12 +import QtQuick.Controls 6.3 import "qrc:/js/helper.js" as Helperjs import "qrc:/qml/genericqml" @@ -177,7 +176,7 @@ Page{ Rectangle{ width: Math.max(10*root.fontFactor*osSettings.bigFontSize,uploadImage.width) height:imageUploadView.height-4*root.fontFactor*osSettings.bigFontSize - color: Material.backgroundColor + color: osSettings.backgroundColor Image{ id: uploadImage width: parent.width //root.width/2-mm @@ -196,7 +195,7 @@ Page{ anchors.right: uploadImage.right color: "black" opacity: 0.5 - Text{anchors.centerIn:parent;text: "\uf01e";color: "white"} + Text{anchors.centerIn:parent;font.family: fontAwesome.name;text: "\uf01e";color: "white"} MouseArea{ anchors.fill:parent; onClicked:{ @@ -215,7 +214,7 @@ Page{ anchors.left: uploadImage.left color: "black" opacity: 0.5 - Text{anchors.centerIn:parent;text: "\uf00d";color: "white"} + Text{anchors.centerIn:parent;font.family: fontAwesome.name; text: "\uf00d";color: "white"} MouseArea{ anchors.fill:parent; onClicked:{ @@ -238,7 +237,7 @@ Page{ Rectangle{ id:descriptionRectangle - color: Material.backgroundColor + color: osSettings.backgroundColor border.color: "grey" anchors.top: uploadImage.bottom anchors.topMargin: mm @@ -262,7 +261,7 @@ Page{ BlueButton{ width: 5*root.fontFactor*osSettings.bigFontSize height:imageUploadView.height-3*root.fontFactor*osSettings.bigFontSize - color: Material.backgroundColor + color: osSettings.backgroundColor border.color: "transparent" text:"\u002b" fontSize: 3*osSettings.bigFontSize diff --git a/source-linux/qml/newsqml/MessageSend.qml b/source-linux/qml/newsqml/MessageSend.qml index af087d6..6b7ca44 100644 --- a/source-linux/qml/newsqml/MessageSend.qml +++ b/source-linux/qml/newsqml/MessageSend.qml @@ -31,25 +31,30 @@ // message.qml // message with buttons -import QtQuick 2.4 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Window 2.0; +import QtQuick.Dialogs 6.4; +//import Qt.labs.platform 6.3 as Platform +import io.qt.examples.texteditor 1.0; import "qrc:/js/helper.js" as Helperjs import "qrc:/js/smiley.js" as Smileyjs import "qrc:/js/news.js" as Newsjs import "qrc:/qml/genericqml" import "qrc:/qml/newsqml" -Rectangle{ - color:Material.dialogColor - width:parent.width - height: messageColumn.height+2*mm - id:messageSend - visible:conversation || (newstab.newstabstatus!="Search")?true:false +Window{ + color: osSettings.backgroundColor + width: parent.width + height: parent.height//messageColumn.height+2*mm + id: messageSend + property bool wideScreen : width>height + // visible: conversation || (newstab.newstabstatus!="Search")?true:false property string parentId: "" - property bool textfocus: false - property bool conversation: false + //property bool textfocus: false + //property bool conversation: false property string reply_to_user:"" + property string windowstate:"" property alias bodyMessage: bodyField.text property var media_ids:[] property var contacts: [] @@ -59,15 +64,15 @@ Rectangle{ property var group_allow:login.hasOwnProperty("permissions")?login.permissions[2]:[] property var group_deny:login.hasOwnProperty("permissions")?login.permissions[3]:[] - function directmessagePrepare(friend){ - messageSend.state="active"; - reply_to_user=friend.screen_name; - receiverLabel.text=friend.screen_name; - } + // function directmessagePrepare(friend){ + // messageSend.state="active"; + // reply_to_user=friend.screen_name; + // receiverLabel.text=friend.screen_name; + // } function sendUrls(urls){ - attachImage(urls); - messageSend.state="active"; + attachImage(urls); + messageSend.state="active"; } function sendtext(text){ @@ -88,24 +93,26 @@ Rectangle{ } function statusUpdate(title,status,in_reply_to_status_id) { + print("status: "+status); //xhr.url= login.server + "/api/statuses/update.json"; try{newsBusy.running=true;conversationBusy.running=true}catch(e){} xhr.setAccount(login); xhr.setApi("/api/statuses/update"); xhr.setParam("source", "Friendiqa"); - xhr.setParam("htmlstatus", status); - if (parentId!="") {xhr.setParam("in_reply_to_status_id", parentId)}; + xhr.setParam("status", status); + if (parentId!="") {xhr.setParam("in_reply_to_status_id", in_reply_to_status_id)}; if (title!=="") {xhr.setParam("title", title)}; -// if (group_allow.length>0) {xhr.setParam("group_allow", Helperjs.cleanArray(group_allow))}; -// if (group_deny.length>0) {xhr.setParam("group_deny", Helperjs.cleanArray(group_deny))}; -// if (contact_allow.length>0) {xhr.setParam("contact_allow", Helperjs.cleanArray(contact_allow))}; -// if (contact_deny.length>0) {xhr.setParam("contact_deny", Helperjs.cleanArray(contact_deny))}; + // if (group_allow.length>0) {xhr.setParam("group_allow", Helperjs.cleanArray(group_allow))}; + // if (group_deny.length>0) {xhr.setParam("group_deny", Helperjs.cleanArray(group_deny))}; + // if (contact_allow.length>0) {xhr.setParam("contact_allow", Helperjs.cleanArray(contact_allow))}; + // if (contact_deny.length>0) {xhr.setParam("contact_deny", Helperjs.cleanArray(contact_deny))}; if (media_ids.length>0) { xhr.setParam("media_ids", media_ids.join()); } xhr.post(); Newsjs.storeHashtags(login,db,status,root); media_ids=[] + messageSend.close() } function dmUpdate(title,text,replyto,screen_name) { @@ -116,20 +123,21 @@ Rectangle{ xhr.setParam("screen_name", screen_name); if (parentId!="") {xhr.setParam("replyto", replyto)}; xhr.post(); + messageSend.close() } - function setParent(newsitemobject){ - if (newsitemobject!=""){ - messageSend.state="conversation" - messageSend.reply_to_user=newsitemobject.user.screen_name; - messageSend.parentId=newsitemobject.id - } else { - messageSend.state=null; - messageSend.reply_to_user=""; - messageSend.parentId=""; - bodyField.text=""; - } - } + // function setParent(newsitemobject){ + // if (newsitemobject!=""){ + // messageSend.state="conversation" + // messageSend.reply_to_user=newsitemobject.user.screen_name; + // messageSend.parentId=newsitemobject.id + // } else { + // messageSend.state=null; + // messageSend.reply_to_user=""; + // messageSend.parentId=""; + // bodyField.text=""; + // } + // } function contactmenu(letter){ Newsjs.listFriends(login,db,function(contacts){ @@ -153,18 +161,51 @@ Rectangle{ tagSelector.visible=true }); } - // Flickable{ - // anchors.fill: parent - // contentHeight: messageColumn.height - // boundsBehavior: Flickable.StopAtBounds + + Action { + id: quitAction + shortcut: StandardKey.Quit + onTriggered: messageSend.close() + } + + Action { + id: copyAction + shortcut: StandardKey.Copy + onTriggered: bodyField.copy() + } + + Action { + id: cutAction + shortcut: StandardKey.Cut + onTriggered: bodyField.cut() + } + + Action { + id: pasteAction + shortcut: StandardKey.Paste + onTriggered: bodyField.paste() + } + + Action { + id: boldAction + shortcut: StandardKey.Bold + onTriggered: document.bold = !document.bold + } + + Action { + id: italicAction + shortcut: StandardKey.Italic + onTriggered: document.italic = !document.italic + } + DropArea{ anchors.fill: parent onDropped: { - if (messageSend.state==""){messageSend.state="active"} + //if (messageSend.state==""){messageSend.state="active"} if (drop.keys.includes('text/uri-list')){ var droptext = drop.text.replace(/(\r\n|\n|\r)/gm, ","); imageUploadDialog.visible=true; - attachImage(droptext)} + attachImage(droptext)} else if (drop.keys.includes('text/html')){ bodyField.append(drop.html)} else if (drop.keys.includes('text/plain')){ @@ -172,121 +213,71 @@ Rectangle{ } } } - Column { - y:0.5*mm - id:messageColumn - spacing: 0.5*mm - width: parent.width - height: 2.6*root.fontFactor*osSettings.bigFontSize+stackTypeDescription.height - Label{id:stackTypeDescription - width: parent.width - horizontalAlignment:Text.AlignHCenter - text: !conversation &&newsSwipeview.stacktype?qsTr(newsSwipeview.stacktype):"" - font.pointSize: osSettings.bigFontSize - BlueButton{ - width: root.fontFactor*osSettings.bigFontSize - height:stackTypeDescription.height - anchors.left: stackTypeDescription.left - anchors.leftMargin: 2*root.fontFactor*osSettings.bigFontSize - visible: newsSwipeview.currentIndex!=0 - text:"\uf053" - fontColor: Material.hintTextColor - border.color: "transparent" - color:"transparent" - radius:0 - onClicked: {newsSwipeview.currentIndex=newsSwipeview.currentIndex-1} + ScrollView{ + width: messageSend.width-root.fontFactor*osSettings.bigFontSize + height: parent.height + clip:true + Column { + y:0.5*mm + id:messageColumn + spacing: 0.5*mm + width: messageSend.width-2*root.fontFactor*osSettings.bigFontSize + TextArea{ + id:receiverLabel + x: mm + width: parent.width-2*mm + font.pointSize: osSettings.bigFontSize + placeholderText:qsTr("to:") + text: "" + visible:false + onTextChanged: { + if (text!=""){contactmenu(text)} else {var receiver=getText(0,cursorPosition);contactmenu(receiver+preeditText)}} } - BlueButton{ - width: root.fontFactor*osSettings.bigFontSize - height:stackTypeDescription.height - anchors.right: stackTypeDescription.right - anchors.rightMargin: 2*root.fontFactor*osSettings.bigFontSize - visible: newsSwipeview.currentIndex!=newsSwipeview.count-1 - text:"\uf054" - fontColor: Material.hintTextColor - border.color: "transparent" - color:"transparent" - radius:0 - onClicked: {newsSwipeview.currentIndex=newsSwipeview.currentIndex+1} + TextField { + id: titleField + x: mm + width: parent.width + font.pointSize: osSettings.systemFontSize + placeholderText: qsTr("Title (optional)") + placeholderTextColor: osSettings.secondaryTextColor + visible: false + background: Rectangle{ + color: osSettings.backgroundDimColor + radius: 0.5*mm + } } - } - TextArea{ - id:receiverLabel - width: messageColumn.width - font.pointSize: osSettings.bigFontSize - placeholderText:qsTr("to:") - text: "" - visible:false - onTextChanged: { - if (text!=""){contactmenu(text)} else {var receiver=getText(0,cursorPosition);contactmenu(receiver+preeditText)}} - } - TextField { - id: titleField - x: 0.5*mm - width: parent.width-mm - font.pointSize: osSettings.systemFontSize - placeholderText: qsTr("Title (optional)") - visible: false - onVisibleChanged: if ((visible==true)&&(conversation==true)){ - conversationView.contentY=conversationView.contentY+titleField.height - } - } - - Rectangle{ - color: Material.backgroundColor - radius: 0.5*mm - visible:(conversation || (newsSwipeview.stacktype!="Notifications")) - x:mm - width: parent.width-2*mm - height:Math.max(bodyField.contentHeight+4*mm,2.5*root.fontFactor*osSettings.bigFontSize) + // Rectangle{ + // color: osSettings.backgroundColor + // radius: 0.5*mm + // x:mm + // width: parent.width-2*mm + // height:Math.max(bodyField.contentHeight+4*mm,2.5*root.fontFactor*osSettings.bigFontSize) TextArea { id: bodyField property string contactprefix:"" property string placeholder: osSettings.osType=="Linux"? qsTr(" Drop your Content here."):"" - anchors.fill: parent + //anchors.fill: parent + x:mm + height:Math.max(bodyField.contentHeight+4*mm,2.5*root.fontFactor*osSettings.bigFontSize) + width: parent.width + background: Rectangle{ + color: osSettings.backgroundDimColor + radius: 0.5*mm + } font.pointSize: osSettings.systemFontSize font.family: "Noto Sans" wrapMode: Text.Wrap selectByMouse: true - placeholderText: conversation?"": (qsTr("What's on your mind?")+placeholder) - textFormat: TextEdit.RichText - onLineCountChanged: { - if (messageSend.ListView.view==null){ - if (newsitem.ListView.view==null){} - else {newsitem.ListView.view.contentY=newsitem.ListView.view.contentY+root.fontFactor*osSettings.systemFontSize} - } - if(conversation==true){ - conversationView.contentY=conversationView.contentY+root.fontFactor*osSettings.systemFontSize - } - else{ - messageSend.ListView.view.contentY=messageSend.ListView.view.contentY+root.fontFactor*osSettings.systemFontSize - } - } + persistentSelection: true + placeholderText: (qsTr("What's on your mind?")+placeholder) + placeholderTextColor: osSettings.secondaryTextColor + textFormat: TextEdit.MarkdownText onLinkActivated:{Qt.openUrlExternally(link)} - onActiveFocusChanged:{ - if (activeFocus==true){ - if (messageSend.ListView.view==null){ - if ((typeof newsitem == 'undefined') || (newsitem.ListView.view==null)){} - else { - newsitem.ListView.view.contentY=newsitem.ListView.view.contentY+newsitem.height/2} - } - else if (conversation==true){ - if(parentId==""){setParent(conversationModel.get(0).newsitemobject);} - messageSend.state="conversation"; - try{conversationView.contentY=conversationView.contentY+20*mm}catch(e){} - } else if (textfocus==false){ - messageSend.state="active"; - messageSend.ListView.view.positionViewAtBeginning(); - } - else{ - messageSend.ListView.view.contentY=messageSend.ListView.view.contentY+8*mm - }; - } - } + onTextChanged:{ if (text!=""){ var plaintext=getText(0,cursorPosition) @@ -302,200 +293,317 @@ Rectangle{ }else {contactSelector.visible=false} }else{contactSelector.visible=false} } - } - } - - ListView{ - id:contactSelector - visible: false - z:3 - x:2*root.fontFactor*osSettings.bigFontSize - width: parent.width-2.2*root.fontFactor*osSettings.bigFontSize - height: messageSend.height/2 - model:contactModel - function processContactSelection(contact){ - if(Helperjs.getCount(db,login,"contacts","screen_name",contact.screen_name)>1){ - contact.screen_name=contact.screen_name+"+"+contacts.cid + MouseArea { + acceptedButtons: Qt.RightButton + anchors.fill: parent + onClicked: contextMenu.open() } - if (newsSwipeview.stacktype=='DirectMessages'){ - receiverLabel.text=contact.screen_name; - reply_to_user=contact.screen_name - } else { - bodyField.remove(bodyField.getText(0,bodyField.cursorPosition).lastIndexOf(bodyField.contactprefix,bodyField.cursorPosition),bodyField.cursorPosition); - bodyField.insert(bodyField.cursorPosition, bodyField.contactprefix+contact.screen_name+" "); - bodyField.cursorPosition=bodyField.cursorPosition+contact.screen_name.length+1 + } + Menu { + id: contextMenu + MenuItem { + text: qsTr("Copy") + enabled: bodyField.selectedText + action: copyAction + //onTriggered: bodyField.copy() + } + MenuItem { + text: qsTr("Cut") + enabled: bodyField.selectedText + action: cutAction + //onTriggered: bodyField.cut() + } + MenuItem { + text: qsTr("Paste") + enabled: bodyField.canPaste + action: pasteAction + //onTriggered: bodyField.paste() + } + MenuItem { + text: qsTr("Text") + enabled: bodyField.selectedText + onTriggered: print(bodyField.getFormattedText(bodyField.selectionStart,bodyField.selectionEnd)) } - //receiverLabel.text=contact.screen_name; - contactSelector.visible=false } - delegate: ContactComponent { } - } - ListModel{id:contactModel} - - ListView{ - id: tagSelector - visible: false - z:3 - x:2*root.fontFactor*osSettings.bigFontSize - width: parent.width-2.2*root.fontFactor*osSettings.bigFontSize - height: messageSend.height/2 - model:tagModel - clip: true - spacing: 0 - function processTagSelection(hashtag){ - bodyField.insert(bodyField.cursorPosition, hashtag+" "); - bodyField.cursorPosition=bodyField.cursorPosition+hashtag.length+1 - tagSelector.visible=false - } - delegate: MButton {text:tag;onClicked: tagSelector.processTagSelection(tag)} - } - ListModel{id:tagModel} - - Row{ - id:buttonRow - visible:false - spacing: mm - height: 2.5*root.fontFactor*osSettings.bigFontSize - x: 0.5*mm - -// MButton{id:permButton //Permissions not working in Friendica 02/2022 -// visible: !conversation && (newsSwipeview.stacktype!=="DirectMessages") -// height: 2*root.fontFactor*osSettings.bigFontSize -// width: 2*root.fontFactor*osSettings.bigFontSize -// text: ((contact_allow.length==0)&&(contact_deny.length==0)&&(group_allow.length==0)&&(group_deny.length==0))?"\uf09c":"\uf023" -// onClicked: { if (permissionDialog.visible==false){permissionDialog.visible=true} else{permissionDialog.visible=false}} -// } - - MButton{ - id:smileyButton - text: "\uf118" - height: 2*root.fontFactor*osSettings.bigFontSize - width: 2*root.fontFactor*osSettings.bigFontSize - onClicked: {if (smileyDialog.visible==false){smileyDialog.visible=true} else{smileyDialog.visible=false}} + DocumentHandler { id: document + document: bodyField.textDocument + cursorPosition: bodyField.cursorPosition + selectionStart: bodyField.selectionStart + selectionEnd: bodyField.selectionEnd + property alias bold: document.font.bold + property alias italic: document.font.italic + property alias strikeout: document.font.strikeout + //onError: function (message) { errorDialog.text = message errorDialog.open() } } - MButton{ - id:hastagButton - text: "\uf292" - height: 2*root.fontFactor*osSettings.bigFontSize - width: 2*root.fontFactor*osSettings.bigFontSize - onClicked: {if (tagSelector.visible==false){hashtagmenu()} else{tagSelector.visible=false}} - } - MButton{ - id:imagesButton - visible:(newsSwipeview.stacktype!="DirectMessages") - text: "\uf03e" - height: 2*root.fontFactor*osSettings.bigFontSize - width: 2*root.fontFactor*osSettings.bigFontSize - onClicked: { - if (imageUploadDialog.visible==false){ - imageUploadDialog.visible=true; - imageUploadDialog.attach() + + ListView{ + id:contactSelector + visible: false + z:3 + x:2*root.fontFactor*osSettings.bigFontSize + width: parent.width-2.2*root.fontFactor*osSettings.bigFontSize + height: messageSend.height/2 + model:contactModel + function processContactSelection(contact){ + if(Helperjs.getCount(db,login,"contacts","screen_name",contact.screen_name)>1){ + contact.screen_name=contact.screen_name+"+"+contacts.cid } - else{imageUploadDialog.visible=false}} + if (newsSwipeview.stacktype=='DirectMessages'){ + receiverLabel.text=contact.screen_name; + reply_to_user=contact.screen_name + } else { + bodyField.remove(bodyField.getText(0,bodyField.cursorPosition).lastIndexOf(bodyField.contactprefix,bodyField.cursorPosition),bodyField.cursorPosition); + bodyField.insert(bodyField.cursorPosition, bodyField.contactprefix+contact.screen_name+" "); + bodyField.cursorPosition=bodyField.cursorPosition+contact.screen_name.length+1 + } + //receiverLabel.text=contact.screen_name; + contactSelector.visible=false + } + delegate: ContactComponent { } } + ListModel{id:contactModel} - MButton { - id: cancelButton - height: 2*root.fontFactor*osSettings.bigFontSize - width: 2*root.fontFactor*osSettings.bigFontSize - text: "\uf057" - onClicked: { - if (textfocus==true){messageSend.destroy()} - else{ - bodyField.text=""; - messageSend.state=""; - permissionDialog.visible=false; - smileyDialog.visible=false; - imageUploadDialog.visible=false; - receiverLabel.visible=false; - reply_to_user=""; - media_ids=[] + ListView{ + id: tagSelector + visible: false + z:3 + x:2*root.fontFactor*osSettings.bigFontSize + width: parent.width-2.2*root.fontFactor*osSettings.bigFontSize + height: messageSend.height/2 + model:tagModel + clip: true + spacing: 0 + function processTagSelection(hashtag){ + bodyField.insert(bodyField.cursorPosition, hashtag+" "); + bodyField.cursorPosition=bodyField.cursorPosition+hashtag.length+1 + tagSelector.visible=false + } + delegate: MButton {text:tag;onClicked: tagSelector.processTagSelection(tag)} + } + ListModel{id:tagModel} + Row{ + id:formatRow + visible: wideScreen + spacing: mm + height: 3.5*root.fontFactor*osSettings.bigFontSize + x: 0.5*mm + MButton { + id: boldButton + text: "\uf032" // icon-bold + ToolTip.visible: pressed || hovered + ToolTip.text: qsTr("Bold") + focusPolicy: Qt.NoFocus + // Don't want to close the virtual keyboard when this is clicked. + // focusPolicy: Qt.NoFocus + // checkable: true + // checked: document.bold + onClicked: { + document.bold = !document.bold; + bodyField.forceActiveFocus() + } + } + MButton { + id: italicButton + text: "\uf033" // icon-italic + ToolTip.visible: pressed || hovered + ToolTip.text: qsTr("Italic") + focusPolicy: Qt.NoFocus + // focusPolicy: Qt.NoFocus + // checkable: true + // checked: document.italic + onClicked: {document.italic = !document.italic;bodyField.forceActiveFocus()} + } + + MButton { + id: liststyleButton + text: "\uf03a" // icon-align-justify + ToolTip.visible: pressed || hovered + ToolTip.text: qsTr("Create list") + // focusPolicy: Qt.NoFocus + // checkable: true + // checked: document.alignment == Qt.AlignJustify + onClicked: {document.liststyle = !document.liststyle;bodyField.forceActiveFocus()} + } + MButton { + id: codeblockButton + text: "\uf121" // icon-code + ToolTip.visible: pressed || hovered + ToolTip.text: qsTr("Format as code") + // focusPolicy: Qt.NoFocus + // checkable: true + // checked: document.alignment == Qt.AlignJustify + onClicked: {document.codeblock = !document.codeblock;bodyField.forceActiveFocus()} + } + MButton { + id: plainButton + text: bodyField.textFormat==TextEdit.PlainText?qsTr("Rendered"):qsTr("MD") // icon-code + ToolTip.visible: pressed || hovered + ToolTip.text: qsTr("Show Markdown code") + // focusPolicy: Qt.NoFocus + // checkable: true + // checked: document.alignment == Qt.AlignJustify + onClicked: { + if(bodyField.textFormat==TextEdit.PlainText){ + bodyField.textFormat=TextEdit.MarkdownText;} + else {bodyField.textFormat=TextEdit.PlainText} + bodyField.forceActiveFocus() } } } - MButton { - id: sendButton - height: 2*root.fontFactor*osSettings.bigFontSize - width: 2*root.fontFactor*osSettings.bigFontSize - text: "\uf1d9" - onClicked: { - var title=titleField.text.replace("\"","\'"); - var body=bodyField.getFormattedText(0,bodyField.length); - var dmbody=bodyField.getText(0,bodyField.length); - if (conversation || newsSwipeview.stacktype!=="DirectMessages"){ - if (parentId!=""){ - statusUpdate(title,dmbody,parentId) - }else{ - statusUpdate(title,body,parentId)} - }else { - if (reply_to_user!=""){dmUpdate(title,dmbody,parentId,reply_to_user)} - else{Helperjs.showMessage(qsTr("Error"),qsTr("No receiver supplied!"),root)} - } - if (conversation==true){ - newstab.newstabstatus=root.globaloptions.newsViewType; rootstackView.pop(null) + PermissionDialog{id:permissionDialog;x:mm;visible: false} + SmileyDialog{id:smileyDialog;x:mm;visible: false} + MessageImageUploadDialog{id:imageUploadDialog;visible: false} + Row{ + id:buttonRow + visible: true + spacing: mm + height: 3.5*root.fontFactor*osSettings.bigFontSize + x: 0.5*mm + + // MButton{id:permButton //Permissions not working in Friendica 02/2022 + // visible: !conversation && (newsSwipeview.stacktype!=="DirectMessages") + // height: 2*root.fontFactor*osSettings.bigFontSize + // width: 2*root.fontFactor*osSettings.bigFontSize + // text: ((contact_allow.length==0)&&(contact_deny.length==0)&&(group_allow.length==0)&&(group_deny.length==0))?"\uf09c":"\uf023" + // onClicked: { if (permissionDialog.visible==false){permissionDialog.visible=true} else{permissionDialog.visible=false}} + // } + + MButton{ + id:smileyButton + text: "\uf118" + ToolTip.visible: pressed || hovered + ToolTip.text: qsTr("Insert smiley") + height: 3*root.fontFactor*osSettings.bigFontSize + width: 3*root.fontFactor*osSettings.bigFontSize + onClicked: {if (smileyDialog.visible==false){smileyDialog.visible=true} else{smileyDialog.visible=false}} + } + + MButton{ + id:hastagButton + text: "\uf292" + ToolTip.visible: pressed || hovered + ToolTip.text: qsTr("Insert previous hashtag") + height: 3*root.fontFactor*osSettings.bigFontSize + width: 3*root.fontFactor*osSettings.bigFontSize + onClicked: {if (tagSelector.visible==false){hashtagmenu()} else{tagSelector.visible=false}} + } + MButton{ + id:imagesButton + visible:(newsSwipeview.stacktype!="DirectMessages") + text: "\uf03e" + ToolTip.visible: pressed || hovered + ToolTip.text: qsTr("Insert images") + height: 3*root.fontFactor*osSettings.bigFontSize + width: 3*root.fontFactor*osSettings.bigFontSize + onClicked: { + if (imageUploadDialog.visible==false){ + imageUploadDialog.visible=true; + imageUploadDialog.attach() + } + else{imageUploadDialog.visible=false}} + } + + MButton { + id: cancelButton + ToolTip.visible: pressed || hovered + ToolTip.text: qsTr("Cancel message") + height: 3*root.fontFactor*osSettings.bigFontSize + width: 3*root.fontFactor*osSettings.bigFontSize + text: "\uf057" + onClicked: {messageSend.close()} + } + MButton { + id: formatButton + ToolTip.visible: pressed || hovered + ToolTip.text: qsTr("Format message") + height: 3*root.fontFactor*osSettings.bigFontSize + width: 3*root.fontFactor*osSettings.bigFontSize + text: "\uf031" + onClicked: {formatRow.visible?formatRow.visible=false:formatRow.visible=true} + } + MButton { + id: sendButton + ToolTip.visible: pressed || hovered + ToolTip.text: qsTr("Send message") + height: 3*root.fontFactor*osSettings.bigFontSize + width: 3*root.fontFactor*osSettings.bigFontSize + text: "\uf1d9" + onClicked: { + var title=titleField.text.replace("\"","\'"); + var body=bodyField.getFormattedText(0,bodyField.length); + var dmbody=bodyField.getText(0,bodyField.length); + if (windowstate=="directmessage"){ + if (reply_to_user!=""){dmUpdate(title,dmbody,parentId,reply_to_user)} + else{Helperjs.showMessage(qsTr("Error"),qsTr("No receiver supplied!"),root)} + + }else { + body=body.replace(/\*\*/g,"__") + statusUpdate(title,body,parentId) + } } } } + } - PermissionDialog{id:permissionDialog;x:mm;visible: false} - SmileyDialog{id:smileyDialog;x:mm;visible: false} - MessageImageUploadDialog{id:imageUploadDialog;visible: false} } Component.onCompleted:{ - root.replySignal.connect(setParent); - root.directmessageSignal.connect(directmessagePrepare); + if(parentId!="" &&reply_to_user!=""){ + receiverLabel.text=reply_to_user; + } + // root.replySignal.connect(setParent); + // root.directmessageSignal.connect(directmessagePrepare); root.uploadSignal.connect(sendUrls); root.sendtextSignal.connect(sendtext); - if (textfocus==true){bodyField.forceActiveFocus()} + // if (textfocus==true){bodyField.forceActiveFocus()} } - states: [ - State { - name: "active" - PropertyChanges { - target: messageColumn; height: implicitHeight - } - PropertyChanges { - target: buttonRow; visible:true - } - PropertyChanges { - target: titleField; visible:(newsSwipeview.stacktype!="DirectMessages") - } - PropertyChanges { - target: receiverLabel; visible:(newsSwipeview.stacktype=="DirectMessages"); - } - }, - State { - name: "conversation" - PropertyChanges { - target: messageColumn; height: implicitHeight - } - PropertyChanges { - target: buttonRow; visible:true - } - PropertyChanges { - target: titleField; visible:(!conversation&&newsSwipeview.stacktype!="DirectMessages") - } - }, + StateGroup{ + state: windowstate + states: [ + State { + name: "active" + PropertyChanges { + target: messageColumn; height: implicitHeight + } + PropertyChanges { + target: titleField; visible: true + } - State { - name: "reply" - PropertyChanges { - target: messageColumn; height: implicitHeight + }, + State { + name: "directmessage" + PropertyChanges { + target: messageColumn; height: implicitHeight + } + PropertyChanges { + target: formatRow; visible: false + } + PropertyChanges { + target: titleField; visible: false + } + PropertyChanges { + target: receiverLabel; visible: true; + } + PropertyChanges { + target: imagesButton; visible: false + } + PropertyChanges { + target: formatButton; visible: false + } }, + + State { + name: "reply" + PropertyChanges { + target: messageColumn; height: implicitHeight + } + PropertyChanges { + target: titleField; visible: false + } + PropertyChanges { + target: bodyField; placeholderText:"";focus:true + } } - PropertyChanges { - target: buttonRow; visible:true - } - PropertyChanges { - target: titleField; visible:false - } - PropertyChanges { - target: bodyField; placeholderText:"";focus:true - } - PropertyChanges { - target: stackTypeDescription; visible:false - } - } - ] + ] + } } diff --git a/source-linux/qml/newsqml/MoreComments.qml b/source-linux/qml/newsqml/MoreComments.qml index 89c08f7..375874d 100644 --- a/source-linux/qml/newsqml/MoreComments.qml +++ b/source-linux/qml/newsqml/MoreComments.qml @@ -30,12 +30,12 @@ // along with this program. If not, see . import QtQuick 2.0 -import QtQuick.Controls.Material 2.12 + Rectangle{ id: moreComments width: parent.width height: 5*mm - color:Material.background//"white" + color:osSettings.backgroundColor property int comments:0 // border.color:"grey" // border.width:1 diff --git a/source-linux/qml/newsqml/NewsPhotolist.qml b/source-linux/qml/newsqml/NewsPhotolist.qml index 14f6cac..4c47334 100644 --- a/source-linux/qml/newsqml/NewsPhotolist.qml +++ b/source-linux/qml/newsqml/NewsPhotolist.qml @@ -32,7 +32,6 @@ import QtQuick 2.15 import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 import "qrc:/qml/genericqml" Page{ @@ -66,7 +65,7 @@ Page{ anchors.topMargin: 1*mm anchors.right: parent.right anchors.rightMargin: 1*mm - color: Material.dialogColor + color: osSettings.dialogColor text: "\uf057" onClicked: { if (rootstackView.depth>1){ diff --git a/source-linux/qml/newsqml/NewsStack.qml b/source-linux/qml/newsqml/NewsStack.qml index 239b6a4..906dcf5 100644 --- a/source-linux/qml/newsqml/NewsStack.qml +++ b/source-linux/qml/newsqml/NewsStack.qml @@ -31,7 +31,6 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 import "qrc:/js/news.js" as Newsjs import "qrc:/js/helper.js" as Helperjs import "qrc:/js/service.js" as Service @@ -40,11 +39,12 @@ Rectangle{ id: newsStack width: parent.width height: parent.height - color: Material.backgroundColor + color: osSettings.backgroundColor property string updateMethodNews: "refresh" property var allchats: ({}) property int lastnewsid:0 property string newstabstatus: "" + property bool expectScreenUpdate: false function newstypeHandling(newstype){ try{newsBusy.running=true}catch(e){print(e)}; @@ -69,21 +69,25 @@ Rectangle{ newsStack.updateMethodNews="refresh"; newstab.newstabstatus="Favorites"; Service.updateView("Favorites"); + expectScreenUpdate=true; break; case "replies": newsStack.updateMethodNews="refresh"; newstab.newstabstatus="Replies"; Service.updateView("Replies"); + expectScreenUpdate=true; break; case "publictimeline": newsStack.updateMethodNews="refresh"; newstab.newstabstatus="Public Timeline"; Service.updateView("Public Timeline"); + expectScreenUpdate=true; break; case "groupnews": newsStack.updateMethodNews="refresh"; newstab.newstabstatus="Groupnews"; Service.showGroups(); + expectScreenUpdate=true; break; case "search": newsView.anchors.topMargin=7*mm; @@ -109,6 +113,7 @@ Rectangle{ else if (newsSwipeview.stacktype=="Notifications"){ Service.updateView("Notifications") } + expectScreenUpdate=true; break; default: if (newstab.newstabstatus=="Timeline" || newstabstatus=="Timeline"){ @@ -126,6 +131,7 @@ Rectangle{ else if (newsSwipeview.stacktype=="Notifications"){ Service.updateView("Notifications") } + expectScreenUpdate=true; } } @@ -149,7 +155,9 @@ Rectangle{ xhr.setAccount(login); xhr.setApi("/api/search"); xhr.setParam("q",term) - xhr.get();} + xhr.get(); + expectScreenUpdate=true; + } newsView.anchors.topMargin=mm } @@ -201,6 +209,7 @@ Rectangle{ try{xhr.setParam("max_id",newsModel.get(newsModel.count-1).newsitemobject.id-1);}catch(e){} xhr.get() + expectScreenUpdate=true; } } @@ -232,6 +241,7 @@ Rectangle{ target:xhr function onError(data,url,api,code){ newsBusy.running=false; + expectScreenUpdate=false; } function onSuccess(data,api){ const newsApiArray=["/api/statuses/friends_timeline", @@ -249,9 +259,11 @@ Rectangle{ "/api/statuses/update", "/api/direct_messages/new" ]; - if(newsApiArray.includes(api)){ + if(newsApiArray.includes(api) && expectScreenUpdate==true){ + expectScreenUpdate=false; Service.processNews(api,data) root.replySignal("") + expectScreenUpdate=false; } } } @@ -261,8 +273,11 @@ Rectangle{ newsBusy.running=false; } function onSuccess(api){ - loadDBNews(); - newsBusy.running=false; + if(expectScreenUpdate){ + loadDBNews(); + newsBusy.running=false; + expectScreenUpdate=false; + } } } @@ -286,6 +301,7 @@ Rectangle{ else if (newsSwipeview.stacktype=="Replies"){ Service.updateView("Replies") } + expectScreenUpdate=true; root.replySignal("") } } @@ -294,12 +310,12 @@ Rectangle{ Component { id:footerComponent Rectangle{ border.color: "#EEEEEE" - color: Material.dialogColor + color: osSettings.dialogColor border.width: 1 width:newsView.width height:6*mm Text{ - color: Material.primaryTextColor + color: osSettings.primaryTextColor font.pointSize: osSettings.systemFontSize anchors.centerIn: parent text:qsTr("More") @@ -308,6 +324,7 @@ Rectangle{ anchors.fill:parent onClicked:{ if (newsModel.count==0){ + expectScreenUpdate=true; if (newsSwipeview.stacktype=="Home"){ Service.updateView(newstab.newstabstatus) } @@ -334,11 +351,11 @@ Rectangle{ property bool viewdraggedpositive: false property string viewtype: "news" width: parent.width - height: parent.height-3*mm + height: parent.height//-3*mm anchors.margins: 0.5*mm clip: true spacing: 0 - header:MessageSend{id:messagesend;onHeightChanged: {if(state=="active"){newsView.positionViewAtBeginning()}}} + //header:MessageSend{id:messagesend;onHeightChanged: {if(state=="active"){newsView.positionViewAtBeginning()}}} footer: footerComponent model: newsModel delegate: Newsitem{} @@ -397,18 +414,22 @@ Rectangle{ showNews(news)}); } } else { + expectScreenUpdate=true; Service.updateView(currentnewstabstatus,currentlastnews) } }); } else if (newsSwipeview.stacktype=="DirectMessages"){ Service.updateView("Direct Messages") + expectScreenUpdate=true; } else if (newsSwipeview.stacktype=="Notifications"){ Service.updateView("Notifications") + expectScreenUpdate=true; } else if (newsSwipeview.stacktype=="Replies"){ Service.updateView("Replies") + expectScreenUpdate=true; } } diff --git a/source-linux/qml/newsqml/NewsTab.qml b/source-linux/qml/newsqml/NewsTab.qml index 36254f0..45e61c1 100644 --- a/source-linux/qml/newsqml/NewsTab.qml +++ b/source-linux/qml/newsqml/NewsTab.qml @@ -29,18 +29,18 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -import QtQuick 2.11 -import QtQuick.Controls 2.12 +import QtQuick 2.15 +import QtQuick.Controls 6.3 import "qrc:/qml/newsqml" import "qrc:/qml/genericqml" import "qrc:/js/news.js" as Newsjs import "qrc:/js/helper.js" as Helperjs import "qrc:/js/service.js" as Service -Rectangle{ +Page{ id:newstabitem width:rootstack.width - height: rootstack.height-8*mm + height: rootstack.height Timer {id:contacttimer; interval: 50; running: false; repeat: false onTriggered: { @@ -85,48 +85,66 @@ Rectangle{ function getActivitiesView(newsitemobject){ var likeText="";var dislikeText="";var attendyesText="";var attendnoText="";var attendmaybeText=""; var self={}; try{if (newsitemobject.messagetype==0&&newsitemobject.hasOwnProperty('friendica_activities')){ - if (newsitemobject.friendica_activities.like.length>0){ - if (newsitemobject.friendica_activities.like.length==1){likeText= newsitemobject.friendica_activities.like[0].name+" "+ qsTr("likes this.")} - else {likeText= newsitemobject.friendica_activities.like.length+" "+ qsTr("like this.")} - } - if (newsitemobject.friendica_activities.dislike.length>0){ - if (newsitemobject.friendica_activities.dislike.length==1){dislikeText= newsitemobject.friendica_activities.dislike[0].name+" "+ qsTr("doesn't like this.")} - else {dislikeText= newsitemobject.friendica_activities.dislike.length+" "+ qsTr("don't like this.")} - } - if (newsitemobject.friendica_activities.attendyes.length>0){ - if (newsitemobject.friendica_activities.attendyes.length==1){attendyesText=newsitemobject.friendica_activities.attendyes[0].name+" "+ qsTr("will attend.")} - else {attendyesText= newsitemobject.friendica_activities.attendyes.length+" "+ qsTr("persons will attend.")} - } - if (newsitemobject.friendica_activities.attendno.length>0){ - if (newsitemobject.friendica_activities.attendno.length==1){attendnoText= newsitemobject.friendica_activities.attendno[0].name+" "+ qsTr("will not attend.")} - else {attendnoText= newsitemobject.friendica_activities.attendno.length+" "+ qsTr("persons will not attend.")} - } - if (newsitemobject.friendica_activities.attendmaybe.length>0){ - if (newsitemobject.friendica_activities.attendmaybe.length==1){attendmaybeText= newsitemobject.friendica_activities.attendmaybe[0].name+" "+ qsTr("may attend.")} - else {attendmaybeText= newsitemobject.friendica_activities.attendmaybe.length+" "+ qsTr("persons may attend.")} - } - //var friendica_activities_self=JSON.parse(newsitemobject.friendica_activities_self); + if (newsitemobject.friendica_activities.like.length>0){ + if (newsitemobject.friendica_activities.like.length==1){likeText= newsitemobject.friendica_activities.like[0].name+" "+ qsTr("likes this.")} + else {likeText= newsitemobject.friendica_activities.like.length+" "+ qsTr("like this.")} + } + if (newsitemobject.friendica_activities.dislike.length>0){ + if (newsitemobject.friendica_activities.dislike.length==1){dislikeText= newsitemobject.friendica_activities.dislike[0].name+" "+ qsTr("doesn't like this.")} + else {dislikeText= newsitemobject.friendica_activities.dislike.length+" "+ qsTr("don't like this.")} + } + if (newsitemobject.friendica_activities.attendyes.length>0){ + if (newsitemobject.friendica_activities.attendyes.length==1){attendyesText=newsitemobject.friendica_activities.attendyes[0].name+" "+ qsTr("will attend.")} + else {attendyesText= newsitemobject.friendica_activities.attendyes.length+" "+ qsTr("persons will attend.")} + } + if (newsitemobject.friendica_activities.attendno.length>0){ + if (newsitemobject.friendica_activities.attendno.length==1){attendnoText= newsitemobject.friendica_activities.attendno[0].name+" "+ qsTr("will not attend.")} + else {attendnoText= newsitemobject.friendica_activities.attendno.length+" "+ qsTr("persons will not attend.")} + } + if (newsitemobject.friendica_activities.attendmaybe.length>0){ + if (newsitemobject.friendica_activities.attendmaybe.length==1){attendmaybeText= newsitemobject.friendica_activities.attendmaybe[0].name+" "+ qsTr("may attend.")} + else {attendmaybeText= newsitemobject.friendica_activities.attendmaybe.length+" "+ qsTr("persons may attend.")} + } + //var friendica_activities_self=JSON.parse(newsitemobject.friendica_activities_self); }} catch(e){print("Activities "+e+ " "+JSON.stringify(newsitemobject.friendica_activities))} return {likeText:likeText,dislikeText:dislikeText,attendyesText:attendyesText,attendnoText:attendnoText,attendmaybeText:attendmaybeText} } + function openMessageSend(messageState,newsitemobject){ + var parentId="" + var replyUser="" + if(newsitemobject!=""){ + parentId=newsitemobject.id + replyUser=newsitemobject.user.screen_name; + } +// var messageString='import QtQuick 2.15; import QtQuick.Window 2.0; import "qrc:/qml/newsqml";'+ +// ' Window{id:messageWindow; title:"Message"; width:root.width; height:root.height; '+ +// 'MessageSend{state:"'+messageState+'"} Component.onCompleted: {x=Screen.width/2-width/2; y=Screen.height/2-height/2}}'; +// var messageObject=Qt.createQmlObject(messageString,root,"messageOutput"); + var messageObject = Qt.createComponent("qrc:/qml/newsqml/MessageSend.qml"); + var messageWindow=messageObject.createObject(root, { parentId: parentId, reply_to_user: replyUser, windowstate: messageState }); + messageWindow.show(); + } + // CalendarTab{ + // visible: wideScreen&&rootstackView.depth<2 + // width: newstabitem.width/3 + // x: newsSwipeview.width + // //anchors.left: newsSwipeview.right + // //anchors.fill: null + // } + // Rectangle{ + // color: "#F8F8F8" + // height: parent.height + // width: 0.5*mm + // anchors.left: newsSwipeview.right + // } + + MessageSend{} -// CalendarTab{ -// visible: wideScreen&&rootstackView.depth<2 -// width: newstabitem.width/3 -// x: newsSwipeview.width -// //anchors.left: newsSwipeview.right -// //anchors.fill: null -// } -// Rectangle{ -// color: "#F8F8F8" -// height: parent.height -// width: 0.5*mm -// anchors.left: newsSwipeview.right -// } BlueButton{ z:2 + anchors.right: parent.right visible: !wideScreen fontColor: "grey" border.color: "transparent" @@ -136,6 +154,20 @@ Rectangle{ leftDrawerAndroid.visible?leftDrawerAndroid.close():leftDrawerAndroid.open()} } + MButton{ + z:2 + anchors.right: parent.right + anchors.bottom: parent.bottom + // fontColor: "grey" + // border.color: "transparent" + text: "\uf040" + font.pointSize: osSettings.bigFontSize + onClicked:{ + if (newsSwipeview.stacktype=="DirectMessages"){openMessageSend("directmessage","")} + else {openMessageSend("active","")} + } + } + LeftDrawerLinux{ id:leftDrawer property var newstabstatus: newstab.newstabstatus @@ -148,22 +180,87 @@ Rectangle{ id: leftDrawerAndroid } + TabBar { + id: newstabbar + x: leftDrawer.width + width: newsSwipeview.width + spacing: 1 + position: TabBar.Header + onCurrentIndexChanged: { + newsSwipeview.currentIndex=newstabbar.currentIndex; + } + TabButton { + font.family: fontAwesome.name + font.pointSize : osSettings.bigFontSize + width: newstabbar.width/5 + text: "\uf015" + background:Rectangle{ + anchors.fill: parent + color: osSettings.backgroundDimColor + border.color: newsSwipeview.currentIndex==0?osSettings.accentColor:color + } + ToolTip.visible: pressed || hovered + ToolTip.text: qsTr("Home") + onDoubleClicked: {newstypeSignal("refresh")} + } + TabButton { + font.family: fontAwesome.name + font.pointSize: osSettings.bigFontSize + width: newstabbar.width/5 + text: "\uf0ec" + background:Rectangle{ + anchors.fill: parent + color: osSettings.backgroundDimColor + border.color: newsSwipeview.currentIndex==1?osSettings.accentColor:color + } + ToolTip.visible: pressed || hovered + ToolTip.text: qsTr("Replies") + } + TabButton { + font.family: fontAwesome.name + font.pointSize: osSettings.bigFontSize + width: newstabbar.width/5 + text: "\uf0e0" + background:Rectangle{ + anchors.fill: parent + color: osSettings.backgroundDimColor + border.color: newsSwipeview.currentIndex==2?osSettings.accentColor:color + } + ToolTip.visible: pressed || hovered + ToolTip.text: qsTr("Direct Messages") + } + TabButton { + font.family: fontAwesome.name + font.pointSize: osSettings.bigFontSize + width: newstabbar.width/5 + text: "\uf0f3" + background:Rectangle{ + anchors.fill: parent + color: osSettings.backgroundDimColor + border.color: newsSwipeview.currentIndex==3?osSettings.accentColor:color + } + ToolTip.visible: pressed || hovered + ToolTip.text: qsTr("Notifications") + } + } + SwipeView{ id: newsSwipeview property string stacktype:"Home" currentIndex: 0 width: wideScreen&&rootstackView.depth<2?newstabitem.width-leftDrawer.width:newstabitem.width//newstabitem.width/3*2:newstabitem.width - height: newstabitem.height-4*mm + height: newstabitem.height-newstabbar.height x: leftDrawer.width + y: newstabbar.height function onDirectMessage(friend){currentIndex=2} onCurrentIndexChanged: { switch(currentIndex){ - case 0: stacktype="Home";break; - case 1: stacktype="Replies";break; - case 2: stacktype="DirectMessages";break; - case 3: stacktype="Notifications";break; - default: stacktype="Home"; + case 0: stacktype="Home";break; + case 1: stacktype="Replies";break; + case 2: stacktype="DirectMessages";break; + case 3: stacktype="Notifications";break; + default: stacktype="Home"; } } diff --git a/source-linux/qml/newsqml/Newsitem.qml b/source-linux/qml/newsqml/Newsitem.qml index a748b99..616aef2 100644 --- a/source-linux/qml/newsqml/Newsitem.qml +++ b/source-linux/qml/newsqml/Newsitem.qml @@ -31,7 +31,6 @@ import QtQuick 2.0 import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 import "qrc:/js/news.js" as Newsjs import "qrc:/js/helper.js" as Helperjs import "qrc:/qml/genericqml" @@ -59,17 +58,18 @@ Item { if (model.newsitemobject.hasOwnProperty("currentconversation")){ rootstackView.push("qrc:/qml/newsqml/Conversation.qml",{"news": model.newsitemobject.currentconversation})} else{rootstackView.push("qrc:/qml/newsqml/Conversation.qml")}; + expectScreenUpdate=true; showConversation(index,newsitemobject) } Rectangle{width:newsitem.width; height: 1; anchors.bottom: newsitem.bottom; - color: Material.backgroundDimColor + color: osSettings.backgroundDimColor } Rectangle{ width:newsitem.width height:newsitem.height-1 - color: Material.background + color: osSettings.backgroundColor Column { id:toprow @@ -112,20 +112,20 @@ Item { Label { id:messageTypeLabel - color: Material.secondaryTextColor + color: osSettings.secondaryTextColor text: if (newsitemobject.messagetype==1){ qsTr("Direct Message")} else if(newsitemobject.messagetype==2) {" Notification"} else {qsTr("Source: ")+newsitemobject.source} font.pointSize: 0.6*osSettings.systemFontSize } Label { id:createdAtLabel - color: Material.secondaryTextColor + color: osSettings.secondaryTextColor font.pointSize: 0.6*osSettings.systemFontSize horizontalAlignment: Label.AlignRight text: " \u00B7 "+getDateDiffString(newsitemobject.dateDiff) + " " +qsTr("ago") } Label { id:replytoLabel - color: Material.secondaryTextColor + color: osSettings.secondaryTextColor font.pointSize: 0.6*osSettings.systemFontSize font.family: "Noto Sans" horizontalAlignment: Label.AlignRight @@ -139,8 +139,8 @@ Item { height: itemMessage.height onClicked: {pushConversation()} Text { - color: Material.primaryTextColor - linkColor: Material.accentColor + color: osSettings.primaryTextColor + linkColor: osSettings.accentColor id: itemMessage textFormat: Text.RichText font.family: "Noto Sans" @@ -189,12 +189,12 @@ Item { anchors.bottom: toprow.bottom visible: toprow.implicitHeight>3/4*root.height || newsitemobject.nsfw text:"\uf078" - fontColor: Material.secondaryTextColor + fontColor: osSettings.secondaryTextColor border.color: "transparent" - color: Material.backgroundColor + color: osSettings.backgroundColor // gradient: Gradient { // GradientStop { position: 0.0; color: "transparent" } -// GradientStop { position: 0.5; color: Material.backgroundDimColor} +// GradientStop { position: 0.5; color: osSettings.backgroundDimColor} // } radius:0 onClicked: { @@ -215,7 +215,7 @@ Item { width:parent.width spacing:mm - Label{color: Material.secondaryTextColor + Label{color: osSettings.secondaryTextColor height:3.5*mm font.pointSize: 0.75*osSettings.systemFontSize text: newsitemobject.hasOwnProperty("isLastComment")?"":friendica_activities_view.likeText @@ -224,7 +224,7 @@ Item { onClicked: { showActivityContacts(newsitemobject.friendica_activities.like)} } } - Label{color: Material.secondaryTextColor + Label{color: osSettings.secondaryTextColor height:3.5*mm font.pointSize: 0.75*osSettings.systemFontSize text: newsitemobject.hasOwnProperty("isLastComment")?"":friendica_activities_view.dislikeText @@ -233,7 +233,7 @@ Item { onClicked: { showActivityContacts(newsitemobject.friendica_activities.dislike)} } } - Label{color: Material.secondaryTextColor + Label{color: osSettings.secondaryTextColor height:3.5*mm font.pointSize: 0.75*osSettings.systemFontSize text: newsitemobject.hasOwnProperty("isLastComment")?"":friendica_activities_view.attendyesText @@ -241,7 +241,7 @@ Item { anchors.fill: parent onClicked: { showActivityContacts(newsitemobject.friendica_activities.attendyes)} }} - Label{color: Material.secondaryTextColor + Label{color: osSettings.secondaryTextColor height:3.5*mm font.pointSize: 0.75*osSettings.systemFontSize text: newsitemobject.hasOwnProperty("isLastComment")?"":friendica_activities_view.attendnoText @@ -250,7 +250,7 @@ Item { onClicked: { showActivityContacts(newsitemobject.friendica_activities.attendno)} } } - Label{color: Material.secondaryTextColor + Label{color: osSettings.secondaryTextColor height:3.5*mm font.pointSize: 0.75*osSettings.systemFontSize text: newsitemobject.hasOwnProperty("isLastComment")?"":friendica_activities_view.attendmaybeText @@ -261,7 +261,7 @@ Item { } Label{ id:attendLabel - color: Material.secondaryTextColor + color: osSettings.secondaryTextColor height:3.5*mm font.pointSize: 0.75*osSettings.systemFontSize horizontalAlignment: Label.AlignRight @@ -288,7 +288,7 @@ Item { anchors.centerIn: parent font.pointSize: osSettings.bigFontSize font.family:fontAwesome.name - color:likeCheckbox.checked?Material.primaryTextColor: Material.secondaryTextColor + color:likeCheckbox.checked?osSettings.primaryTextColor: osSettings.secondaryTextColor text:likeCheckbox.checked?"\uf118"+"!":"\uf118" } } @@ -317,7 +317,7 @@ Item { anchors.centerIn: parent font.pointSize: osSettings.bigFontSize font.family:fontAwesome.name - color:dislikeCheckbox.checked?Material.primaryTextColor: Material.secondaryTextColor + color:dislikeCheckbox.checked?osSettings.primaryTextColor: osSettings.secondaryTextColor text: dislikeCheckbox.checked?"\uf119"+"!":"\uf119" } } @@ -346,7 +346,7 @@ Item { anchors.centerIn: parent font.pointSize: osSettings.bigFontSize font.family:fontAwesome.name - color: favoritedCheckbox.checked?Material.primaryTextColor: Material.secondaryTextColor + color: favoritedCheckbox.checked?osSettings.primaryTextColor: osSettings.secondaryTextColor text:"\uf005" } } @@ -365,7 +365,7 @@ Item { color:"transparent" Text{ id:replysymbol - color: Material.secondaryTextColor + color: osSettings.secondaryTextColor anchors.centerIn: parent font.pointSize: osSettings.bigFontSize font.family:fontAwesome.name @@ -374,21 +374,24 @@ Item { MouseArea{ anchors.fill:parent onClicked: { - var directmessage=0; - if (newsitemobject.messagetype==1){ directmessage=1} - var replycomp=Qt.createComponent("qrc:/qml/newsqml/MessageSend.qml"); - var conversation; - if (newsitem.ListView.view==null){conversation=true} - else if (newsitem.ListView.view.viewtype=="conversation"){ - conversation=true - newsitem.ListView.view.currentIndex=itemindex - } - else{ - conversation=false; - newsitem.ListView.view.currentIndex=itemindex - }; - var reply=replycomp.createObject(friendicaActivities,{parentId:newsitemobject.id,reply_to_user:newsitemobject.user.screen_name, state:"reply",conversation:conversation,textfocus:true}) + openMessageSend("reply",newsitemobject) } + +// var directmessage=0; +// if (newsitemobject.messagetype==1){ directmessage=1} +// var replycomp=Qt.createComponent("qrc:/qml/newsqml/MessageSend.qml"); +// var conversation; +// if (newsitem.ListView.view==null){conversation=true} +// else if (newsitem.ListView.view.viewtype=="conversation"){ +// conversation=true +// newsitem.ListView.view.currentIndex=itemindex +// } +// else{ +// conversation=false; +// newsitem.ListView.view.currentIndex=itemindex +// }; +// var reply=replycomp.createObject(friendicaActivities,{parentId:newsitemobject.id,reply_to_user:newsitemobject.user.screen_name, state:"reply",conversation:conversation,textfocus:true}) +// } } } Rectangle{ @@ -398,7 +401,7 @@ Item { color:"transparent" Text{ id:newsmenusymbol - color: Material.secondaryTextColor + color: osSettings.secondaryTextColor anchors.centerIn: parent font.pointSize: osSettings.bigFontSize font.family:fontAwesome.name @@ -416,7 +419,7 @@ Item { delegate: MenuItem{ contentItem: Text{ font.pointSize: osSettings.systemFontSize - color: Material.secondaryTextColor + color: osSettings.secondaryTextColor text: parent.text } } @@ -483,7 +486,7 @@ Item { delegate: MenuItem{ contentItem: Text{ font.pointSize: osSettings.systemFontSize - color: Material.secondaryTextColor + color: osSettings.secondaryTextColor text: parent.text } } diff --git a/source-linux/qml/newsqml/ReportUser.qml b/source-linux/qml/newsqml/ReportUser.qml index a70ad94..4b5884f 100644 --- a/source-linux/qml/newsqml/ReportUser.qml +++ b/source-linux/qml/newsqml/ReportUser.qml @@ -31,7 +31,6 @@ import QtQuick 2.0 import QtQuick.Controls 2.15 -import QtQuick.Controls.Material 2.12 import "qrc:/js/helper.js" as Helperjs Dialog { diff --git a/source-linux/qml/newsqml/SmileyDialog.qml b/source-linux/qml/newsqml/SmileyDialog.qml index 9bfc635..bd95561 100644 --- a/source-linux/qml/newsqml/SmileyDialog.qml +++ b/source-linux/qml/newsqml/SmileyDialog.qml @@ -32,7 +32,6 @@ import QtQuick 2.11 import QtQuick.Controls 2.12 import QtQuick.Layouts 1.11 -import QtQuick.Controls.Material 2.12 import "qrc:/js/smiley.js" as Smileyjs import "qrc:/js/helper.js" as Helperjs import "qrc:/qml/genericqml" @@ -42,7 +41,7 @@ Rectangle{ x: mm width: messageColumn.width-5*mm height:root.height/2 - color: Material.backgroundColor + color: osSettings.backgroundColor MButton{ id:closeButton @@ -64,22 +63,8 @@ Rectangle{ text:qsTr("Unicode") font.pointSize: osSettings.systemFontSize } - TabButton { - text: qsTr("Standard") - font.pointSize: osSettings.systemFontSize - } - TabButton { - text: qsTr("Addon") - font.pointSize: osSettings.systemFontSize - } - - TabButton { - text: qsTr("Adult") - font.pointSize: osSettings.systemFontSize - } } - StackLayout{ id:smileyTabView currentIndex: smileybar.currentIndex @@ -89,7 +74,7 @@ Rectangle{ height: smileyDialog.height-4*root.fontFactor*osSettings.bigFontSize Rectangle{ id: htmlGridTab - color: Material.backgroundColor + color: osSettings.backgroundColor GridView { id:htmlView anchors.fill: parent @@ -109,97 +94,7 @@ Rectangle{ } } } - - Rectangle{ - id: coreGridTab - color: Material.backgroundColor - GridView { - id: coreSmileyView - anchors.fill: parent - cellWidth: 5*mm - cellHeight: 5*mm - clip: true - model: coreSmileyModel - delegate: smileyItem - } - - ListModel{ - id: coreSmileyModel - } - - Component.onCompleted:{ - var smileyarray=Smileyjs.core - for (var icon in smileyarray){ - coreSmileyModel.append({"emoji":smileyarray[icon]}) - } - } - } - - Rectangle{ - id: addonGridTab - color: Material.backgroundColor - GridView { - id: addonView - anchors.fill: parent - cellWidth: 5*mm - cellHeight: 5*mm - clip: true - model: addonModel - delegate: smileyItem - } - - ListModel{ - id: addonModel - } - Component.onCompleted:{ - for (var icon in Smileyjs.addon){ - addonModel.append({"emoji":Smileyjs.addon[icon]}) - } - } - } - - - Rectangle{ - id: adultGridTab - color: Material.backgroundColor - GridView { - id: adultView - anchors.fill: parent - cellWidth: 5*mm - cellHeight: 5*mm - clip: true - model: adultModel - delegate: smileyItem - } - - ListModel{ - id: adultModel - } - Component.onCompleted:{ - for (var icon in Smileyjs.adult){ - adultModel.append({"emoji":Smileyjs.adult[icon]}) - } - } - } } - Component{ - id:smileyItem - AnimatedImage{id:smileyImage - width:4.5*mm - height: 4.5*mm - fillMode:Image.PreserveAspectFit - source:emoji.url - - MouseArea{ - anchors.fill: parent - onClicked:{ - //bodyField.append(emoji.name+" ") - bodyField.insert(bodyField.cursorPosition,emoji.name+" "); - smileyDialog.visible=false - } - } - } - } Component{ id:htmlItem diff --git a/source-linux/qml/photoqml/ImageUploadDialog.qml b/source-linux/qml/photoqml/ImageUploadDialog.qml index 813f07f..0412489 100644 --- a/source-linux/qml/photoqml/ImageUploadDialog.qml +++ b/source-linux/qml/photoqml/ImageUploadDialog.qml @@ -31,7 +31,6 @@ import QtQuick 2.5 import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 import "qrc:/js/helper.js" as Helperjs import "qrc:/js/image.js" as Imagejs import "qrc:/qml/genericqml" @@ -237,7 +236,7 @@ Page{ Rectangle{ width:root.width/2 //Math.max(20*mm,descriptionInput.contentWidth) height:imageUploadView.height-3*root.fontFactor*osSettings.bigFontSize// 20*mm - color: Material.backgroundColor + color: osSettings.backgroundColor Image{ id: uploadImage width: root.width/2-mm //20*mm @@ -256,7 +255,7 @@ Page{ } Rectangle{ - color: Material.backgroundColor + color: osSettings.backgroundColor border.color: "grey" anchors.top: uploadImage.bottom anchors.topMargin: mm @@ -282,7 +281,7 @@ Page{ BlueButton{ width: 5*root.fontFactor*osSettings.bigFontSize height:imageUploadView.height-3*root.fontFactor*osSettings.bigFontSize - color: Material.backgroundColor + color: osSettings.backgroundColor text:"\u002b" fontSize: 3*osSettings.bigFontSize onClicked:{ diff --git a/source-linux/qml/photoqml/PhotoTab.qml b/source-linux/qml/photoqml/PhotoTab.qml index bd5dafa..1addf00 100644 --- a/source-linux/qml/photoqml/PhotoTab.qml +++ b/source-linux/qml/photoqml/PhotoTab.qml @@ -31,7 +31,6 @@ import QtQuick 2.5 import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 import QtQml.Models 2.1 import "qrc:/js/image.js" as Imagejs import "qrc:/js/helper.js" as Helperjs @@ -44,7 +43,7 @@ StackView{ initialItem:Rectangle { id:fotorectangle anchors.fill:parent - color: Material.backgroundColor + color: osSettings.backgroundColor property var newimages:[] property int currentimageno: 0 property bool remoteContact: false @@ -174,7 +173,7 @@ StackView{ BlueButton{ z:2 visible: !wideScreen - fontColor: Material.secondaryTextColor//"grey" + fontColor: osSettings.secondaryTextColor//"grey" border.color: "transparent" text: "\uf0c9" font.pointSize: osSettings.bigFontSize @@ -287,13 +286,13 @@ StackView{ clip: true model: visualphotoModel.parts.album footer:Rectangle{ - border.color: Material.backgroundDimColor + border.color: osSettings.backgroundDimColor border.width: 1 - color: Material.dialogColor + color: osSettings.dialogColor width:12*mm height:6*mm Text{ - color: Material.primaryTextColor + color: osSettings.primaryTextColor font.pointSize: 0.75*osSettings.systemFontSize anchors.centerIn: parent text:qsTr("More") diff --git a/source-linux/qtquickcontrols2.conf b/source-linux/qtquickcontrols2.conf index 15e32c4..2f6842c 100644 --- a/source-linux/qtquickcontrols2.conf +++ b/source-linux/qtquickcontrols2.conf @@ -1,5 +1,6 @@ [Controls] -Style=Material +Style=Fusion +#Style=Material [Default] Font\Family=Noto Sans
+ + + + + +
+ + +
+ + + + +
+
+ +
+
+
+
+ + +
+ + + + + +
+ + + MorsMortium +
/
+ Friendiqa + + + +
+ + + + + + +
+
+ +
geforkt von lubuwest/Friendiqa
+ +
+ +
+ +
+ +
+ + + 1 + +
+
+ +
+ +
+ + + 0 + +
+
+ + +
+ + Fork + + + + 0 + +
+ +
+ +
+
+ +
+ +
+ + + Code + + + + + + Issues + + + + + + + + + Pull-Requests + + + + + + + + + Pakete + + + + + + Projekte + + + + + + + Releases + + + + + + + Wiki + + + + + + Aktivität + + + + + + +
+ +
+
+
+ +
+ + + + + + + +
+ Du kannst nicht mehr als 25 Themen auswählen + Themen müssen entweder mit einem Buchstaben oder einer Ziffer beginnen. Sie können Bindestriche („-“) enthalten und bis zu 35 Zeichen lang sein. +
+ + + +
+
+ + + + +
+
+ +
+ + +
master
+ + + + + +
v0.001
+ + + +
v0.002
+ + + +
v0.004
+ + + +
v0.1
+ + + +
v0.1.2
+ + + +
v0.2
+ + + +
v0.2.1
+ + + +
v0.2.2
+ + + +
v0.3.1
+ + + +
v0.3.2
+ + + +
v0.3.3
+ + + +
v0.3.4
+ + + +
v0.5
+ + + +
v0.5.1
+ + + +
v0.5.2
+ + + +
v0.5.3
+ + + +
v0.5.4
+ + + +
v0.5.4.1
+ + + +
v0.6
+ + + +
v0.6.1
+ + + +
v0.6.2
+ + + +
v0.6.3
+ + + +
v0.6.5
+ + + +
v0.6.6
+ + + +
+
+
+ + +
+ +
+
+
+ + + Branches + + + + + + Tags + + + +
+
+
+ +
+
${ item.name }
+
+ +
+ + Tag ${ searchTerm } erstellen +
+
+ + Erstelle Branch ${ searchTerm } +
+
+ + von „master“ + +
+ +
+ + + + + + +
+
+
+
${ noResults }
+
+
+
+ + + + + + + + + Friendiqa/source-linux/images/friendica-tray-black.svg + +
+
+ + + +
+
+ +
+

+
+ +
+ + +
+ 42 Zeilen +
+ + +
+ 1.7 KiB +
+ + + +
+ XML +
+ +
+ + +
+
+ +
+ + +
+ + +
+ Originalformat + + Permalink + + + Blame + + Verlauf + +
+ + + + + + + + + + + +
+

+
+ + + + + + +
+ +
+ + + +
+ +
+
+
+ + +
+
+ + + + +