@@ -88,8 +88,10 @@ export default {
}
},
handleScroll (event) {
+ console.log(event)
- if(event.target.scrollTop==0){
+ if(event.target.scrollTop<50){
+ console.log("load more messages")
this.$store.dispatch("getMoreMessages");
}
// Any code to be executed when the window is scrolled
@@ -110,11 +112,7 @@ export default {
back(){
this.$router.go(-1)
},scrollDown(){
- if(!this.scrolled){
- var objDiv = document.getElementById("messageList");
- objDiv.scrollTop = objDiv.scrollHeight;
- this.scrolled=true;
- }
+ window.scrollTo(0,document.body.scrollHeight);
}
},
@@ -124,7 +122,15 @@ export default {
mounted(){
this.$store.dispatch("getMessageList", this.getId());
setTimeout(this.scrollDown
- , 500)
+ , 800)
+ document.addEventListener("scroll", (e) => {
+ var scrolled = document.scrollingElement.scrollTop;
+ console.log(scrolled)
+ if(scrolled==0){
+ console.log("load more messages")
+ this.$store.dispatch("getMoreMessages");
+ }
+ });
},
computed: {
messages () {
@@ -140,7 +146,6 @@ export default {
text-align: left;
}
.chatList{
- height:calc(100vh - 200px);
overflow: hidden auto;
-ms-overflow-style: none;
scrollbar-width: none;
@@ -160,7 +165,7 @@ export default {
scrollbar-width: none;
}
.chatList > div:last-child {
- padding-bottom: 50px;
+ padding-bottom: 100px;
}
.avatar {
justify-content: center;
diff --git a/click/manifest.json b/click/manifest.json
index 6126a02d0..c1681ecf1 100644
--- a/click/manifest.json
+++ b/click/manifest.json
@@ -1,6 +1,6 @@
{
"name": "textsecure.nanuc",
- "version": "0.5.0",
+ "version": "0.6.0",
"description": "A Signal compatible messaging client for Ubuntu phones",
"title": "Signal",
"architecture": "armhf",
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 427d5054f..3432c2151 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,3 +1,12 @@
+0.6.0 (Sept 14 2019) Axolotl-Alpha
+--------------------
+* remove go-qml bindings
+* new ux
+* display attachments inline
+* know bugs because of the complete rewrite of the client:
+** no group creation, no notification config, no content hub integration(no contact import, no saving)
+** no support of encrypted db
+
0.4.5 (Aug 31 2019)
--------------------
* import a singel contact thats not in the contact Book
diff --git a/qml/ut/MainUt.qml b/qml/ut/MainUt.qml
index 86129fc73..1f12ac940 100644
--- a/qml/ut/MainUt.qml
+++ b/qml/ut/MainUt.qml
@@ -14,25 +14,25 @@ UITK.Page {
property QtObject requestTest
property QtObject wsClient
id: root
- WebSocketServer {
- id: server
- listen: true
- port: 12345
-
- onClientConnected: {
- console.log('BlobSaver: websocket server connected');
- wsClient = webSocket
- webSocket.onTextMessageReceived.connect(function(base64data) {
- console.log('base64data');
- var path = BlobSaver.write(base64data);
- fileDownloaded(path);
- });
- }
-
- onErrorStringChanged: {
- console.log('BlobSaver: websocket server error', errorString);
- }
- }
+ // WebSocketServer {
+ // id: server
+ // listen: true
+ // port: 12345
+ //
+ // onClientConnected: {
+ // console.log('BlobSaver: websocket server connected');
+ // wsClient = webSocket
+ // webSocket.onTextMessageReceived.connect(function(base64data) {
+ // console.log('base64data');
+ // var path = BlobSaver.write(base64data);
+ // fileDownloaded(path);
+ // });
+ // }
+ //
+ // onErrorStringChanged: {
+ // console.log('BlobSaver: websocket server error', errorString);
+ // }
+ // }
WebEngineView {
id: webView
profile:webProfile