Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e779f803 authored by Simon Chan's avatar Simon Chan
Browse files

refactor(scrcpy): uncouple from ADB 

refs #427
parent 6887d854

apps/demo/package.json

+3 −2
Original line number Diff line number Diff line
@@ -22,10 +22,11 @@ 
        "@yume-chan/adb-backend-ws": "^0.0.9",

        "@yume-chan/adb-credential-web": "^0.0.16",

        "@yume-chan/android-bin": "^0.0.16",

        "@yume-chan/async": "^2.1.4",

        "@yume-chan/async": "^2.2.0",

        "@yume-chan/b-tree": "^0.0.16",

        "@yume-chan/event": "^0.0.16",

        "@yume-chan/scrcpy": "^0.0.16",

        "@yume-chan/stream-extra": "^0.0.16",

        "@yume-chan/struct": "^0.0.16",

        "mobx": "^6.5.0",

        "mobx-react-lite": "^3.4.0",
@@ -45,6 +46,6 @@ 
        "eslint": "8.8.0",

        "eslint-config-next": "12.1.6",

        "source-map-loader": "^3.0.1",

        "typescript": "4.7.2"

        "typescript": "^4.7.3"

    }

}

apps/demo/src/components/connect.tsx

+2 −1
Original line number Diff line number Diff line 
import { DefaultButton, Dialog, Dropdown, IDropdownOption, PrimaryButton, ProgressIndicator, Stack, StackItem } from '@fluentui/react';

import { Adb, AdbBackend, AdbPacketData, AdbPacketInit, InspectStream, pipeFrom, ReadableStream, WritableStream } from '@yume-chan/adb';

import { Adb, AdbBackend, AdbPacketData, AdbPacketInit } from '@yume-chan/adb';

import AdbDirectSocketsBackend from "@yume-chan/adb-backend-direct-sockets";

import AdbWebUsbBackend, { AdbWebUsbBackendWatcher } from '@yume-chan/adb-backend-webusb';

import AdbWsBackend from '@yume-chan/adb-backend-ws';

import AdbWebCredentialStore from '@yume-chan/adb-credential-web';

import { InspectStream, pipeFrom, ReadableStream, WritableStream } from '@yume-chan/stream-extra';

import { observer } from 'mobx-react-lite';

import { useCallback, useEffect, useMemo, useState } from 'react';

import { GlobalState } from '../state';

apps/demo/src/components/grid.tsx

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ export const Grid = withDisplayName('Grid')(({ 
    const [autoScroll, setAutoScroll] = useState(true);



    const handleScroll = useStableCallback(() => {

        if (bodyRef) {

        if (bodyRef && bodyRef.scrollTop !== scrollTop) {

            if (autoScroll) {

                if (scrollTop < bodyRef.scrollHeight - bodyRef.clientHeight && bodyRef.scrollTop < scrollTop) {

                    setAutoScroll(false);

apps/demo/src/components/terminal.tsx

+2 −1
Original line number Diff line number Diff line 
// cspell: ignore scrollback



import { AbortController, AdbSubprocessProtocol, encodeUtf8, WritableStream } from "@yume-chan/adb";

import { AdbSubprocessProtocol, encodeUtf8 } from "@yume-chan/adb";

import { AutoDisposable } from "@yume-chan/event";

import { AbortController, WritableStream } from '@yume-chan/stream-extra';

import { Terminal } from 'xterm';

import { FitAddon } from 'xterm-addon-fit';

import { SearchAddon } from 'xterm-addon-search';

apps/demo/src/pages/file-manager.tsx

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ import { Breadcrumb, concatStyleSets, ContextualMenu, ContextualMenuItem, Detail 
import { FileIconType, getFileTypeIconProps, initializeFileTypeIcons } from "@fluentui/react-file-type-icons";

import { useConst } from '@fluentui/react-hooks';

import { getIcon } from '@fluentui/style-utilities';

import { AdbFeatures, ADB_SYNC_MAX_PACKET_SIZE, ChunkStream, LinuxFileType, type AdbSyncEntry } from '@yume-chan/adb';

import { AdbFeatures, ADB_SYNC_MAX_PACKET_SIZE, LinuxFileType, type AdbSyncEntry } from '@yume-chan/adb';

import { ChunkStream } from '@yume-chan/stream-extra';

import { action, autorun, makeAutoObservable, observable, runInAction } from "mobx";

import { observer } from "mobx-react-lite";

import { NextPage } from "next";