Version 0.003

README.md

@@ -2,6 +2,7 @@
 
 QML based client for the Friendica Social Network.
  Tabs for news (incl. Direct Messages), friends and photos.
+ Delete old version first when upgrading (due to database changes)
 OS: currently Linux and Android(4.3).
 Source code is a QtCreator project.
 
@@ -18,22 +19,22 @@ Source code is a QtCreator project.
 # News #
 Currently supported:
 *  Shows Posts from friends, favorited messages, Direct Messages and Notifications
-*  Show news as timeline or tree (conversation opens in separate window)
+*  Show news as timeline or tree (conversation opens in same window)
 *  Open links in external browser
+*  Click on contact phot for additional information
 *  Deletion, Reposting, Answering of Posts
 *  Liking, disliking, favoriting
+*  Click on like text for additional contact info
 *  Attending events
 *  Update fetches new posts since last in local DB
 *  More shows older posts from local DB
-*  Create new Message with images or direct messages, Contact/Group access rights
-
+*  Create new Message with images or direct messages, Contact/Group access rights(can be stored), smileys
+*  New image dialog
 
 ToDo:
-*  Nice symbols for liking, disliking
 *  Videos and other binary data as attachment (sending and receiving)
 *  Rich text editing in Send Dialog
 *  Attachments for Direct messages (currently not supported in API)
-*  Better image selection (currently ugly file dialog)
 
     
 # Friends #
@@ -44,7 +45,7 @@ Currently supported:
 *  Show news of contact from local database
 *  Send direct message, if contact is following  
 *  Show public pictures of contact (screenscraping of contact's website, works only with certain theme)
-*  Open website of contact
+*  Open website of contact or connect page (for other contacts) 
      
 ToDo:
 *  More information for contact from description page, possibly private information for friends
@@ -56,12 +57,12 @@ Currently supported:
 *  Download all own images to local directory
 *  Show albums in grid, show images in album in grid and fullscreen
 *  Show albums and images of contacts
+*  Pinch to zoom, swipe to scroll
 
 ToDo:
 *  Private images of friends
 *  Support for all themes of friends
 *  Delete downloaded own images
-*  Pinch to zoom, swipe to scroll
 
      
 # Config #
@@ -82,6 +83,15 @@ ToDo
 *  Blingbling
 
      
+# New in version 0.003
+*  improved BackButton behaviour
+*  click on contact everywhere to get to contact details
+*  Image dialog automatically opens in Android camera directory
+*  Smiley Dialog in Message Dialog
+*  Extensive use of FontAwesome for icons
+*  Bugfixes
+     
+     
 ## License ##
 *  v0.001 for Friendica < 3.5
 *  v0.002 for Friendica >= 3.5

source-android/android/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="org.qtproject.friendiqa" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.2" android:versionCode="2" android:installLocation="auto">
+<manifest package="org.qtproject.friendiqa" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.3" android:versionCode="3" android:installLocation="auto">
     <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Friendiqa" android:icon="@drawable/icon" android:logo="@drawable/icon">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="Friendiqa" android:screenOrientation="unspecified" android:launchMode="singleTop">
             <intent-filter>

source-android/android/gradle.properties

@@ -0,0 +1,4 @@
+androidBuildToolsVersion=23.0.2
+androidCompileSdkVersion=23
+buildDir=.build
+qt5AndroidDir=/home/pankraz/Qt/5.8/android_armv7/src/android/java

source-android/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip

source-android/android/local.properties

@@ -0,0 +1 @@
+sdk.dir=/opt/android-sdk

source-android/android/res/values/libs.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
     <array name="qt_sources">
-        <item>https://download.qt-project.org/ministro/android/qt5/qt-5.4</item>
+        <item>https://download.qt.io/ministro/android/qt5/qt-5.8</item>
     </array>
 
     <!-- The following is handled automatically by the deployment tool. It should

source-android/application.qrc

@@ -0,0 +1,200 @@
+<RCC>
+    <qresource prefix="/">
+        <file>qml/friendiqa.qml</file>
+        <file>qml/newsqml/NewsTab.qml</file>
+        <file>qml/newsqml/Newsitem.qml</file>
+        <file>qml/newsqml/MessageSend.qml</file>
+        <file>qml/newsqml/PermissionDialog.qml</file>
+        <file>qml/newsqml/Conversation.qml</file>
+        <file>qml/newsqml/ImageDialog.qml</file>
+        <file>qml/newsqml/FriendicaActivities.qml</file>
+        <file>qml/contactqml/FriendsTab.qml</file>
+        <file>qml/contactqml/GroupComponent.qml</file>
+        <file>qml/contactqml/ContactComponent.qml</file>
+        <file>qml/contactqml/ContactDetailsComponent.qml</file>
+        <file>qml/genericqml/BlueButton.qml</file>
+        <file>qml/photoqml/PhotoComponent.qml</file>
+        <file>qml/photoqml/PhotogroupComponent.qml</file>
+        <file>qml/photoqml/PhotoTab.qml</file>
+        <file>qml/configqml/InfoBox.qml</file>
+        <file>qml/configqml/ConfigTab.qml</file>
+        <file>js/layout.js</file>
+        <file>js/photoworker.js</file>
+        <file>js/service.js</file>
+        <file>js/news.js</file>
+        <file>js/newsworker.js</file>
+        <file>js/helper.js</file>
+        <file>images/defaultcontact.jpg</file>
+        <file>images/fontawesome-webfont.ttf</file>
+        <file>images/folder-blue.png</file>
+        <file>qml/configqml/OSSettingsAndroid.qml</file>
+        <file>qml/configqml/OSSettingsLinux.qml</file>
+        <file>qml/newsqml/SmileyDialog.qml</file>
+        <file>js/smiley.js</file>
+        <file>images/smileys/animals/bee.gif</file>
+        <file>images/smileys/animals/bigspider.gif</file>
+        <file>images/smileys/animals/bunny.gif</file>
+        <file>images/smileys/animals/bunnyflowers.gif</file>
+        <file>images/smileys/animals/cat.gif</file>
+        <file>images/smileys/animals/chick.gif</file>
+        <file>images/smileys/animals/cow.gif</file>
+        <file>images/smileys/animals/crab.gif</file>
+        <file>images/smileys/animals/dog.gif</file>
+        <file>images/smileys/animals/dolphin.gif</file>
+        <file>images/smileys/animals/dragonfly.gif</file>
+        <file>images/smileys/animals/elephant.gif</file>
+        <file>images/smileys/animals/fish.gif</file>
+        <file>images/smileys/animals/frog.gif</file>
+        <file>images/smileys/animals/giraffe.gif</file>
+        <file>images/smileys/animals/hamster.gif</file>
+        <file>images/smileys/animals/horse.gif</file>
+        <file>images/smileys/animals/ladybird.gif</file>
+        <file>images/smileys/animals/monkey.gif</file>
+        <file>images/smileys/animals/parrot.gif</file>
+        <file>images/smileys/animals/pig.gif</file>
+        <file>images/smileys/animals/sheep.gif</file>
+        <file>images/smileys/animals/snail.gif</file>
+        <file>images/smileys/animals/tux.gif</file>
+        <file>images/smileys/babies/baby.gif</file>
+        <file>images/smileys/babies/babycot.gif</file>
+        <file>images/smileys/babies/pregnant.gif</file>
+        <file>images/smileys/babies/stork.gif</file>
+        <file>images/smileys/confused/confused.gif</file>
+        <file>images/smileys/confused/dazed.gif</file>
+        <file>images/smileys/confused/shrug.gif</file>
+        <file>images/smileys/confused/stupid.gif</file>
+        <file>images/smileys/cool/affro.gif</file>
+        <file>images/smileys/cool/cool.gif</file>
+        <file>images/smileys/devilangel/angel.gif</file>
+        <file>images/smileys/devilangel/blondedevil.gif</file>
+        <file>images/smileys/devilangel/catdevil.gif</file>
+        <file>images/smileys/devilangel/cherub.gif</file>
+        <file>images/smileys/devilangel/daseesaw.gif</file>
+        <file>images/smileys/devilangel/devil.gif</file>
+        <file>images/smileys/devilangel/graveside.gif</file>
+        <file>images/smileys/devilangel/saint.gif</file>
+        <file>images/smileys/devilangel/turnevil.gif</file>
+        <file>images/smileys/disgust/fartblush.gif</file>
+        <file>images/smileys/disgust/fartinbed.gif</file>
+        <file>images/smileys/disgust/toilet.gif</file>
+        <file>images/smileys/disgust/vomit.gif</file>
+        <file>images/smileys/drink/tea.gif</file>
+        <file>images/smileys/drool/drool.gif</file>
+        <file>images/smileys/fantasy/alienmonster.gif</file>
+        <file>images/smileys/fantasy/barbarian.gif</file>
+        <file>images/smileys/fantasy/dinosaur.gif</file>
+        <file>images/smileys/fantasy/dragon.gif</file>
+        <file>images/smileys/fantasy/dragonwhelp.gif</file>
+        <file>images/smileys/fantasy/ghost.gif</file>
+        <file>images/smileys/fantasy/mummy.gif</file>
+        <file>images/smileys/fight/2guns.gif</file>
+        <file>images/smileys/fight/acid.gif</file>
+        <file>images/smileys/fight/alienfight.gif</file>
+        <file>images/smileys/fight/alpha.png</file>
+        <file>images/smileys/fight/army.gif</file>
+        <file>images/smileys/fight/arrowhead.gif</file>
+        <file>images/smileys/fight/bfg.gif</file>
+        <file>images/smileys/fight/bowman.gif</file>
+        <file>images/smileys/fight/chainsaw.gif</file>
+        <file>images/smileys/fight/crossbow.gif</file>
+        <file>images/smileys/fight/crusader.gif</file>
+        <file>images/smileys/fight/dead.gif</file>
+        <file>images/smileys/fight/gangs.gif</file>
+        <file>images/smileys/fight/hammersplat.gif</file>
+        <file>images/smileys/fight/lasergun.gif</file>
+        <file>images/smileys/fight/machinegun.gif</file>
+        <file>images/smileys/fight/marine.gif</file>
+        <file>images/smileys/fight/sabre.gif</file>
+        <file>images/smileys/fight/samurai.gif</file>
+        <file>images/smileys/fight/tank.gif</file>
+        <file>images/smileys/fight/viking.gif</file>
+        <file>images/smileys/food/apple.gif</file>
+        <file>images/smileys/food/banana.gif</file>
+        <file>images/smileys/food/birthdaycake.gif</file>
+        <file>images/smileys/food/broccoli.gif</file>
+        <file>images/smileys/food/cake.gif</file>
+        <file>images/smileys/food/carrot.gif</file>
+        <file>images/smileys/food/cooking.gif</file>
+        <file>images/smileys/food/fryegg.gif</file>
+        <file>images/smileys/food/popcorn.gif</file>
+        <file>images/smileys/food/tomato.gif</file>
+        <file>images/smileys/happy/cloud9.gif</file>
+        <file>images/smileys/happy/tearsofjoy.gif</file>
+        <file>images/smileys/laugh/hahaha.gif</file>
+        <file>images/smileys/laugh/loltv.gif</file>
+        <file>images/smileys/laugh/rofl.gif</file>
+        <file>images/smileys/love/iloveyou.gif</file>
+        <file>images/smileys/love/inlove.gif</file>
+        <file>images/smileys/love/love.gif</file>
+        <file>images/smileys/love/lovebear.gif</file>
+        <file>images/smileys/love/lovebed.gif</file>
+        <file>images/smileys/love/loveheart.gif</file>
+        <file>images/smileys/music/dj.gif</file>
+        <file>images/smileys/music/drums.gif</file>
+        <file>images/smileys/music/elvis.gif</file>
+        <file>images/smileys/music/guitar.gif</file>
+        <file>images/smileys/music/trumpet.gif</file>
+        <file>images/smileys/music/violin.gif</file>
+        <file>images/smileys/oldcore/beard.png</file>
+        <file>images/smileys/oldcore/headbang.gif</file>
+        <file>images/smileys/oldcore/laughing.gif</file>
+        <file>images/smileys/oldcore/shaka.gif</file>
+        <file>images/smileys/oldcore/surprised.gif</file>
+        <file>images/smileys/oldcore/whitebeard.png</file>
+        <file>images/smileys/respect/bow.gif</file>
+        <file>images/smileys/respect/bravo.gif</file>
+        <file>images/smileys/respect/hailking.gif</file>
+        <file>images/smileys/respect/number1.gif</file>
+        <file>images/smileys/sad/crying.png</file>
+        <file>images/smileys/sad/prisoner.gif</file>
+        <file>images/smileys/sad/sigh.gif</file>
+        <file>images/smileys/smoking/smoking.gif</file>
+        <file>images/smileys/sport/archery.gif</file>
+        <file>images/smileys/sport/basketball.gif</file>
+        <file>images/smileys/sport/bowling.gif</file>
+        <file>images/smileys/sport/cycling.gif</file>
+        <file>images/smileys/sport/darts.gif</file>
+        <file>images/smileys/sport/fencing.gif</file>
+        <file>images/smileys/sport/football.gif</file>
+        <file>images/smileys/sport/golf.gif</file>
+        <file>images/smileys/sport/horseriding.gif</file>
+        <file>images/smileys/sport/juggling.gif</file>
+        <file>images/smileys/sport/skipping.gif</file>
+        <file>images/smileys/sport/snooker.gif</file>
+        <file>images/smileys/sport/surfing.gif</file>
+        <file>images/smileys/sport/tennis.gif</file>
+        <file>images/smileys/tired/countsheep.gif</file>
+        <file>images/smileys/tired/hammock.gif</file>
+        <file>images/smileys/tired/pillow.gif</file>
+        <file>images/smileys/tired/yawn.gif</file>
+        <file>images/smileys/core/beer_mug.gif</file>
+        <file>images/smileys/core/coffee.gif</file>
+        <file>images/smileys/core/dislike.gif</file>
+        <file>images/smileys/core/friendica-16.png</file>
+        <file>images/smileys/core/like.gif</file>
+        <file>images/smileys/core/rm-16.png</file>
+        <file>images/smileys/core/smiley-bangheaddesk.gif</file>
+        <file>images/smileys/core/smiley-brokenheart.gif</file>
+        <file>images/smileys/core/smiley-cool.gif</file>
+        <file>images/smileys/core/smiley-cry.gif</file>
+        <file>images/smileys/core/smiley-embarassed.gif</file>
+        <file>images/smileys/core/smiley-facepalm.gif</file>
+        <file>images/smileys/core/smiley-foot-in-mouth.gif</file>
+        <file>images/smileys/core/smiley-heart.gif</file>
+        <file>images/smileys/core/smiley-kiss.gif</file>
+        <file>images/smileys/core/smiley-laughing.gif</file>
+        <file>images/smileys/core/smiley-Oo.gif</file>
+        <file>images/smileys/core/smiley-smile.gif</file>
+        <file>images/smileys/core/smiley-surprised.gif</file>
+        <file>images/smileys/core/smiley-thumbsup.gif</file>
+        <file>images/smileys/core/smiley-tongue-out.gif</file>
+        <file>images/smileys/core/smiley-undecided.gif</file>
+        <file>images/smileys/core/smiley-wink.gif</file>
+        <file>images/smileys/core/smiley-frown.gif</file>
+        <file>images/smileys/adult/bong.gif</file>
+        <file>images/smileys/adult/drunk.gif</file>
+        <file>images/smileys/adult/finger.gif</file>
+        <file>images/smileys/adult/sperm.gif</file>
+        <file>images/smileys/adult/tits.gif</file>
+    </qresource>
+</RCC>

source-android/common/filesystem.cpp

@@ -0,0 +1,81 @@
+#include "filesystem.h"
+
+FILESYSTEM *FILESYSTEM::instance()
+{
+    static FILESYSTEM filesystem;
+    return &filesystem;
+}
+
+FILESYSTEM::FILESYSTEM(QObject *parent) : QObject(parent){}
+
+void FILESYSTEM::setDirectory(QString Directory)
+{
+   if (Directory!=m_Directory) {
+       m_Directory = Directory;
+       emit directoryChanged();
+   }
+}
+
+QString FILESYSTEM::Directory() const
+{
+    return m_Directory;
+}
+
+QString FILESYSTEM::homePath() const
+{
+    QDir dir(m_Directory);
+    QString homeDir=dir.homePath();
+    //qDebug(homeDir);
+    return homeDir;
+}
+
+QString FILESYSTEM::cameraPath() const
+{
+QAndroidJniObject object = QAndroidJniObject::getStaticObjectField<jstring>("android.os.Environment", "DIRECTORY_DCIM");
+QAndroidJniObject dcim =QAndroidJniObject::callStaticObjectMethod("android.os.Environment","getExternalStoragePublicDirectory", "(Ljava/lang/String;)Ljava/io/File;", object.object<jobject>());
+ return dcim.toString();
+}
+
+
+//bool FILESYSTEM::direxist(QString Directory) const
+//{QDir dir(Directory);
+// return dir.exists();
+//}
+
+void FILESYSTEM::makeDir(QString name)
+{
+    QDir dir(m_Directory);
+    if (dir.mkdir(name)){
+        emit success(name);
+    }
+    else {emit error(name,1);}
+}
+
+void FILESYSTEM::rmDir()
+{
+    QDir dir(m_Directory);
+   if (dir.removeRecursively()){
+    emit success(m_Directory);
+    }
+    else {emit error(m_Directory,1);}
+}
+
+void FILESYSTEM::rmFile(QString name)
+{
+    QDir dir(m_Directory);
+    if(dir.remove(name)){
+    emit success(name);
+    }
+    else {emit error(name,1);}
+}
+QFileInfoList FILESYSTEM::fileList()
+{
+    QDir dir(m_Directory);
+    QStringList filters;
+    filters << "*.png" <<"*.PNG" << "*.jpg" << "*.JPG" << "*.JPEG";
+    dir.setNameFilters(filters);
+    dir.setSorting(QDir::Time | QDir::Reversed);
+    //QStringList m_Filelist=dir.entryInfoList();
+    //qDebug() << "filelist " << m_Filelist;
+    return dir.entryInfoList();
+}

source-android/common/filesystem.h

@@ -3,20 +3,30 @@
 
 #include <QDir>
 #include <QObject>
+#include <QtAndroidExtras>
 
 class FILESYSTEM : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString Directory READ Directory WRITE setDirectory NOTIFY directoryChanged)
-    
+    //Q_PROPERTY(bool direxist READ direxist)
+    Q_PROPERTY(QString homePath READ homePath)
+    Q_PROPERTY(QString cameraPath READ cameraPath)
+
+
 public:
     static FILESYSTEM *instance();
     explicit FILESYSTEM(QObject *parent = 0);
     void setDirectory(QString Directory);
     QString Directory() const;
+    QFileInfoList fileList();
+    //bool direxist(QString Directory);
+    QString homePath() const;
+    QString cameraPath() const;
 
 signals:
     void directoryChanged();
+    //void fileListContent(QList data);
     void success(QString data);
     void error(QString data, int code);
 
@@ -24,9 +34,12 @@ public slots:
     void makeDir(QString name);
     void rmDir();
     void rmFile(QString name);
-    
+    //void fileList();
+
 private:
     QString m_Directory;
+    QString homeDir;
+    //QList m_Filelist;
 };
 
 #endif // FILSYSTEM_H

source-android/common/xhr.cpp

@@ -175,6 +175,7 @@ void XHR::onReplyError(QNetworkReply::NetworkError code)
 {
     qDebug() << code;
     emit this->error( bufferToString(), (int) code);
+    buffer.clear();
     reply->deleteLater();
 }
 
@@ -182,6 +183,7 @@ void XHR::onReplySuccess()
 {
     qDebug() << "!";
     emit this->success( bufferToString() );
+    buffer.clear();
     reply->deleteLater();
 }
 

source-android/friendiqa.pro

@@ -12,7 +12,7 @@
 # The name of your application
 TARGET = friendiqa
 CONFIG += debug
-QT += qml quick gui widgets
+QT += qml quick gui widgets androidextras
 
 SOURCES += common/friendiqa.cpp \
 	common/uploadableimage.cpp \