diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 350d32a..e9b8f62 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,11 +10,11 @@ jobs: - uses: actions/checkout@v3 with: submodules: true - - name: Set up JDK 18 + - name: Set up JDK 19 uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 18 + java-version: 19 cache: gradle - name: Build with Gradle run: ./gradlew build --no-daemon diff --git a/app/build.gradle.kts b/app/build.gradle.kts index be63696..5595679 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -76,5 +76,5 @@ android { dependencies { implementation("androidx.appcompat:appcompat:1.5.1") - implementation("com.google.android.material:material:1.6.1") + implementation("com.google.android.material:material:1.7.0") } diff --git a/app/pdfjs-dist b/app/pdfjs-dist index cc3d3bf..5f07d5a 160000 --- a/app/pdfjs-dist +++ b/app/pdfjs-dist @@ -1 +1 @@ -Subproject commit cc3d3bf299ae11f8f72ae8d64cbf19b340f9a996 +Subproject commit 5f07d5a4159bb99eee2f6143d1297f03b45bba58 diff --git a/app/src/main/assets/viewer.css b/app/src/main/assets/viewer.css index 999ba10..48bf80a 100644 --- a/app/src/main/assets/viewer.css +++ b/app/src/main/assets/viewer.css @@ -1,20 +1,36 @@ +html, body { + height: 100%; +} + body, canvas { padding: 0; margin: 0; } -canvas { - margin: auto; - display: block; +body { + background-color: #c0c0c0; +} + +#container { + width: 100%; + height: 100%; + display: grid; + place-items: center; +} + +#container canvas, #container .textLayer { + /* overlay child elements on top of each other */ + grid-row-start: 1; + grid-column-start: 1; +} + +canvas, .textLayer { + display: inline-block; + position: relative; } .textLayer { - position: absolute; text-align: initial; - left: 0; - top: 0; - right: 0; - bottom: 0; overflow: hidden; opacity: 0.2; line-height: 1; diff --git a/app/src/main/assets/viewer.html b/app/src/main/assets/viewer.html index c4f1125..d385122 100644 --- a/app/src/main/assets/viewer.html +++ b/app/src/main/assets/viewer.html @@ -7,8 +7,10 @@
- - +