diff --git a/.forgejo/workflows/Android.yaml b/.forgejo/workflows/Android.yaml
index f89f7982..3c46b438 100644
--- a/.forgejo/workflows/Android.yaml
+++ b/.forgejo/workflows/Android.yaml
@@ -45,4 +45,4 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: Android
- path: ./android/app/build/outputs/apk/release/app-release-unsigned.apk
\ No newline at end of file
+ path: ./android/app/build/outputs/apk/release/app-release.apk
\ No newline at end of file
diff --git a/android/app/build.gradle b/android/app/build.gradle
index d6d30a4a..dfa78d5c 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -18,6 +18,8 @@ android {
}
buildTypes {
release {
+ signingConfig signingConfigs.debug
+
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
diff --git a/android/app/src/main/assets/public/index.html b/android/app/src/main/assets/public/index.html
index a2f4078c..a25de9e9 100644
--- a/android/app/src/main/assets/public/index.html
+++ b/android/app/src/main/assets/public/index.html
@@ -48,14 +48,14 @@
diff --git a/android/app/src/main/assets/public/main.js b/android/app/src/main/assets/public/main.js
index c07412cc..adddbd7d 100644
--- a/android/app/src/main/assets/public/main.js
+++ b/android/app/src/main/assets/public/main.js
@@ -693,7 +693,7 @@ addGroupBtn.addEventListener("click", async () => {
roomContentMain.style.opacity = "";
});
-
+/* replaced with css
sidebarHomeButton.addEventListener("mouseenter", () => {
sidebarHomeIndicator.classList.add("hover");
});
@@ -721,7 +721,7 @@ sidebarInboxButton.addEventListener("mouseenter", () => {
sidebarInboxButton.addEventListener("mouseleave", () => {
sidebarInboxIndicator.classList.remove("hover");
});
-
+*/
function gotoSideProfilePopup() {
diff --git a/android/app/src/main/assets/public/style.css b/android/app/src/main/assets/public/style.css
index ce1b11cc..9813760d 100644
--- a/android/app/src/main/assets/public/style.css
+++ b/android/app/src/main/assets/public/style.css
@@ -66,6 +66,8 @@ loading {
color: var(--text-color);
font-family: "Nunito", sans-serif;
-webkit-tap-highlight-color: transparent;
+ user-select: none !important;
+ -webkit-user-drag: none !important;
}
button, input {
@@ -111,16 +113,7 @@ indicator.notification {
border-radius: 0.8rem;
transform: translateY(calc( ( var(--icon-button-height) + (var(--button-margin) * 2) ) / 2 - 0.25rem));
}
-indicator.hover {
- content: "";
- position: absolute;
- width: 0;
- height: 1.2rem;
- left: -0.08rem;
- border: 0.15rem solid var(--text-color);
- border-radius: 0.8rem;
- transform: translateY(calc( ( var(--icon-button-height) + (var(--button-margin) * 2) ) / 2 - 0.6rem));
-}
+
indicator.active {
content: "";
position: absolute;
@@ -142,14 +135,14 @@ indicator.active {
.icon-button svg {
width: var(--icon-button-size);
height: var(--icon-button-size);
+ pointer-events: none !important;
}
.icon-button img {
width: calc(var(--icon-button-height) - (var(--border-width) * 2));
height: calc(var(--icon-button-height) - (var(--border-width) * 2));
+ pointer-events: none !important;
}
-button:hover, input:hover {
- background-color: rgba(255, 255, 255, 0.1);
-}
+
button:active, input:active {
transform: var(--press-scale);
}
@@ -219,11 +212,6 @@ sidebar.second {
color: rgba(255, 255, 255, 0.5);
}
-.add-action-button:hover {
- background-color: rgba(255, 255, 255, 0.1);
- color: var(--text-color);
-}
-
.add-action-button svg {
width: 1.25rem;
height: 1.25rem;
@@ -349,7 +337,6 @@ herotitle {
z-index: 1;
}
-
.submit-button {
justify-content: center;
background-color: var(--text-color);
@@ -359,11 +346,49 @@ herotitle {
font-size: 1.05rem;
}
-.submit-button:hover {
- background-color: rgba(255, 255, 255, 0.5);
-}
-
-
.bottom-element {
margin-top: auto;
+}
+
+@media (hover: hover) {
+ sidebarelement:hover indicator:not(.active) {
+ content: "";
+ position: absolute;
+ width: 0;
+ height: 1.2rem;
+ left: -0.08rem;
+ border: 0.15rem solid var(--text-color);
+ border-radius: 0.8rem;
+ transform: translateY(calc( ( var(--icon-button-height) + (var(--button-margin) * 2) ) / 2 - 0.6rem));
+ }
+ button:hover, input:hover {
+ background-color: rgba(255, 255, 255, 0.1);
+ }
+ .submit-button:hover {
+ background-color: rgba(255, 255, 255, 0.5);
+ }
+ .add-action-button:hover {
+ background-color: rgba(255, 255, 255, 0.1);
+ color: var(--text-color);
+ }
+}
+button:active, input:active {
+ background-color: rgba(255, 255, 255, 0.1);
+}
+.submit-button:active {
+ background-color: rgba(255, 255, 255, 0.5);
+}
+.add-action-button:active {
+ background-color: rgba(255, 255, 255, 0.1);
+ color: var(--text-color);
+}
+sidebarelement:has(.icon-button:active) indicator:not(.active) {
+ content: "";
+ position: absolute;
+ width: 0;
+ height: 1.2rem;
+ left: -0.08rem;
+ border: 0.15rem solid var(--text-color);
+ border-radius: 0.8rem;
+ transform: translateY(calc( ( var(--icon-button-height) + (var(--button-margin) * 2) ) / 2 - 0.6rem));
}
\ No newline at end of file
diff --git a/electron/assets/icon.png b/electron/assets/icon.png
index 32ce8dd0..cbbe5331 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 32ce8dd0..cbbe5331 100644
Binary files a/icons/icon.png and b/icons/icon.png differ
diff --git a/webroot/index.html b/webroot/index.html
index a2f4078c..a25de9e9 100644
--- a/webroot/index.html
+++ b/webroot/index.html
@@ -48,14 +48,14 @@
diff --git a/webroot/main.js b/webroot/main.js
index c07412cc..adddbd7d 100644
--- a/webroot/main.js
+++ b/webroot/main.js
@@ -693,7 +693,7 @@ addGroupBtn.addEventListener("click", async () => {
roomContentMain.style.opacity = "";
});
-
+/* replaced with css
sidebarHomeButton.addEventListener("mouseenter", () => {
sidebarHomeIndicator.classList.add("hover");
});
@@ -721,7 +721,7 @@ sidebarInboxButton.addEventListener("mouseenter", () => {
sidebarInboxButton.addEventListener("mouseleave", () => {
sidebarInboxIndicator.classList.remove("hover");
});
-
+*/
function gotoSideProfilePopup() {
diff --git a/webroot/style.css b/webroot/style.css
index ce1b11cc..9813760d 100644
--- a/webroot/style.css
+++ b/webroot/style.css
@@ -66,6 +66,8 @@ loading {
color: var(--text-color);
font-family: "Nunito", sans-serif;
-webkit-tap-highlight-color: transparent;
+ user-select: none !important;
+ -webkit-user-drag: none !important;
}
button, input {
@@ -111,16 +113,7 @@ indicator.notification {
border-radius: 0.8rem;
transform: translateY(calc( ( var(--icon-button-height) + (var(--button-margin) * 2) ) / 2 - 0.25rem));
}
-indicator.hover {
- content: "";
- position: absolute;
- width: 0;
- height: 1.2rem;
- left: -0.08rem;
- border: 0.15rem solid var(--text-color);
- border-radius: 0.8rem;
- transform: translateY(calc( ( var(--icon-button-height) + (var(--button-margin) * 2) ) / 2 - 0.6rem));
-}
+
indicator.active {
content: "";
position: absolute;
@@ -142,14 +135,14 @@ indicator.active {
.icon-button svg {
width: var(--icon-button-size);
height: var(--icon-button-size);
+ pointer-events: none !important;
}
.icon-button img {
width: calc(var(--icon-button-height) - (var(--border-width) * 2));
height: calc(var(--icon-button-height) - (var(--border-width) * 2));
+ pointer-events: none !important;
}
-button:hover, input:hover {
- background-color: rgba(255, 255, 255, 0.1);
-}
+
button:active, input:active {
transform: var(--press-scale);
}
@@ -219,11 +212,6 @@ sidebar.second {
color: rgba(255, 255, 255, 0.5);
}
-.add-action-button:hover {
- background-color: rgba(255, 255, 255, 0.1);
- color: var(--text-color);
-}
-
.add-action-button svg {
width: 1.25rem;
height: 1.25rem;
@@ -349,7 +337,6 @@ herotitle {
z-index: 1;
}
-
.submit-button {
justify-content: center;
background-color: var(--text-color);
@@ -359,11 +346,49 @@ herotitle {
font-size: 1.05rem;
}
-.submit-button:hover {
- background-color: rgba(255, 255, 255, 0.5);
-}
-
-
.bottom-element {
margin-top: auto;
+}
+
+@media (hover: hover) {
+ sidebarelement:hover indicator:not(.active) {
+ content: "";
+ position: absolute;
+ width: 0;
+ height: 1.2rem;
+ left: -0.08rem;
+ border: 0.15rem solid var(--text-color);
+ border-radius: 0.8rem;
+ transform: translateY(calc( ( var(--icon-button-height) + (var(--button-margin) * 2) ) / 2 - 0.6rem));
+ }
+ button:hover, input:hover {
+ background-color: rgba(255, 255, 255, 0.1);
+ }
+ .submit-button:hover {
+ background-color: rgba(255, 255, 255, 0.5);
+ }
+ .add-action-button:hover {
+ background-color: rgba(255, 255, 255, 0.1);
+ color: var(--text-color);
+ }
+}
+button:active, input:active {
+ background-color: rgba(255, 255, 255, 0.1);
+}
+.submit-button:active {
+ background-color: rgba(255, 255, 255, 0.5);
+}
+.add-action-button:active {
+ background-color: rgba(255, 255, 255, 0.1);
+ color: var(--text-color);
+}
+sidebarelement:has(.icon-button:active) indicator:not(.active) {
+ content: "";
+ position: absolute;
+ width: 0;
+ height: 1.2rem;
+ left: -0.08rem;
+ border: 0.15rem solid var(--text-color);
+ border-radius: 0.8rem;
+ transform: translateY(calc( ( var(--icon-button-height) + (var(--button-margin) * 2) ) / 2 - 0.6rem));
}
\ No newline at end of file