Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #223

Merged
merged 5 commits into from
Apr 28, 2024
Merged

Dev #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3682cb0
Update Volla_nl.ts for the SttSetup
ruditimmermans Apr 28, 2024
440ac65
Merge pull request #222 from ruditimmermans/dev
wurzer Apr 28, 2024
105b44f
Fix for notification badge
wurzer Apr 28, 2024
48cb2a5
Merge branch 'dev' of github.com:HelloVolla/android-launcher-qt into dev
wurzer Apr 28, 2024
76ba9b9
Update release version
wurzer Apr 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Collections.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,7 +917,7 @@ LauncherPage {
kind = "Signal"
}

cThread.c_SBADGE = thread["read"] === "true" ? false : true
cThread.c_SBADGE = thread["read"] === true ? false : true
cThread.c_STEXT = mainView.parseTime(Number(thread["date"])) + " • " + qsTr(kind)
cThread.c_TSTAMP = Number(thread["date"])

Expand Down Expand Up @@ -1409,6 +1409,7 @@ LauncherPage {
|| currentCollectionMode === mainView.collectionMode.Threads) {
message["messages"].forEach(function (aThread, index) {
aThread["isSignal"] = true
aThread["read"] = true // workaround for allways false negative
// for (const [aThreadKey, aThreadValue] of Object.entries(aThread)) {
// console.log("Collections | * " + aThreadKey + ": " + aThreadValue)
// }
Expand Down
6 changes: 3 additions & 3 deletions Conversation.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,9 +872,9 @@ LauncherPage {
message["messages"].forEach(function (signalMessage, index) {
signalMessage["isSignal"] = true
previousMessage = signalMessage
for (const [messageKey, messageValue] of Object.entries(signalMessage)) {
console.log("Conversation | * " + messageKey + ": \"" + messageValue + "\": " + typeof messageValue)
}
// for (const [messageKey, messageValue] of Object.entries(signalMessage)) {
// console.log("Conversation | * " + messageKey + ": \"" + messageValue + "\": " + typeof messageValue)
// }
})
conversationPage.messages = conversationPage.messages.concat(message["messages"])
conversationPage.updateListModel()
Expand Down
2 changes: 1 addition & 1 deletion android/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<manifest package="com.volla.launcher" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.4.0" android:versionCode="297" android:installLocation="auto">
<manifest package="com.volla.launcher" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.4.1" android:versionCode="298" android:installLocation="auto">
<uses-sdk android:minSdkVersion="28" android:targetSdkVersion="29"/>

<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
Expand Down
2 changes: 1 addition & 1 deletion translations/Volla_nl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,7 @@
<message>
<location filename="../SttSetup.qml" line="55"/>
<source>Now set up voice recognition for text input, which you can then activate using the microphone icon on the keyboard.</source>
<translation type="unfinished">Stel nu spraakherkenning in voor tekstinvoer, die je vervolgens kunt activeren via het microfoonsymbool op het toetsenbord.</translation>
<translation>Stel nu spraakherkenning in voor tekstinvoer, die je vervolgens kunt activeren via het microfoonsymbool op het toetsenbord.</translation>
</message>
</context>
<context>
Expand Down