lubuwest
/
Friendiqa
1
2
Fork 1
Code Issues 9 Pull Requests Releases 19 Wiki Activity

version v0.6 bugfixes

This commit is contained in:
LubuWest 2021-05-18 21:01:32 +02:00
parent 8482bde3ed
commit 8b58785517
13 changed files with 36 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source-android/android/gradle.properties
View File

@ -1,4 +1,7 @@
# androidBuildToolsVersion=25.0.3
# androidCompileSdkVersion=26
buildDir=.build buildDir=.build
# qt5AndroidDir=/home/pankraz/Qt/5.11.1/android_armv7/src/android/java
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
android.enforceUniquePackageName=false android.enforceUniquePackageName=false

4
source-android/qml/friendiqa.qml
View File

@ -256,8 +256,8 @@ ApplicationWindow{
Loader{ Loader{
id: newstab id: newstab
Layout.fillWidth:true // Layout.fillWidth:true
Layout.fillHeight: true // Layout.fillHeight: true
property string newstabstatus property string newstabstatus
property var conversation:[] property var conversation:[]

2
source-linux/application.qrc
View File

@ -247,5 +247,7 @@
<file>qml/contactqml/ContactsListTab.qml</file> <file>qml/contactqml/ContactsListTab.qml</file>
<file>qml/contactqml/GroupsListTab.qml</file> <file>qml/contactqml/GroupsListTab.qml</file>
<file>qml/calendarqml/EventListItem.qml</file> <file>qml/calendarqml/EventListItem.qml</file>
<file>translations/friendiqa-hu.qm</file>
<file>translations/friendiqa-hu.ts</file>
</qresource> </qresource>
</RCC> </RCC>

12
source-linux/common/updatenews.cpp
View File

@ -135,7 +135,7 @@ void UPDATENEWS::login()
} }
void UPDATENEWS::startsync() void UPDATENEWS::startsync()
{ qDebug()<<"Friendiqa start syncing "<<syncindex <<" of "<<synclist.length(); { qDebug()<<"Friendiqa start syncing "<<syncindex <<" of "<<synclist.length(); //<< "Type "<<synclist[syncindex];
//QObject::connect(&xhr,SIGNAL(success(QByteArray,QString)),this,SLOT(store(QByteArray,QString))); //QObject::connect(&xhr,SIGNAL(success(QByteArray,QString)),this,SLOT(store(QByteArray,QString)));
//QObject::connect(&xhr,SIGNAL(error(QString,QString,QString,int)),this,SLOT(showError(QString,QString,QString,int))); //QObject::connect(&xhr,SIGNAL(error(QString,QString,QString,int)),this,SLOT(showError(QString,QString,QString,int)));
if (syncindex<synclist.length()){ if (syncindex<synclist.length()){
@ -351,6 +351,7 @@ void UPDATENEWS::store(QByteArray serverreply,QString apiname)
if (apiname == "/api/direct_messages/all"){ if (apiname == "/api/direct_messages/all"){
query.bindValue(1,"1"); query.bindValue(1,"1");
query.bindValue(5,"Friendica"); query.bindValue(5,"Friendica");
query.bindValue(6,newsitem["id"].toString().toInt());
if(newsitem["recipient"]["id"]!=QJsonValue::Null){ query.bindValue(7,newsitem["recipient"]["id"].toInt());} if(newsitem["recipient"]["id"]!=QJsonValue::Null){ query.bindValue(7,newsitem["recipient"]["id"].toInt());}
query.bindValue(10, newsitem["sender_id"].toInt()); query.bindValue(10, newsitem["sender_id"].toInt());
query.bindValue(11, newsitem["text"].toString().toUtf8().toBase64()); query.bindValue(11, newsitem["text"].toString().toUtf8().toBase64());
@ -431,7 +432,6 @@ void UPDATENEWS::updateImageLocation(QString downloadtype,QString imageurl, QStr
newcontactnames.clear(); newcontactnames.clear();
newcontactimagelinks.clear(); newcontactimagelinks.clear();
if(m_updateInterval!=0){ if(m_updateInterval!=0){
qDebug()<< "contactdownload finished!";
syncindex+=1; syncindex+=1;
startsync(); startsync();
} }
@ -446,7 +446,6 @@ void UPDATENEWS::updateImageLocation(QString downloadtype,QString imageurl, QStr
newcontactnames.clear(); newcontactnames.clear();
newcontactimagelinks.clear(); newcontactimagelinks.clear();
if(m_updateInterval!=0){ if(m_updateInterval!=0){
qDebug()<< "friendrequests finished!";
syncindex+=1; syncindex+=1;
startsync(); startsync();
} }
@ -714,8 +713,13 @@ void UPDATENEWS::storeFriendrequests(QByteArray serverreply,QString apiname)
} }
if (newcontactimagelinks.length()>0){ if (newcontactimagelinks.length()>0){
qDebug() << "start Friendrequests imagedownload"; //qDebug() << "start Friendrequests imagedownload";
startImagedownload("friendrequests"); startImagedownload("friendrequests");
}else{
if(m_updateInterval!=0){
syncindex+=1;
startsync();
}
} }
} }
} }

4
source-linux/js/newsworker.js
View File

@ -72,11 +72,13 @@ function beautify(newsitemobject,msg){
else if (attachArray[image].mimetype=="image/png"){attachhelper.url=attachhelper.url+".png"} else if (attachArray[image].mimetype=="image/png"){attachhelper.url=attachhelper.url+".png"}
} }
else {attachhelper.url=attachArray[image].url} else {attachhelper.url=attachArray[image].url}
imageAttachmentList.push(attachhelper)
//print("Attachhelper "+attachhelper.url) //print("Attachhelper "+attachhelper.url)
newsitemobject.statusnet_html=newsitemobject.statusnet_html.replace(attachhelper.url,"") newsitemobject.statusnet_html=newsitemobject.statusnet_html.replace(attachhelper.url,"")
newsitemobject.statusnet_html=newsitemobject.statusnet_html.replace(attachhelper.url.substring(0,attachhelper.url.length-4)+".jpeg","") newsitemobject.statusnet_html=newsitemobject.statusnet_html.replace(attachhelper.url.substring(0,attachhelper.url.length-4)+".jpeg","")
newsitemobject.statusnet_html=newsitemobject.statusnet_html.replace(attachhelper.url.substring(0,attachhelper.url.length-4),"") newsitemobject.statusnet_html=newsitemobject.statusnet_html.replace(attachhelper.url.substring(0,attachhelper.url.length-4),"")
imageAttachmentList.push(attachhelper)
} }
} }
}catch(e){print("attachment "+e)} }catch(e){print("attachment "+e)}

8
source-linux/qml/configqml/LeftDrawerScrollview.qml
View File

@ -92,20 +92,20 @@ ScrollView{
Component.onCompleted:{ Component.onCompleted:{
Service.readAllLogins(db,function(accounts){ Service.readAllLogins(db,function(accounts){
if (accounts.length>0 && bar.currentIndex==0){ if (accounts.length>0 && bar.currentIndex==0){
leftDrawerColumn.height=4.5*root.fontFactor*osSettings.bigFontSize+accounts.length*13*root.fontFactor*osSettings.bigFontSize leftDrawerColumn.height=4.5*root.fontFactor*osSettings.bigFontSize+accounts.length*17*root.fontFactor*osSettings.bigFontSize
for(var i = 0; i < accounts.length; i++) { for(var i = 0; i < accounts.length; i++) {
var accountComponent = Qt.createComponent("qrc:/qml/genericqml/DrawerAccountComponent.qml"); var accountComponent = Qt.createComponent("qrc:/qml/genericqml/DrawerAccountComponent.qml");
var accountQml = accountComponent.createObject(leftDrawerColumn,{ var accountQml = accountComponent.createObject(leftDrawerColumn,{
"y":4.5*root.fontFactor*osSettings.bigFontSize+i*13*root.fontFactor*osSettings.bigFontSize, "y":4.5*root.fontFactor*osSettings.bigFontSize+i*17*root.fontFactor*osSettings.bigFontSize,
"currentnewstabstatus":currentnewstabstatus, "currentnewstabstatus":currentnewstabstatus,
"account":accounts[i]}); "account":accounts[i]});
} }
}else if(accounts.length>0 && bar.currentIndex==1){ }else if(accounts.length>0 && bar.currentIndex==1){
leftDrawerColumn.height=4.5*root.fontFactor*osSettings.bigFontSize+accounts.length*6.5*root.fontFactor*osSettings.bigFontSize leftDrawerColumn.height=4.5*root.fontFactor*osSettings.bigFontSize+accounts.length*8*root.fontFactor*osSettings.bigFontSize
for(var i = 0; i < accounts.length; i++) { for(var i = 0; i < accounts.length; i++) {
var accountComponent = Qt.createComponent("qrc:/qml/genericqml/DrawerAccountComponentContacts.qml"); var accountComponent = Qt.createComponent("qrc:/qml/genericqml/DrawerAccountComponentContacts.qml");
var accountQml = accountComponent.createObject(leftDrawerColumn,{ var accountQml = accountComponent.createObject(leftDrawerColumn,{
"y":4.5*root.fontFactor*osSettings.bigFontSize+i*6.5*root.fontFactor*osSettings.bigFontSize, "y":4.5*root.fontFactor*osSettings.bigFontSize+i*8*root.fontFactor*osSettings.bigFontSize,
"account":accounts[i]}); "account":accounts[i]});
} }
} }

2
source-linux/qml/genericqml/ContactComponent.qml
View File

@ -35,7 +35,7 @@ import "qrc:/qml/genericqml"
Item { Item {
id: contactComponent id: contactComponent
height: 5*root.fontFactor*osSettings.systemFontSize//8*mm height: 4.5*root.fontFactor*osSettings.systemFontSize//8*mm
width: contactComponent.ListView.view.width//parent.width width: contactComponent.ListView.view.width//parent.width
property var createdAtDate: new Date(contact.created_at) property var createdAtDate: new Date(contact.created_at)
property string connectUrl: (contact.network!=="dfrn")||(contact.isFriend==1)?"":( "<a href='"+contact.url.replace("profile","dfrn_request") +"'>"+qsTr("Connect")+"</a><br>") property string connectUrl: (contact.network!=="dfrn")||(contact.isFriend==1)?"":( "<a href='"+contact.url.replace("profile","dfrn_request") +"'>"+qsTr("Connect")+"</a><br>")

10
source-linux/qml/newsqml/MessageSend.qml
View File

@ -132,12 +132,12 @@ Rectangle{
//print("Newsobject "+newsitemobject.id+ " "+JSON.stringify(newsitemobject.user)); //print("Newsobject "+newsitemobject.id+ " "+JSON.stringify(newsitemobject.user));
if (newsitemobject!=""){ if (newsitemobject!=""){
messageSend.state="conversation" messageSend.state="conversation"
reply_to_user=newsitemobject.user.screen_name; messageSend.reply_to_user=newsitemobject.user.screen_name;
parentId=newsitemobject.id messageSend.parentId=newsitemobject.id
} else { } else {
messageSend.state=null; //messageSend.state=null;
reply_to_user=""; messageSend.reply_to_user="";
parentId=""; messageSend.parentId="";
bodyField.text=""; bodyField.text="";
attachImageURLs.pop(); attachImageURLs.pop();
imageAttachment.source="" imageAttachment.source=""

2
source-linux/qml/newsqml/NewsImage.qml
View File

@ -34,7 +34,7 @@ AnimatedImage {id:gif;
width:toprow.width; width:toprow.width;
//property string mimetype:"" //property string mimetype:""
fillMode: Image.PreserveAspectFit; fillMode: Image.PreserveAspectFit;
onStatusChanged: playing = (status == AnimatedImage.Ready) onStatusChanged: {playing = (status == AnimatedImage.Ready)}
Rectangle{ Rectangle{
visible: (model.newsitemobject.imageAttachmentList.length>1)&&(gif.status==Image.Ready) visible: (model.newsitemobject.imageAttachmentList.length>1)&&(gif.status==Image.Ready)
opacity: 0.5 opacity: 0.5

56
source-linux/qml/newsqml/NewsTab.qml
View File

@ -39,11 +39,9 @@ import "qrc:/js/service.js" as Service
Rectangle{ Rectangle{
id:newstabitem id:newstabitem
width:rootstack.width//-5*mm width:rootstack.width
height: rootstack.height-8*mm//rootstack.height-100*mm height: rootstack.height-8*mm
//anchors.fill: parent
//onHeightChanged: {newsSwipeview.height=height-5*mm}
Timer {id:contacttimer; interval: 50; running: false; repeat: false Timer {id:contacttimer; interval: 50; running: false; repeat: false
onTriggered: { onTriggered: {
root.newContacts=Newsjs.findNewContacts(root.news,root.contactlist); root.newContacts=Newsjs.findNewContacts(root.news,root.contactlist);
@ -155,63 +153,15 @@ Rectangle{
LeftDrawerAndroid{ LeftDrawerAndroid{
id: leftDrawerAndroid id: leftDrawerAndroid
} }
// BlueButton{
// z:2
// anchors.left: newsSwipeview.left
// anchors.verticalCenter: newsSwipeview.verticalCenter//anchors.bottom: newsSwipeview.bottom
// anchors.margins: mm
// visible: wideScreen && newsSwipeview.currentIndex!=0
// text:"\uf053"
// fontColor:"grey"
// border.color: "transparent"
// color:"transparent"
// radius:0
// onClicked: {newsSwipeview.currentIndex=newsSwipeview.currentIndex-1}
// }
// BlueButton{
// z:2
// anchors.right: newsSwipeview.right
// anchors.verticalCenter: newsSwipeview.verticalCenter//anchors.bottom: newsSwipeview.bottom
// anchors.margins: mm
// visible: wideScreen && newsSwipeview.currentIndex!=3
// text:"\uf054"
// fontColor:"grey"
// border.color: "transparent"
// color:"transparent"
// radius:0
// onClicked: {newsSwipeview.currentIndex=newsSwipeview.currentIndex+1}
// }
SwipeView{ SwipeView{
id: newsSwipeview id: newsSwipeview
property string stacktype:"Home" property string stacktype:"Home"
currentIndex: 0 currentIndex: 0
width: wideScreen&&rootstackView.depth<2?newstabitem.width-leftDrawer.width-mm:newstabitem.width-mm//newstabitem.width/3*2:newstabitem.width 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-4*mm
x: leftDrawer.width x: leftDrawer.width
function onDirectMessage(friend){currentIndex=2} function onDirectMessage(friend){currentIndex=2}
// transitions: Transition {
// PropertyAnimation { properties: "height";
// easing.type: Easing.InOutQuad
// duration: 1000
// }
// }
// Label{
// text:"\uf0c9 "
// font.pixelSize: 5* mm
// anchors.left: parent.left
// anchors.margins: mm
// color: "#B0BEC5"
// MouseArea{
// anchors.fill: parent
// onClicked:{
// leftDrawer.open()
// }
// }
// }
onCurrentIndexChanged: { onCurrentIndexChanged: {
switch(currentIndex){ switch(currentIndex){

2
source-linux/qml/newsqml/Newsitem.qml
View File

@ -74,7 +74,7 @@ Item {
id:toprow //newscolumn id:toprow //newscolumn
width: newsitemobject.hasOwnProperty("indent")?newsitem.width-(newsitem.width/20 *(newsitemobject.indent+1)):newsitem.width//-8*mm width: newsitemobject.hasOwnProperty("indent")?newsitem.width-(newsitem.width/20 *(newsitemobject.indent+1)):newsitem.width//-8*mm
x:newsitemobject.hasOwnProperty("indent")?newsitem.width/20*(newsitemobject.indent):0 x:newsitemobject.hasOwnProperty("indent")?newsitem.width/20*(newsitemobject.indent):0
height: newsitemobject.nsfw?5*mm:Math.min(itemHeader.height+itemBody.height,3/4*root.height) height: newsitemobject.nsfw?5*mm:Math.min(implicitHeight,3/4*root.height)
clip: true clip: true
Item{id:itemHeader Item{id:itemHeader
height: Math.max(profileImage.height+mm,topFlow.implicitHeight+mm) height: Math.max(profileImage.height+mm,topFlow.implicitHeight+mm)

BIN
source-linux/translations/friendiqa-hu.qm
View File

Binary file not shown.

6
source-linux/translations/friendiqa-hu.ts
View File

@ -396,7 +396,7 @@
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="220"/> <location filename="../qml/newsqml/ContactPage.qml" line="220"/>
<source>Approve</source> <source>Approve</source>
<translation>Jóváhagyja</translation> <translation>Jóváhagyás</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="235"/> <location filename="../qml/newsqml/ContactPage.qml" line="235"/>
@ -406,7 +406,7 @@
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="249"/> <location filename="../qml/newsqml/ContactPage.qml" line="249"/>
<source>Ignore</source> <source>Ignore</source>
<translation>Ne törődj a</translation> <translation>Mellőzés</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="285"/> <location filename="../qml/newsqml/ContactPage.qml" line="285"/>
@ -754,7 +754,7 @@
<message> <message>
<location filename="../qml/newsqml/MessageSend.qml" line="236"/> <location filename="../qml/newsqml/MessageSend.qml" line="236"/>
<source> Drop your Content here.</source> <source> Drop your Content here.</source>
<translation> Tegye le itt a Tartalmát.</translation> <translation> Ejtse ide a tartalmat.</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/MessageSend.qml" line="242"/> <location filename="../qml/newsqml/MessageSend.qml" line="242"/>