blade/materialious
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #590 from Materialious/update/1.5.7

Browse Source 
Fix sharing on Android
This commit is contained in:
Ward
2024-09-22 19:46:17 +12:00
committed by GitHub
parent 2091d1981a c57949fb4c
commit d88625b03f
12 changed files with 40 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
materialious/android/app/build.gradle
+2 -2
View File
@@ -7,8 +7,8 @@ android {
applicationId "us.materialio.app"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 47
versionName "1.5.6"
versionCode 48
versionName "1.5.7"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
materialious/android/app/capacitor.build.gradle
+1
View File
@@ -11,6 +11,7 @@ apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
dependencies {
implementation project(':capacitor-app')
implementation project(':capacitor-browser')
implementation project(':capacitor-clipboard')
implementation project(':capgo-inappbrowser')
implementation project(':mediagrid-capacitor-native-audio')
implementation project(':capacitor-nodejs')
materialious/android/capacitor.settings.gradle
+3
View File
@@ -8,6 +8,9 @@ project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/
include ':capacitor-browser'
project(':capacitor-browser').projectDir = new File('../node_modules/@capacitor/browser/android')
include ':capacitor-clipboard'
project(':capacitor-clipboard').projectDir = new File('../node_modules/@capacitor/clipboard/android')
include ':capgo-inappbrowser'
project(':capgo-inappbrowser').projectDir = new File('../node_modules/@capgo/inappbrowser/android')
materialious/electron/package.json
+2 -1
View File
@@ -1,6 +1,6 @@
{
"name": "Materialious",
"version": "1.5.6",
"version": "1.5.7",
"description": "Modern material design for Invidious.",
"author": {
"name": "Ward Pearce",
@@ -21,6 +21,7 @@
},
"dependencies": {
"@capacitor-community/electron": "^5.0.0",
"capacitor-nodejs": "https://github.com/EdenwareApps/Capacitor-NodeJS/releases/download/v1.0.0-beta.7/capacitor6-nodejs.tgz",
"chokidar": "~3.6.0",
"electron-is-dev": "~2.0.0",
"electron-serve": "~1.1.0",
materialious/package-lock.json
Generated
+11 -2
View File
@@ -1,18 +1,19 @@
{
"name": "materialious",
"version": "1.5.4",
"version": "1.5.6",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "materialious",
"version": "1.5.4",
"version": "1.5.6",
"dependencies": {
"@capacitor-community/electron": "^5.0.1",
"@capacitor/android": "6.1.2",
"@capacitor/app": "^6.0.1",
"@capacitor/browser": "^6.0.2",
"@capacitor/cli": "6.1.2",
"@capacitor/clipboard": "^6.0.1",
"@capacitor/core": "^6.1.2",
"@capgo/inappbrowser": "^6.6.8",
"@ffmpeg/ffmpeg": "^0.12.10",
@@ -2166,6 +2167,14 @@
"node": "^12.20.0 || >=14"
}
},
"node_modules/@capacitor/clipboard": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/@capacitor/clipboard/-/clipboard-6.0.1.tgz",
"integrity": "sha512-aN6QsZD79Z605sK9YA8JtJLuD5vI/WrPzT/RCWUWBWPdFzhnRdT45dbsnQVvL2kzzm5aTsCAPepkdRqpvWwCGA==",
"peerDependencies": {
"@capacitor/core": "^6.0.0"
}
},
"node_modules/@capacitor/core": {
"version": "6.1.2",
"resolved": "https://registry.npmjs.org/@capacitor/core/-/core-6.1.2.tgz",
materialious/package.json
+2 -1
View File
@@ -1,6 +1,6 @@
{
"name": "materialious",
"version": "1.5.6",
"version": "1.5.7",
"private": true,
"scripts": {
"dev": "vite dev",
@@ -49,6 +49,7 @@
"@capacitor/app": "^6.0.1",
"@capacitor/browser": "^6.0.2",
"@capacitor/cli": "6.1.2",
"@capacitor/clipboard": "^6.0.1",
"@capacitor/core": "^6.1.2",
"@capgo/inappbrowser": "^6.6.8",
"@ffmpeg/ffmpeg": "^0.12.10",
materialious/src/lib/Settings.svelte
+2 -1
View File
@@ -1,6 +1,7 @@
<script lang="ts">
import { goto } from '$app/navigation';
import { bookmarkletSaveToUrl } from '$lib/externalSettings';
import { Clipboard } from '@capacitor/clipboard';
import { Capacitor } from '@capacitor/core';
import ui from 'beercss';
import { iso31661 } from 'iso-3166';
@@ -673,7 +674,7 @@
<h6>{$_('layout.bookmarklet')}</h6>
<button
class="no-margin"
on:click={async () => await navigator.clipboard.writeText(bookmarkletSaveToUrl())}
on:click={async () => await Clipboard.write({ string: bookmarkletSaveToUrl() })}
>{$_('copyUrl')}</button
>
</div>
materialious/src/lib/ShareVideo.svelte
+4 -3
View File
@@ -1,4 +1,5 @@
<script lang="ts">
import { Clipboard } from '@capacitor/clipboard';
import { Capacitor } from '@capacitor/core';
import { _ } from 'svelte-i18n';
import type { Notification, PlaylistPageVideo, Video, VideoBase } from './Api/model';
@@ -11,7 +12,7 @@
class="row"
href="#copy"
on:click={async () =>
await navigator.clipboard.writeText(`${location.origin}/watch/${video.videoId}`)}
await Clipboard.write({ string: `${location.origin}/watch/${video.videoId}` })}
>
<div class="min">{$_('player.share.materialiousLink')}</div></a
>
@@ -20,14 +21,14 @@
href="#copy"
class="row"
on:click={async () =>
await navigator.clipboard.writeText(`https://redirect.invidious.io/watch?v=${video.videoId}`)}
await Clipboard.write({ string: `https://redirect.invidious.io/watch?v=${video.videoId}` })}
>
<div class="min">{$_('player.share.invidiousRedirect')}</div></a
><a
class="row"
href="#copy"
on:click={async () =>
await navigator.clipboard.writeText(`https://www.youtube.com/watch?v=${video.videoId}`)}
await Clipboard.write({ string: `https://www.youtube.com/watch?v=${video.videoId}` })}
>
<div class="min">{$_('player.share.youtubeLink')}</div></a
>
materialious/src/lib/SyncParty.svelte
+2 -1
View File
@@ -3,6 +3,7 @@
import { page } from '$app/stores';
import { peerJs, removeWindowQueryFlag, setWindowQueryFlag } from '$lib/misc';
import type { PlayerEvents } from '$lib/player';
import { Clipboard } from '@capacitor/clipboard';
import ui from 'beercss';
import type { DataConnection } from 'peerjs';
import { onDestroy, onMount } from 'svelte';
@@ -130,7 +131,7 @@
</div>
<button
on:click={async () => {
await navigator.clipboard.writeText(`${location.origin}?sync=${$syncPartyPeerStore?.id}`);
await Clipboard.write({ string: `${location.origin}?sync=${$syncPartyPeerStore?.id}` });
}}
class="square round"
>
materialious/src/routes/(app)/channel/[slug]/+page.svelte
+5 -4
View File
@@ -6,6 +6,7 @@
import Thumbnail from '$lib/Thumbnail.svelte';
import { cleanNumber, getBestThumbnail, proxyGoogleImage } from '$lib/misc';
import { activePageStore, authStore } from '$lib/store';
import { Clipboard } from '@capacitor/clipboard';
import { Capacitor } from '@capacitor/core';
import { onMount } from 'svelte';
import { _ } from 'svelte-i18n';
@@ -132,16 +133,16 @@
<a
href="#share"
on:click={async () => {
await navigator.clipboard.writeText(location.href);
await Clipboard.write({ string: location.href });
}}>{$_('player.share.materialiousLink')}</a
>
{/if}
<a
href="#share"
on:click={async () => {
await navigator.clipboard.writeText(
`https://www.youtube.com/channel/${data.channel.authorId}`
);
await Clipboard.write({
string: `https://www.youtube.com/channel/${data.channel.authorId}`
});
}}>{$_('player.share.youtubeLink')}</a
>
</menu>
materialious/src/routes/(app)/playlist/[slug]/+page.svelte
+5 -4
View File
@@ -4,6 +4,7 @@
import VideoList from '$lib/VideoList.svelte';
import { cleanNumber, unsafeRandomItem } from '$lib/misc.js';
import { activePageStore, playlistSettingsStore } from '$lib/store';
import { Clipboard } from '@capacitor/clipboard';
import { Capacitor } from '@capacitor/core';
import { onMount } from 'svelte';
import { _ } from 'svelte-i18n';
@@ -90,16 +91,16 @@
<a
href="#share"
on:click={async () => {
await navigator.clipboard.writeText(location.href);
await Clipboard.write({ string: location.href });
}}>{$_('player.share.materialiousLink')}</a
>
{/if}
<a
href="#share"
on:click={async () => {
await navigator.clipboard.writeText(
`https://www.youtube.com/playlist?list=${data.playlist.playlistId}`
);
await Clipboard.write({
string: `https://www.youtube.com/playlist?list=${data.playlist.playlistId}`
});
}}>{$_('player.share.youtubeLink')}</a
>
</menu>
update_versions.py
+1 -1
View File
@@ -5,7 +5,7 @@ import json
import os
import re
LATEST_VERSION = "1.5.6"
LATEST_VERSION = "1.5.7"
WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious")
ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json")