Merge pull request #191 from HelloVolla/dev

Dev
HelloVolla · Nov 5, 2023 · 1172d9a · 1172d9a
2 parents 6b37add + 2bef1b0
commit 1172d9a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 20 deletions.
diff --git a/Collections.qml b/Collections.qml
@@ -129,7 +129,8 @@ LauncherPage {
         AN.SystemDispatcher.dispatch("volla.launcher.threadAction", filter)
         // load threads from further source
         // address (phone or contact), body (message), date, type
-        if (mainView.isSignalActive) AN.SystemDispatcher.dispatch("volla.launcher.signalThreadsAction", filter)
+        console.debug("Collections | Signal is active: " + mainView.isSignalActive)
+        if (mainView.isActiveSignal) AN.SystemDispatcher.dispatch("volla.launcher.signalThreadsAction", filter)
     }
 
     function loadCalls(filter) {

diff --git a/Details.qml b/Details.qml
@@ -227,13 +227,9 @@ LauncherPage {
                                .replace(/<p>(- .*)<\/p>/gim, '<p style=\"margin-left:12px;text-indent:-12px;\">$1</p>') // unsorted list
                                .replace(/<p>([0-9]+\. .*)<\/p>/gim, '<p style=\"margin-left:20px;text-indent:-20px;\">$1</p>') // ordered list
                                .replace(/^(<p>\s*<\/p>\n)/gim, '')
-                               //.replace(/^(<p><\/p><p><\/p>$)/gim, '<p>&#8203;</p>')
-                               //.replace(/^($)/gim, '')
-                               //.replace(/\n/gim, '')
-                               //.trim()
 
         if (detailEdit.editMode) {
-            styledText.replace(/^(<p><\/p><p><\/p>$)/gim, '<p>&#8203;</p>')
+            styledText = styledText.replace(/^(<p><\/p><p><\/p>$)/gim, '<p>&#8203;</p>')
         }
 
 //        console.debug("----------------")

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
@@ -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.2.19" android:versionCode="289" android:installLocation="auto">
+<manifest package="com.volla.launcher" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.2.20" android:versionCode="290" 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.

diff --git a/translations/Volla_nl.ts b/translations/Volla_nl.ts
@@ -99,62 +99,67 @@
     <message>
         <location filename="../AppGrid.qml" line="381"/>
         <source>Open App</source>
-        <translation>Open app</translation>
+        <translation>Applicatie Openen</translation>
     </message>
     <message>
         <location filename="../AppGrid.qml" line="381"/>
         <source>Open Shortcut</source>
-        <translation type="unfinished">Snelkoppeling openen</translation>
+        <translation>Snelkoppeling openen</translation>
     </message>
     <message>
         <location filename="../AppGrid.qml" line="414"/>
         <source>Remove Bookmark</source>
-        <translation type="unfinished">Bladwijzer verwijderen</translation>
+        <translation>Bladwijzer verwijderen</translation>
     </message>
     <message>
         <source>Remove Shortcut</source>
-        <translation type="obsolete">Snelkoppeling verwijderen</translation>
+        <translation>Snelkoppeling verwijderen</translation>
     </message>
+    <message>
+        <location filename="AppGrid.qml" line="430"/>
+        <source>Remove App</source>
+        <translation>Applicatie Verwijderen</translation>
+    </message>    
     <message>
         <location filename="../AppGrid.qml" line="516"/>
         <source>New pinned shortcut</source>
-        <translation type="unfinished">Nuova scorciatoia appuntata</translation>
+        <translation>Nieuwe vastgezette snelkoppeling</translation>
     </message>
     <message>
         <location filename="../AppGrid.qml" line="523"/>
         <source>Pinned shortcut already exists</source>
-        <translation type="unfinished">Il collegamento appuntato esiste già</translation>
+        <translation>De vastgezette link bestaat al</translation>
     </message>
 </context>
 <context>
     <name>Browser</name>
     <message>
         <source>Show Dialer</source>
-        <translation type="vanished">Toon telefoon</translation>
+        <translation>Toon telefoon</translation>
     </message>
     <message>
         <source>Open Camera</source>
-        <translation type="vanished">Open camera</translation>
+        <translation>Open camera</translation>
     </message>
     <message>
         <source>Agenda</source>
-        <translation type="vanished">Agenda</translation>
+        <translation>Agenda</translation>
     </message>
     <message>
         <source>Gallery</source>
-        <translation type="vanished">Galerij</translation>
+        <translation>Galerij</translation>
     </message>
     <message>
         <source>Recent News</source>
-        <translation type="vanished">Laatste nieuws</translation>
+        <translation>Laatste nieuws</translation>
     </message>
     <message>
         <source>Recent Threads</source>
-        <translation type="vanished">Laatste gesprekken</translation>
+        <translation>Laatste gesprekken</translation>
     </message>
     <message>
         <source>Recent People</source>
-        <translation type="vanished">Laatste contactpersonen</translation>
+        <translation>Laatste contactpersonen</translation>
     </message>
 </context>
 <context>