diff --git a/android/app/src/main/assets/public/index.html b/android/app/src/main/assets/public/index.html
index 20a24daa..a2972ba4 100644
--- a/android/app/src/main/assets/public/index.html
+++ b/android/app/src/main/assets/public/index.html
@@ -55,21 +55,21 @@
-
+
-
+
-
+
diff --git a/android/app/src/main/assets/public/main.js b/android/app/src/main/assets/public/main.js
index 9bcb088d..1c36b640 100644
--- a/android/app/src/main/assets/public/main.js
+++ b/android/app/src/main/assets/public/main.js
@@ -47,10 +47,13 @@ try {
var roomContentMain = document.getElementsByTagName("roomcontent2")[1];
+ var roomDetailsMain = document.getElementsByTagName("roomcontent2")[2];
+
var roomContentBar = roomContent.children[0];
var roomsTopBar = document.getElementsByTagName("roomtopbar")[0];
var roomTopBar = document.getElementsByTagName("roomtopbar")[1];
+ var detailsTopBar = document.getElementsByTagName("roomtopbar")[2];
var sidebarProfile = document.getElementById("sidebar-profile");
var sidebarProfileButton = sidebarProfile.children.item(1);
@@ -786,6 +789,58 @@ async function switchRoomContent(title, content, showRoomBar, icon = "", skipMob
roomsTopBarTransition.style.opacity = "";
+}
+async function switchDetailsContent(title, content)
+{
+ let roomsTopBarTransition = detailsTopBar.children.item(0);
+
+ roomDetailsMain.style.transform = "scale(0.85)";
+ roomDetailsMain.style.opacity = "0";
+
+ roomsTopBarTransition.style.transform = "scale(0.85)";
+ roomsTopBarTransition.style.opacity = "0";
+
+ const rem = parseFloat(getComputedStyle(document.documentElement).fontSize);
+ if (window.innerWidth <= 52 * rem && !skipMobileSlide) {
+ }
+ else
+ {
+ await delay(200);
+ }
+
+
+ roomsTopBarTransition.innerHTML = processBlah(title);
+
+ let parser = new DOMParser();
+ let doc = parser.parseFromString(content, "text/html");
+
+ let blahTags = doc.getElementsByTagName("blah");
+ for (let i = 0; i < blahTags.length; i++) {
+ blahTags[i].innerHTML = processBlah(blahTags[i].innerHTML);
+ }
+ blahTags = doc.getElementsByClassName("blah");
+ for (let i = 0; i < blahTags.length; i++) {
+ blahTags[i].innerHTML = processBlah(blahTags[i].innerHTML);
+ }
+
+ let placeholders = doc.querySelectorAll("[placeholder]");
+ for (let i = 0; i < placeholders.length; i++) {
+ if (placeholders[i].placeholder.startsWith("{blah("))
+ {
+ let value = placeholders[i].placeholder.split("{blah(")[1].split(")}")[0];
+ placeholders[i].placeholder = processBlah(value);
+ }
+ }
+
+ roomDetailsMain.innerHTML = doc.body.innerHTML;
+
+ roomDetailsMain.style.transform = "";
+ roomDetailsMain.style.opacity = "";
+
+ roomsTopBarTransition.style.transform = "";
+ roomsTopBarTransition.style.opacity = "";
+
+
}
function clickCollapseDms()
{
diff --git a/android/app/src/main/assets/public/screens.js b/android/app/src/main/assets/public/screens.js
index 4877030d..af35fcf2 100644
--- a/android/app/src/main/assets/public/screens.js
+++ b/android/app/src/main/assets/public/screens.js
@@ -76,38 +76,38 @@ var joinSpaceScreen = `
//roombars
var homeRoomBar = `
+
+
+
-
+
`;
diff --git a/android/app/src/main/assets/public/style.css b/android/app/src/main/assets/public/style.css
index cd45fafa..f85a3b4a 100644
--- a/android/app/src/main/assets/public/style.css
+++ b/android/app/src/main/assets/public/style.css
@@ -374,7 +374,7 @@ blah, inherit, .inherit {
all: inherit;
padding: 0;
margin: 0;
- display: flex;
+ display: inline;
opacity: 1;
border: none;
}
diff --git a/electron/assets/icon.png b/electron/assets/icon.png
index aded4a10..6bb1c40c 100644
Binary files a/electron/assets/icon.png and b/electron/assets/icon.png differ
diff --git a/icons/icon.png b/icons/icon.png
index aded4a10..6bb1c40c 100644
Binary files a/icons/icon.png and b/icons/icon.png differ
diff --git a/webroot/main.js b/webroot/main.js
index 9bcb088d..1c36b640 100644
--- a/webroot/main.js
+++ b/webroot/main.js
@@ -47,10 +47,13 @@ try {
var roomContentMain = document.getElementsByTagName("roomcontent2")[1];
+ var roomDetailsMain = document.getElementsByTagName("roomcontent2")[2];
+
var roomContentBar = roomContent.children[0];
var roomsTopBar = document.getElementsByTagName("roomtopbar")[0];
var roomTopBar = document.getElementsByTagName("roomtopbar")[1];
+ var detailsTopBar = document.getElementsByTagName("roomtopbar")[2];
var sidebarProfile = document.getElementById("sidebar-profile");
var sidebarProfileButton = sidebarProfile.children.item(1);
@@ -786,6 +789,58 @@ async function switchRoomContent(title, content, showRoomBar, icon = "", skipMob
roomsTopBarTransition.style.opacity = "";
+}
+async function switchDetailsContent(title, content)
+{
+ let roomsTopBarTransition = detailsTopBar.children.item(0);
+
+ roomDetailsMain.style.transform = "scale(0.85)";
+ roomDetailsMain.style.opacity = "0";
+
+ roomsTopBarTransition.style.transform = "scale(0.85)";
+ roomsTopBarTransition.style.opacity = "0";
+
+ const rem = parseFloat(getComputedStyle(document.documentElement).fontSize);
+ if (window.innerWidth <= 52 * rem && !skipMobileSlide) {
+ }
+ else
+ {
+ await delay(200);
+ }
+
+
+ roomsTopBarTransition.innerHTML = processBlah(title);
+
+ let parser = new DOMParser();
+ let doc = parser.parseFromString(content, "text/html");
+
+ let blahTags = doc.getElementsByTagName("blah");
+ for (let i = 0; i < blahTags.length; i++) {
+ blahTags[i].innerHTML = processBlah(blahTags[i].innerHTML);
+ }
+ blahTags = doc.getElementsByClassName("blah");
+ for (let i = 0; i < blahTags.length; i++) {
+ blahTags[i].innerHTML = processBlah(blahTags[i].innerHTML);
+ }
+
+ let placeholders = doc.querySelectorAll("[placeholder]");
+ for (let i = 0; i < placeholders.length; i++) {
+ if (placeholders[i].placeholder.startsWith("{blah("))
+ {
+ let value = placeholders[i].placeholder.split("{blah(")[1].split(")}")[0];
+ placeholders[i].placeholder = processBlah(value);
+ }
+ }
+
+ roomDetailsMain.innerHTML = doc.body.innerHTML;
+
+ roomDetailsMain.style.transform = "";
+ roomDetailsMain.style.opacity = "";
+
+ roomsTopBarTransition.style.transform = "";
+ roomsTopBarTransition.style.opacity = "";
+
+
}
function clickCollapseDms()
{