{$_('layout.bookmarklet')}
diff --git a/materialious/src/lib/android/http/androidRequests.ts b/materialious/src/lib/android/http/androidRequests.ts
index 38905886..0df0dcde 100644
--- a/materialious/src/lib/android/http/androidRequests.ts
+++ b/materialious/src/lib/android/http/androidRequests.ts
@@ -51,5 +51,5 @@ if (Capacitor.getPlatform() === 'android') {
return originalXhrOpen.apply(this, args);
};
- setTimeout(() => goto('/', { replaceState: true }), 300);
+ setTimeout(() => goto('/', { replaceState: true }), 10);
}
diff --git a/materialious/src/lib/externalSettings.ts b/materialious/src/lib/externalSettings.ts
index 2d5abb2d..07706050 100644
--- a/materialious/src/lib/externalSettings.ts
+++ b/materialious/src/lib/externalSettings.ts
@@ -8,6 +8,7 @@ import {
interfaceAmoledTheme,
interfaceAutoExpandComments,
interfaceAutoExpandDesc,
+ interfaceDefaultPage,
interfaceDisplayThumbnailAvatars,
interfaceForceCase,
interfaceLowBandwidthMode,
@@ -207,6 +208,11 @@ const persistedStores: { name: string, store: Writable
, type: 'string' | 'b
name: 'defaultLanguage',
store: playerDefaultLanguage,
type: 'boolean'
+ },
+ {
+ name: 'defaultPage',
+ store: interfaceDefaultPage,
+ type: 'string'
}
];
diff --git a/materialious/src/lib/i18n/locales/en.json b/materialious/src/lib/i18n/locales/en.json
index 7ab2e622..fea99828 100644
--- a/materialious/src/lib/i18n/locales/en.json
+++ b/materialious/src/lib/i18n/locales/en.json
@@ -24,6 +24,7 @@
"letterCase": "Letter case for titles",
"hideReplies": "Hide replies",
"hideVideo": "Hide video",
+ "defaultPage": "Default page",
"syncParty": {
"userJoined": "User joined your watch party.",
"userLeft": "User left your watch party.",
diff --git a/materialious/src/lib/misc.ts b/materialious/src/lib/misc.ts
index 5e8a42ee..b75ab48d 100644
--- a/materialious/src/lib/misc.ts
+++ b/materialious/src/lib/misc.ts
@@ -1,14 +1,11 @@
import { pushState } from '$app/navigation';
import { page } from '$app/stores';
-import { Capacitor } from '@capacitor/core';
-import { StatusBar } from '@capacitor/status-bar';
import he from 'he';
import humanNumber from 'human-number';
import type Peer from 'peerjs';
import { get } from 'svelte/store';
import type { Image } from './api/model';
import { instanceStore, interfaceForceCase } from './store';
-import { getDynamicTheme } from './theme';
export type TitleCase = 'uppercase' | 'lowercase' | 'sentence case' | 'title case' | null;
@@ -291,11 +288,3 @@ export function ensureNoTrailingSlash(url: any): string {
return url.endsWith('/') ? url.slice(0, -1) : url;
}
-
-export async function setStatusBarColor() {
- if (Capacitor.getPlatform() === 'android') {
- await StatusBar.setBackgroundColor({
- color: (await getDynamicTheme())['--surface-container']
- });
- }
-}
\ No newline at end of file
diff --git a/materialious/src/lib/navPages.ts b/materialious/src/lib/navPages.ts
new file mode 100644
index 00000000..28d14a14
--- /dev/null
+++ b/materialious/src/lib/navPages.ts
@@ -0,0 +1,39 @@
+import { _ } from 'svelte-i18n';
+import { get } from 'svelte/store';
+
+
+// Must be a func do to how i18n is loaded
+export function getPages(): { icon: string, href: string, name: string, requiresAuth: boolean; }[] {
+ return [
+ {
+ icon: 'home',
+ href: '/',
+ name: get(_)('pages.home'),
+ requiresAuth: false
+ },
+ {
+ icon: 'whatshot',
+ href: '/trending',
+ name: get(_)('pages.trending'),
+ requiresAuth: false
+ },
+ {
+ icon: 'subscriptions',
+ href: '/subscriptions',
+ name: get(_)('pages.subscriptions'),
+ requiresAuth: true
+ },
+ {
+ icon: 'video_library',
+ href: '/playlists',
+ name: get(_)('pages.playlists'),
+ requiresAuth: true
+ },
+ {
+ icon: 'history',
+ href: '/history',
+ name: get(_)('pages.history'),
+ requiresAuth: true
+ }
+ ];
+}
\ No newline at end of file
diff --git a/materialious/src/lib/patches/youtubejs.ts b/materialious/src/lib/patches/youtubejs.ts
index 36d61735..e76b9c18 100644
--- a/materialious/src/lib/patches/youtubejs.ts
+++ b/materialious/src/lib/patches/youtubejs.ts
@@ -159,11 +159,13 @@ export async function patchYoutubeJs(videoId: string): Promise {
});
}
+ console.log(video.primary_info);
+
return {
type: 'video',
title: video.primary_info.title?.toString() || '',
- viewCount: video.primary_info.view_count ? Number(video.primary_info.view_count?.toString()?.replace(/\D/g, '')) : 0,
- viewCountText: video.primary_info.view_count?.toString() || '',
+ viewCount: Number(video.primary_info.view_count?.original_view_count || 0),
+ viewCountText: video.primary_info.view_count?.original_view_count.toString() || '0',
likeCount: video.basic_info.like_count || 0,
dislikeCount: 0,
allowRatings: false,
diff --git a/materialious/src/lib/store.ts b/materialious/src/lib/store.ts
index 10cc4374..ad0708c5 100644
--- a/materialious/src/lib/store.ts
+++ b/materialious/src/lib/store.ts
@@ -67,6 +67,7 @@ export const interfaceAutoExpandDesc: Writable = persisted('autoExpandD
export const interfaceAmoledTheme = persisted('amoledTheme', false);
export const interfaceLowBandwidthMode = persisted('lowBandwidthMode', false);
export const interfaceDisplayThumbnailAvatars = persisted('disableThumbnailAvatars', false);
+export const interfaceDefaultPage = persisted('defaultPage', '/');
export const sponsorBlockStore = persisted('sponsorBlock', true);
export const sponsorBlockUrlStore: Writable = persisted(
diff --git a/materialious/src/lib/theme.ts b/materialious/src/lib/theme.ts
index bc176374..4cf28eae 100644
--- a/materialious/src/lib/theme.ts
+++ b/materialious/src/lib/theme.ts
@@ -1,3 +1,6 @@
+import { Capacitor } from '@capacitor/core';
+import { StatusBar, Style } from '@capacitor/status-bar';
+import { NavigationBar } from '@hugotomazi/capacitor-navigation-bar';
import ui from 'beercss';
import { get } from 'svelte/store';
import { darkModeStore, interfaceAmoledTheme } from './store';
@@ -15,6 +18,26 @@ export async function getDynamicTheme(mode?: string): Promise
import { afterNavigate, beforeNavigate, goto } from '$app/navigation';
- import { navigating } from '$app/stores';
+
+ import { navigating, page } from '$app/stores';
import '$lib/android/http/androidRequests';
import colorTheme, { convertToHexColorCode } from '$lib/android/plugins/colorTheme';
import { getFeed } from '$lib/api/index';
@@ -8,7 +9,7 @@
import { bookmarkletLoadFromUrl, loadSettingsFromEnv } from '$lib/externalSettings';
import Logo from '$lib/Logo.svelte';
import MiniPlayer from '$lib/MiniPlayer.svelte';
- import { setStatusBarColor } from '$lib/misc';
+ import { getPages } from '$lib/navPages';
import PageLoading from '$lib/PageLoading.svelte';
import Search from '$lib/Search.svelte';
import Settings from '$lib/Settings.svelte';
@@ -18,12 +19,13 @@
darkModeStore,
instanceStore,
interfaceAmoledTheme,
+ interfaceDefaultPage,
showWarningStore,
syncPartyPeerStore,
themeColorStore
} from '$lib/store';
import SyncParty from '$lib/SyncParty.svelte';
- import { setAmoledTheme, setTheme } from '$lib/theme';
+ import { setAmoledTheme, setStatusBarColor, setTheme } from '$lib/theme';
import Thumbnail from '$lib/Thumbnail.svelte';
import { App } from '@capacitor/app';
import { Browser } from '@capacitor/browser';
@@ -48,39 +50,6 @@
let notifications: Notification[] = [];
- const pages = [
- {
- icon: 'home',
- href: '/',
- name: $_('pages.home'),
- requiresAuth: false
- },
- {
- icon: 'whatshot',
- href: '/trending',
- name: $_('pages.trending'),
- requiresAuth: false
- },
- {
- icon: 'subscriptions',
- href: '/subscriptions',
- name: $_('pages.subscriptions'),
- requiresAuth: true
- },
- {
- icon: 'video_library',
- href: '/playlists',
- name: $_('pages.playlists'),
- requiresAuth: true
- },
- {
- icon: 'history',
- href: '/history',
- name: $_('pages.history'),
- requiresAuth: true
- }
- ];
-
interfaceAmoledTheme.subscribe(() => {
setAmoledTheme();
});
@@ -178,6 +147,19 @@
onMount(async () => {
ui();
+ if (
+ $interfaceDefaultPage &&
+ $interfaceDefaultPage !== '/' &&
+ $interfaceDefaultPage.startsWith('/') &&
+ $page.url.pathname === '/'
+ ) {
+ getPages().forEach((page) => {
+ if (page.href === $interfaceDefaultPage && (!page.requiresAuth || $authStore)) {
+ goto($interfaceDefaultPage);
+ }
+ });
+ }
+
scrollableRoot = document.querySelector('.root');
loadSettingsFromEnv();
@@ -216,7 +198,7 @@