diff --git a/.gitignore b/.gitignore
index 5db03072..618dbb69 100755
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,7 @@
/captures
.externalNativeBuild
/.idea/caches/build_file_checksums.ser
-/.idea/caches/gradle_models.ser
\ No newline at end of file
+/.idea/caches/gradle_models.ser
+
+/.direnv/
+/.envrc
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 95b7d112..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-language: android
-jdk: oraclejdk8
-sudo: required
-
-notifications:
- slack: pdfviewerplus:ODw20YfhNtVZkbdA4K3mVFnS
-
-env:
- global:
- - ANDROID_API_LEVEL=30
- - ANDROID_BUILD_TOOLS_VERSION=29.0.2
- - ANDROID_ABI=armeabi-v7a
-
-android:
- components:
- - tools
- - platform-tools
- - tools
- - extra-android-m2repository
- licenses:
- - 'android-sdk-preview-license-52d11cd2'
- - 'android-sdk-license-.+'
- - 'google-gdk-license-.+'
-
-before_install:
- - touch $HOME/.android/repositories.cfg
- - yes | sdkmanager "platforms;android-30"
- - yes | sdkmanager "build-tools;29.0.2"
-
-before_cache:
- - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-
-cache:
- directories:
- - $HOME/.gradle/caches/
- - $HOME/.gradle/wrapper/
- - $HOME/.android/build-cache
-
-before_script:
- - chmod +x gradlew
-
-script:
- - ./gradlew clean build
- - ./gradlew test
diff --git a/LICENSE b/LICENSE
deleted file mode 100755
index a33e4735..00000000
--- a/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 Gokul Swaminathan
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/README.md b/README.md
deleted file mode 100755
index fb1344c9..00000000
--- a/README.md
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-
-
Pdf Viewer Plus
-
-
-
-
-[//]: # (Shields)
-
-[](https://travis-ci.com/JavaCafe01/PdfViewer)
-[](https://github.com/JavaCafe01/PdfViewer/blob/master/LICENSE)
-
-
-
-
-
-## Screenshots
-
-| Main Page | Main Page | Cyanea |
-|:-:|:-:|:-:|
-| 
| 
| 
|
-
-## Permissions and privacy
-This app does not collect any data.
-The following permissions are required to provide specific features in the app:
-* *Internet*: For opening PDFs through links
-* *Storage*: For saving downloading PDFs and opening them from storage
-
-## Contribute
-
-You can contribute to this project in many ways:
-* Fork and make pull requests (please target dev branch)
-* Help to translate the application (By making PR)
-
-### Contributors
-
-
- 
-
-
-Made with [contributors-img](https://contrib.rocks)
-
-## License
-
-Pdf Viewer Plus is made available under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-```
-MIT License
-
-Copyright (c) 2018 Gokul Swaminathan
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-```
-
-
diff --git a/app/.gitignore b/app/.gitignore
old mode 100755
new mode 100644
index 67e07b8f..42afabfd
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1,2 +1 @@
-/build
-/release
+/build
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
old mode 100755
new mode 100644
index 84421102..4673dd48
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,89 +1,67 @@
-/*
- * MIT License
- *
- * Copyright (c) 2018 Gokul Swaminathan
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-apply plugin: 'com.android.application'
+plugins {
+ id 'com.android.application'
+ id 'org.jetbrains.kotlin.android'
+}
android {
+ namespace 'com.gsnathan.pdfviewer'
+ compileSdk 33
- lintOptions {
- checkReleaseBuilds false
- abortOnError false
- }
-
- buildToolsVersion "30.0.3"
- compileSdkVersion 30
defaultConfig {
applicationId "com.gsnathan.pdfviewer"
- minSdkVersion 21
- targetSdkVersion 30
- versionCode 28
- versionName "3.7"
- vectorDrawables.useSupportLibrary = true
- }
+ minSdk 24
+ targetSdk 33
+ versionCode 1
+ versionName "1.0"
- buildFeatures {
- viewBinding true
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+ vectorDrawables {
+ useSupportLibrary true
+ }
}
buildTypes {
release {
- debuggable false
- minifyEnabled true
- shrinkResources true
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
-
- debug {
- debuggable true
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
+ kotlinOptions {
+ jvmTarget = '1.8'
+ }
+ buildFeatures {
+ compose true
+ }
+ composeOptions {
+ kotlinCompilerExtensionVersion '1.3.2'
+ }
+ packagingOptions {
+ resources {
+ excludes += '/META-INF/{AL2.0,LGPL2.1}'
+ }
+ }
}
dependencies {
- implementation 'androidx.appcompat:appcompat:1.3.0-beta01'
- implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-
- // DO NOT UPDATE! otherwise dialog buttons will have the wrong color (conflicts with Cyanea)
- implementation 'com.google.android.material:material:1.0.0'
- //Intro Library
- implementation 'com.github.paolorotolo:appintro:v5.1.0'
-
- //Pdf Viewer Library (Proguard config done)
- implementation 'com.github.barteksc:android-pdf-viewer:3.2.0-beta.1'
-
- //License Presenter Library (Proguard config not needed)
- implementation 'com.github.franmontiel:AttributionPresenter:1.0.1'
-
- //Changelog Library (Proguard config not needed)
- implementation 'io.github.tonnyl:whatsnew:0.1.1'
-
- //Theme Engine
- implementation 'com.jaredrummler:cyanea:1.0.2'
-}
+ implementation 'androidx.core:core-ktx:1.8.0'
+ implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.0')
+ implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
+ implementation 'androidx.activity:activity-compose:1.5.1'
+ implementation platform('androidx.compose:compose-bom:2022.10.00')
+ implementation 'androidx.compose.ui:ui'
+ implementation 'androidx.compose.ui:ui-graphics'
+ implementation 'androidx.compose.ui:ui-tooling-preview'
+ implementation 'androidx.compose.material3:material3'
+ testImplementation 'junit:junit:4.13.2'
+ androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+ androidTestImplementation platform('androidx.compose:compose-bom:2022.10.00')
+ androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
+ debugImplementation 'androidx.compose.ui:ui-tooling'
+ debugImplementation 'androidx.compose.ui:ui-test-manifest'
+}
\ No newline at end of file
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
old mode 100755
new mode 100644
index 04d8c095..481bb434
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -18,6 +18,4 @@
# If you keep the line number information, uncomment this to
# hide the original source file name.
-#-renamesourcefileattribute SourceFile
-
--keep class com.shockwave.**
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/gsnathan/pdfviewer/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/gsnathan/pdfviewer/ExampleInstrumentedTest.kt
new file mode 100644
index 00000000..57ec9986
--- /dev/null
+++ b/app/src/androidTest/java/com/gsnathan/pdfviewer/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.gsnathan.pdfviewer
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+ @Test
+ fun useAppContext() {
+ // Context of the app under test.
+ val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+ assertEquals("com.gsnathan.pdfviewer", appContext.packageName)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
old mode 100755
new mode 100644
index 85ad8f3a..4d4cb5f1
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,102 +1,28 @@
-
-
-
-
+ xmlns:tools="http://schemas.android.com/tools">
-
+ android:theme="@style/Theme.Pdfviewer"
+ tools:targetApi="31">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:exported="true"
+ android:label="@string/app_name"
+ android:theme="@style/Theme.Pdfviewer">
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/assets/themes/cyanea_themes.json b/app/src/main/assets/themes/cyanea_themes.json
deleted file mode 100755
index a7fb4cfa..00000000
--- a/app/src/main/assets/themes/cyanea_themes.json
+++ /dev/null
@@ -1,717 +0,0 @@
-[
- {
- "theme_name": "Pdf Viewer Plus",
- "base_theme": "LIGHT",
- "primary": "#2481a1",
- "primary_dark": "#2481a1",
- "primary_light": "#2481a1",
- "accent": "#00cc99",
- "accent_dark": "#029873",
- "accent_light": "#03dda6",
- "background": "#FAFAFA",
- "background_dark": "#D4D4D4",
- "background_light": "#FAFAFA"
- },
- {
- "theme_name": "Cyanea",
- "base_theme": "LIGHT",
- "primary": "#FFEE3868",
- "primary_dark": "#FFCA2F58",
- "primary_light": "#FFF0557E",
- "accent": "#FF93C43E",
- "accent_dark": "#FF7CA634",
- "accent_light": "#FFA3CC5A",
- "background": "#FFFAFAFA",
- "background_dark": "#FFD4D4D4",
- "background_light": "#FFFAFAFA"
- },
- {
- "theme_name": "Rio",
- "base_theme": "LIGHT",
- "primary": "#FF0B4239",
- "primary_dark": "#FF093830",
- "primary_light": "#FF2F5E56",
- "accent": "#FFE34517",
- "accent_dark": "#FFC03A13",
- "accent_light": "#FFE76039",
- "background": "#FFFAFAFA",
- "background_dark": "#FFD4D4D4",
- "background_light": "#FFFAFAFA"
- },
- {
- "theme_name": "Vitamin Sea",
- "base_theme": "LIGHT",
- "primary": "#FF0359AE",
- "primary_dark": "#FF024B93",
- "primary_light": "#FF2871BA",
- "accent": "#FF14B09B",
- "accent_dark": "#FF119583",
- "accent_light": "#FF37BBA9",
- "background": "#FFEBE5D9",
- "background_dark": "#FFD4D4D4",
- "background_light": "#FFEEE8DE"
- },
- {
- "theme_name": "Textile Dyes",
- "base_theme": "LIGHT",
- "primary": "#FF32435F",
- "primary_dark": "#FF2A3850",
- "primary_light": "#FF505F77",
- "accent": "#FFEB9772",
- "accent_dark": "#FFC78060",
- "accent_light": "#FFEEA687",
- "background": "#FFFDDCCA",
- "background_dark": "#FFD7D1C5",
- "background_light": "#FFFDE1D1"
- },
- {
- "theme_name": "Brave",
- "base_theme": "DARK",
- "primary": "#FF3E9AB4",
- "primary_dark": "#FF348299",
- "primary_light": "#FF5AA9BF",
- "accent": "#FFEE6000",
- "accent_dark": "#FFCA5100",
- "accent_light": "#FFF07726",
- "background": "#FF1D1D24",
- "background_dark": "#FF18181E",
- "background_light": "#FF3E3E44"
- },
- {
- "theme_name": "Ashen",
- "base_theme": "DARK",
- "primary": "#FFFC474A",
- "primary_dark": "#FFD63C3E",
- "primary_light": "#FFFC6265",
- "accent": "#FF3BB7CB",
- "accent_dark": "#FF329BAC",
- "accent_light": "#FF58C1D2",
- "background": "#FF151919",
- "background_dark": "#FF111515",
- "background_light": "#FF383B3B"
- },
- {
- "theme_name": "RecognEyes",
- "base_theme": "DARK",
- "primary": "#FF00D0D0",
- "primary_dark": "#FF00B0B0",
- "primary_light": "#FF26D7D7",
- "accent": "#FFFF8080",
- "accent_dark": "#FFD86C6C",
- "accent_light": "#FFFF9393",
- "background": "#FF101020",
- "background_dark": "#FF0D0D1B",
- "background_light": "#FF333341"
- },
- {
- "theme_name": "Monokai",
- "base_theme": "DARK",
- "primary": "#FF66CCB3",
- "primary_dark": "#FF56AD98",
- "primary_light": "#FF7CD3BE",
- "accent": "#FF5B80BF",
- "accent_dark": "#FF4D6CA2",
- "accent_light": "#FF7393C8",
- "background": "#FF272822",
- "background_dark": "#FF21221C",
- "background_light": "#FF474843"
- },
- {
- "theme_name": "SigFig",
- "base_theme": "LIGHT",
- "primary": "#FFF7F6F3",
- "primary_dark": "#FF524E4A",
- "primary_light": "#FFF8F7F4",
- "accent": "#FFF05A50",
- "accent_dark": "#FFCC4C44",
- "accent_light": "#FFF2726A",
- "background": "#FFF0EEE8",
- "background_dark": "#FFCCCAC5",
- "background_light": "#FFF2F0EB"
- },
- {
- "theme_name": "SoundCloud",
- "base_theme": "LIGHT",
- "primary": "#FFFFFFFF",
- "primary_dark": "#FFD8D8D8",
- "primary_light": "#FFFFFFFF",
- "accent": "#FFE65100",
- "accent_dark": "#FFC34400",
- "accent_light": "#FFE96B26",
- "background": "#FFFFFFFF",
- "background_dark": "#FFD8D8D8",
- "background_light": "#FFFFFFFF"
- },
- {
- "theme_name": "Material light",
- "base_theme": "LIGHT",
- "primary": "#FF263238",
- "primary_dark": "#FF202A2F",
- "primary_light": "#FFC9D787",
- "accent": "#FF009688",
- "accent_dark": "#FF007F73",
- "accent_light": "#FFFFC0A9",
- "background": "#FFF3F3F3",
- "background_dark": "#FFCECECE",
- "background_light": "#FFF4F4F4"
- },
- {
- "theme_name": "Holo light",
- "base_theme": "LIGHT",
- "primary": "#FF222222",
- "primary_dark": "#FF1C1C1C",
- "primary_light": "#FF434343",
- "accent": "#FF00DDFF",
- "accent_dark": "#FF00BBD8",
- "accent_light": "#FF26E2FF",
- "background": "#FFF3F3F3",
- "background_dark": "#FFCECECE",
- "background_light": "#FFF4F4F4"
- },
- {
- "theme_name": "Material dark",
- "base_theme": "DARK",
- "primary": "#FF263238",
- "primary_dark": "#FF202A2F",
- "primary_light": "#FFC9D787",
- "accent": "#FF009688",
- "accent_dark": "#FF007F73",
- "accent_light": "#FFFFC0A9",
- "background": "#FF000000",
- "background_dark": "#FF000000",
- "background_light": "#FF262626"
- },
- {
- "theme_name": "Holo dark",
- "base_theme": "DARK",
- "primary": "#FF222222",
- "primary_dark": "#FF1C1C1C",
- "primary_light": "#FF434343",
- "accent": "#FF00DDFF",
- "accent_dark": "#FF00BBD8",
- "accent_light": "#FF26E2FF",
- "background": "#FF000000",
- "background_dark": "#FF000000",
- "background_light": "#FF262626"
- },
- {
- "theme_name": "Cherry pie",
- "base_theme": "DARK",
- "primary": "#FF46070B",
- "primary_dark": "#FF3B0509",
- "primary_light": "#FF612C2F",
- "accent": "#FFFC1604",
- "accent_dark": "#FFD61203",
- "accent_light": "#FFFC3829",
- "background": "#FF060000",
- "background_dark": "#FF050000",
- "background_light": "#FF2B2626"
- },
- {
- "theme_name": "Olive",
- "base_theme": "DARK",
- "primary": "#FF40411E",
- "primary_dark": "#FF363719",
- "primary_light": "#FF5C5D3F",
- "accent": "#FFC03000",
- "accent_dark": "#FFA32800",
- "accent_light": "#FFC94F26",
- "background": "#FF1B1C0B",
- "background_dark": "#FF161709",
- "background_light": "#FF3D3E2F"
- },
- {
- "theme_name": "Tasty",
- "base_theme": "LIGHT",
- "primary": "#FF437356",
- "primary_dark": "#FF386149",
- "primary_light": "#FF5F876F",
- "accent": "#FFF34A53",
- "accent_dark": "#FFCE3E46",
- "accent_light": "#FFF4656C",
- "background": "#FFFEF7E8",
- "background_dark": "#FFD7D1C5",
- "background_light": "#FFFEF8EB"
- },
- {
- "theme_name": "Desert",
- "base_theme": "LIGHT",
- "primary": "#FF5D3C1B",
- "primary_dark": "#FF4F3316",
- "primary_light": "#FF75593D",
- "accent": "#FF90A04A",
- "accent_dark": "#FF7A883E",
- "accent_light": "#FFA0AE65",
- "background": "#FFF3EEE4",
- "background_dark": "#FFCECAC1",
- "background_light": "#FFF4F0E8"
- },
- {
- "theme_name": "Weber",
- "base_theme": "LIGHT",
- "primary": "#FF729F98",
- "primary_dark": "#FF608781",
- "primary_light": "#FF87ADA7",
- "accent": "#FFAA863A",
- "accent_dark": "#FF907131",
- "accent_light": "#FFB69857",
- "background": "#FFF0ECEB",
- "background_dark": "#FFD4D4D4",
- "background_light": "#FFF2EEEE"
- },
- {
- "theme_name": "Philips",
- "base_theme": "LIGHT",
- "primary": "#FF2F435E",
- "primary_dark": "#FF27384F",
- "primary_light": "#FF4E5F76",
- "accent": "#FF4B5E65",
- "accent_dark": "#FF3F4F55",
- "accent_light": "#FF66767C",
- "background": "#FFECECEC",
- "background_dark": "#FFD4D4D4",
- "background_light": "#FFEEEEEE"
- },
- {
- "theme_name": "Instagram",
- "base_theme": "DARK",
- "primary": "#FF517FA4",
- "primary_dark": "#FF446B8B",
- "primary_light": "#FF6B92B1",
- "accent": "#FF517FA4",
- "accent_dark": "#FF446B8B",
- "accent_light": "#FF6B92B1",
- "background": "#FF161819",
- "background_dark": "#FF121415",
- "background_light": "#FF383A3B"
- },
- {
- "theme_name": "Reddit",
- "base_theme": "DARK",
- "primary": "#FF000000",
- "primary_dark": "#FF000000",
- "primary_light": "#FF262626",
- "accent": "#FFFF3D00",
- "accent_dark": "#FFD83300",
- "accent_light": "#FFFF5A26",
- "background": "#FF212121",
- "background_dark": "#FF1C1C1C",
- "background_light": "#FF424242"
- },
- {
- "theme_name": "Waaark",
- "base_theme": "DARK",
- "primary": "#FFF76C6C",
- "primary_dark": "#FFD15B5B",
- "primary_light": "#FFF88282",
- "accent": "#FFA8D0E6",
- "accent_dark": "#FF8EB0C3",
- "accent_light": "#FFB5D7E9",
- "background": "#FF24305E",
- "background_dark": "#FF1E284F",
- "background_light": "#FF444F76"
- },
- {
- "theme_name": "Flax",
- "base_theme": "DARK",
- "primary": "#FF2B2F48",
- "primary_dark": "#FF24273D",
- "primary_light": "#FF4A4E63",
- "accent": "#FFECBC1B",
- "accent_dark": "#FFC89F16",
- "accent_light": "#FFEEC63D",
- "background": "#FF21263A",
- "background_dark": "#FF1C2031",
- "background_light": "#FF424657"
- },
- {
- "theme_name": "Bing",
- "base_theme": "LIGHT",
- "primary": "#FFFFB900",
- "primary_dark": "#FFD89D00",
- "primary_light": "#FFFFC326",
- "accent": "#FF61B3DE",
- "accent_dark": "#FF5298BC",
- "accent_light": "#FF78BEE2",
- "background": "#FFFAFAFA",
- "background_dark": "#FFD4D4D4",
- "background_light": "#FFFAFAFA"
- },
- {
- "theme_name": "Meetup",
- "base_theme": "LIGHT",
- "primary": "#FFED1744",
- "primary_dark": "#FFC91339",
- "primary_light": "#FFEF3960",
- "accent": "#FF1DE9B6",
- "accent_dark": "#FF18C69A",
- "accent_light": "#FF3EECC0",
- "background": "#FFFAFAFA",
- "background_dark": "#FFD4D4D4",
- "background_light": "#FFFAFAFA"
- },
- {
- "theme_name": "Coffee",
- "base_theme": "LIGHT",
- "primary": "#FF562C22",
- "primary_dark": "#FF49251C",
- "primary_light": "#FF6F4B43",
- "accent": "#FFA55634",
- "accent_dark": "#FF8C492C",
- "accent_light": "#FFB26F52",
- "background": "#FFEEDFD8",
- "background_dark": "#FFCABDB7",
- "background_light": "#FFF0E3DD"
- },
- {
- "theme_name": "Sepia",
- "base_theme": "LIGHT",
- "primary": "#FF6D4C41",
- "primary_dark": "#FF5C4037",
- "primary_light": "#FF82665D",
- "accent": "#FFE64A19",
- "accent_dark": "#FFC33E15",
- "accent_light": "#FFE9653B",
- "background": "#FFF2F8E9",
- "background_dark": "#FFCDD2C6",
- "background_light": "#FFF3F9EC"
- },
- {
- "theme_name": "Oblivion",
- "base_theme": "DARK",
- "primary": "#FFD25252",
- "primary_dark": "#FFB24545",
- "primary_light": "#FFD86B6B",
- "accent": "#FF7FB347",
- "accent_dark": "#FF6B983C",
- "accent_light": "#FF92BE62",
- "background": "#FF1E1E1E",
- "background_dark": "#FF191919",
- "background_light": "#FF3F3F3F"
- },
- {
- "theme_name": "Obsidian",
- "base_theme": "DARK",
- "primary": "#FF678CB1",
- "primary_dark": "#FF577796",
- "primary_light": "#FF7D9DBC",
- "accent": "#FF93C763",
- "accent_dark": "#FF7CA954",
- "accent_light": "#FFA3CF7A",
- "background": "#FF293134",
- "background_dark": "#FF22292C",
- "background_light": "#FF494F52"
- },
- {
- "theme_name": "Forrest",
- "base_theme": "DARK",
- "primary": "#FF2C3801",
- "primary_dark": "#FF252F00",
- "primary_light": "#FF4B5527",
- "accent": "#FF9ECD68",
- "accent_dark": "#FF86AE58",
- "accent_light": "#FFACD47E",
- "background": "#FF0C1000",
- "background_dark": "#FF0A0D00",
- "background_light": "#FF303326"
- },
- {
- "theme_name": "Dawn",
- "base_theme": "DARK",
- "primary": "#FF65353E",
- "primary_dark": "#FF552D34",
- "primary_light": "#FF7C535A",
- "accent": "#FFD55246",
- "accent_dark": "#FFB5453B",
- "accent_light": "#FFDB6B61",
- "background": "#FF0C0006",
- "background_dark": "#FF0A0005",
- "background_light": "#FF30262B"
- },
- {
- "theme_name": "Twitter",
- "base_theme": "LIGHT",
- "primary": "#FF00ACED",
- "primary_dark": "#FF0084B4",
- "primary_light": "#FF26B8EF",
- "accent": "#FF00ACED",
- "accent_dark": "#FF0092C9",
- "accent_light": "#FF26B8EF",
- "background": "#FFFAFAFA",
- "background_dark": "#FFD4D4D4",
- "background_light": "#FFFAFAFA"
- },
- {
- "theme_name": "Periscope",
- "base_theme": "LIGHT",
- "primary": "#FF40A4C4",
- "primary_dark": "#FF368BA6",
- "primary_light": "#FF5CB1CC",
- "accent": "#FFD75444",
- "accent_dark": "#FFB64739",
- "accent_light": "#FFDD6D60",
- "background": "#FFFFFFFF",
- "background_dark": "#FFD8D8D8",
- "background_light": "#FFFFFFFF"
- },
- {
- "theme_name": "Subdued",
- "base_theme": "LIGHT",
- "primary": "#FF283B42",
- "primary_dark": "#FF223238",
- "primary_light": "#FF48585E",
- "accent": "#FF1D6A96",
- "accent_dark": "#FF185A7F",
- "accent_light": "#FF3E80A5",
- "background": "#FFE2EAE9",
- "background_dark": "#FFD4D4D4",
- "background_light": "#FFE6EDEC"
- },
- {
- "theme_name": "Misty Green",
- "base_theme": "LIGHT",
- "primary": "#FF003E19",
- "primary_dark": "#FF003415",
- "primary_light": "#FF265A3B",
- "accent": "#FF028C6A",
- "accent_dark": "#FF01775A",
- "accent_light": "#FF279D80",
- "background": "#FFD1EDE1",
- "background_dark": "#FFD4D4D4",
- "background_light": "#FFD7EFE5"
- },
- {
- "theme_name": "Waterfall",
- "base_theme": "DARK",
- "primary": "#FF1D3847",
- "primary_dark": "#FF182F3C",
- "primary_light": "#FF3E5562",
- "accent": "#FF03A9F4",
- "accent_dark": "#FF028FCF",
- "accent_light": "#FF28B5F5",
- "background": "#FF091318",
- "background_dark": "#FF071014",
- "background_light": "#FF2D363A"
- },
- {
- "theme_name": "Retro",
- "base_theme": "DARK",
- "primary": "#FF123943",
- "primary_dark": "#FF0F3038",
- "primary_light": "#FF35565F",
- "accent": "#FFAE2332",
- "accent_dark": "#FF931D2A",
- "accent_light": "#FFBA4450",
- "background": "#FF1C170D",
- "background_dark": "#FF17130B",
- "background_light": "#FF3E3931"
- },
- {
- "theme_name": "Inkpot",
- "base_theme": "DARK",
- "primary": "#FF6068B2",
- "primary_dark": "#FF515897",
- "primary_light": "#FF777EBD",
- "accent": "#FF5AC0FF",
- "accent_dark": "#FF4CA3D8",
- "accent_light": "#FF72C9FF",
- "background": "#FF1F1F27",
- "background_dark": "#FF1A1A21",
- "background_light": "#FF404047"
- },
- {
- "theme_name": "Vibrant Ink",
- "base_theme": "DARK",
- "primary": "#FFEC691E",
- "primary_dark": "#FFC85919",
- "primary_light": "#FFEE7F3F",
- "accent": "#FF9CF828",
- "accent_dark": "#FF84D222",
- "accent_light": "#FFAAF948",
- "background": "#FF191919",
- "background_dark": "#FF151515",
- "background_light": "#FF3B3B3B"
- },
- {
- "theme_name": "Fresh",
- "base_theme": "LIGHT",
- "primary": "#FF748A96",
- "primary_dark": "#FF62757F",
- "primary_light": "#FF889BA5",
- "accent": "#FF8A36BB",
- "accent_dark": "#FF752D9E",
- "accent_light": "#FF9B54C5",
- "background": "#FFFFFCF1",
- "background_dark": "#FFD4D4D4",
- "background_light": "#FFFFFCF3"
- },
- {
- "theme_name": "Cote azur",
- "base_theme": "LIGHT",
- "primary": "#FF00585F",
- "primary_dark": "#FF004A50",
- "primary_light": "#FF267177",
- "accent": "#FFFF3800",
- "accent_dark": "#FFD82F00",
- "accent_light": "#FFFF5526",
- "background": "#FFFAFAFA",
- "background_dark": "#FFD4D4D4",
- "background_light": "#FFFAFAFA"
- },
- {
- "theme_name": "QED",
- "base_theme": "LIGHT",
- "primary": "#FF22264B",
- "primary_dark": "#FF1C203F",
- "primary_light": "#FF434666",
- "accent": "#FFB56969",
- "accent_dark": "#FF995959",
- "accent_light": "#FFC07F7F",
- "background": "#FFE8EDF3",
- "background_dark": "#FFD4D4D4",
- "background_light": "#FFEBEFF4"
- },
- {
- "theme_name": "Vintage",
- "base_theme": "LIGHT",
- "primary": "#FF1D2125",
- "primary_dark": "#FF181C1F",
- "primary_light": "#FF3E4245",
- "accent": "#FF8C2D2D",
- "accent_dark": "#FF772626",
- "accent_light": "#FF9D4C4C",
- "background": "#FFFBF9E9",
- "background_dark": "#FFD6D3B7",
- "background_light": "#FFF8F8F8"
- },
- {
- "theme_name": "Spotify",
- "base_theme": "DARK",
- "primary": "#FF262626",
- "primary_dark": "#FF202020",
- "primary_light": "#FF464646",
- "accent": "#FF81B71A",
- "accent_dark": "#FF6D9B16",
- "accent_light": "#FF93C13C",
- "background": "#FF000000",
- "background_dark": "#FF000000",
- "background_light": "#FF262626"
- },
- {
- "theme_name": "Xbox",
- "base_theme": "DARK",
- "primary": "#FF107C10",
- "primary_dark": "#FF0D690D",
- "primary_light": "#FF338F33",
- "accent": "#FF5DC21E",
- "accent_dark": "#FF4FA419",
- "accent_light": "#FF75CB3F",
- "background": "#FF3A3A3A",
- "background_dark": "#FF313131",
- "background_light": "#FF575757"
- },
- {
- "theme_name": "Sublime",
- "base_theme": "DARK",
- "primary": "#FFFF007F",
- "primary_dark": "#FFD8006B",
- "primary_light": "#FFFF2692",
- "accent": "#FF52E3F6",
- "accent_dark": "#FF45C0D1",
- "accent_light": "#FF6BE7F7",
- "background": "#FF272822",
- "background_dark": "#FF21221C",
- "background_light": "#FF474843"
- },
- {
- "theme_name": "Zenburn",
- "base_theme": "DARK",
- "primary": "#FF3F3F6A",
- "primary_dark": "#FF35355A",
- "primary_light": "#FF5B5B80",
- "accent": "#FF8ACCCF",
- "accent_dark": "#FF75ADAF",
- "accent_light": "#FF9BD3D6",
- "background": "#FF404040",
- "background_dark": "#FF363636",
- "background_light": "#FF5C5C5C"
- },
- {
- "theme_name": "Starbucks",
- "base_theme": "LIGHT",
- "primary": "#FF00704A",
- "primary_dark": "#FF005F3E",
- "primary_light": "#FF268565",
- "accent": "#FF66442B",
- "accent_dark": "#FF5A3C26",
- "accent_light": "#FF6C482D",
- "background": "#FFFFFCFC",
- "background_dark": "#FFD3CCCC",
- "background_light": "#FFFFFFFF"
- },
- {
- "theme_name": "Amazon",
- "base_theme": "LIGHT",
- "primary": "#FFFF9900",
- "primary_dark": "#FFD88200",
- "primary_light": "#FFFFA826",
- "accent": "#FF146EB4",
- "accent_dark": "#FF115D99",
- "accent_light": "#FF3783BF",
- "background": "#FFFAFAFA",
- "background_dark": "#FFD4D4D4",
- "background_light": "#FFFAFAFA"
- },
- {
- "theme_name": "Twitch",
- "base_theme": "LIGHT",
- "primary": "#FF7E57C2",
- "primary_dark": "#FF6B49A4",
- "primary_light": "#FF9170CB",
- "accent": "#FF7E57C2",
- "accent_dark": "#FF6B49A4",
- "accent_light": "#FF9170CB",
- "background": "#FFEFEEF1",
- "background_dark": "#FFD7D1C5",
- "background_light": "#FFF1F0F3"
- },
- {
- "theme_name": "Robinhood",
- "base_theme": "LIGHT",
- "primary": "#FF1DE9B6",
- "primary_dark": "#FF18C69A",
- "primary_light": "#FF3EECC0",
- "accent": "#FF1DE9B6",
- "accent_dark": "#FF18C69A",
- "accent_light": "#FF3EECC0",
- "background": "#FFFAFAFA",
- "background_dark": "#FFD7D1C5",
- "background_light": "#FFFAFAFA"
- },
- {
- "theme_name": "Facebook",
- "base_theme": "LIGHT",
- "primary": "#FF3B5998",
- "primary_dark": "#FF324B81",
- "primary_light": "#FF5871A7",
- "accent": "#FF3B5998",
- "accent_dark": "#FF324B81",
- "accent_light": "#FF5871A7",
- "background": "#FFF7F7F7",
- "background_dark": "#FFD1D1D1",
- "background_light": "#FFF8F8F8"
- },
- {
- "theme_name": "Mint",
- "base_theme": "LIGHT",
- "primary": "#FF0AC775",
- "primary_dark": "#FF08A963",
- "primary_light": "#FF2ECF89",
- "accent": "#FFFD8A10",
- "accent_dark": "#FFF2890D",
- "accent_light": "#FFF39425",
- "background": "#FFFFFFFF",
- "background_dark": "#FFD8D8D8",
- "background_light": "#FFFFFFFF"
- }
-]
diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png
deleted file mode 100755
index 8705352c..00000000
Binary files a/app/src/main/ic_launcher-web.png and /dev/null differ
diff --git a/app/src/main/java/com/gsnathan/pdfviewer/AboutActivity.java b/app/src/main/java/com/gsnathan/pdfviewer/AboutActivity.java
deleted file mode 100755
index a2c1c9e1..00000000
--- a/app/src/main/java/com/gsnathan/pdfviewer/AboutActivity.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2018 Gokul Swaminathan
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.gsnathan.pdfviewer;
-
-import android.app.Dialog;
-import android.content.ActivityNotFoundException;
-import android.os.Bundle;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.DialogFragment;
-
-import com.franmontiel.attributionpresenter.AttributionPresenter;
-import com.franmontiel.attributionpresenter.entities.Attribution;
-import com.franmontiel.attributionpresenter.entities.License;
-import com.gsnathan.pdfviewer.databinding.ActivityAboutBinding;
-import com.jaredrummler.cyanea.app.CyaneaAppCompatActivity;
-
-public class AboutActivity extends CyaneaAppCompatActivity {
-
- private ActivityAboutBinding viewBinding;
- private final String APP_VERSION_RELEASE = "Version " + Utils.getAppVersion(); //contains Version + the version number
- private final String APP_VERSION_DEBUG = "Version " + Utils.getAppVersion() + "-debug"; //contains Version + the version number + debug
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- viewBinding = ActivityAboutBinding.inflate(getLayoutInflater());
- setContentView(viewBinding.getRoot());
- setVersionText();
- getSupportActionBar().setDisplayHomeAsUpEnabled(true);
- }
-
- private void setVersionText() {
- // check if app is debug
- if (BuildConfig.DEBUG) {
- viewBinding.versionTextView.setText(APP_VERSION_DEBUG);
- } else { //if app is release
- viewBinding.versionTextView.setText(APP_VERSION_RELEASE);
- }
- }
-
- public void replayIntro(View v) {
- //navigate to intro class (replay the intro)
- startActivity(Utils.navIntent(getApplicationContext(), MainIntroActivity.class));
- }
-
- public void showLog(View v) {
- Utils.showLog(this);
- }
-
- public void showPrivacy(View v) {
- new PrivacyInfoDialog().show(getSupportFragmentManager(), "privacy_dialog");
- }
-
- public void showLicense(View v) {
- startActivity(Utils.linkIntent("https://github.com/JavaCafe01/PdfViewer/blob/master/LICENSE"));
- }
-
- public void showLibraries(View v) {
- AttributionPresenter attributionPresenter = new AttributionPresenter.Builder(this)
- .addAttributions(
- new Attribution.Builder("AttributionPresenter")
- .addCopyrightNotice("Copyright 2017 Francisco José Montiel Navarro")
- .addLicense(License.APACHE)
- .setWebsite("https://github.com/franmontiel/AttributionPresenter")
- .build()
- )
- .addAttributions(
- new Attribution.Builder("Android PdfViewer")
- .addCopyrightNotice("Copyright 2017 Bartosz Schiller")
- .addLicense(License.APACHE)
- .setWebsite("https://github.com/barteksc/AndroidPdfViewer")
- .build()
- )
- .addAttributions(
- new Attribution.Builder("AppIntro")
- .addCopyrightNotice("Copyright 2018 Paolo Rotolo")
- .addLicense(License.APACHE)
- .setWebsite("https://github.com/paolorotolo/AppIntro")
- .build()
- )
- .addAttributions(
- new Attribution.Builder("Android Open Source Project")
- .addCopyrightNotice("Copyright 2016 The Android Open Source Project")
- .addLicense(License.APACHE)
- .setWebsite("http://developer.android.com/tools/support-library/index.html")
- .build()
- )
- .addAttributions(
- new Attribution.Builder("Android Support Libraries")
- .addCopyrightNotice("Copyright 2016 The Android Open Source Project")
- .addLicense(License.APACHE)
- .setWebsite("http://developer.android.com/tools/support-library/index.html")
- .build()
- )
- .addAttributions(
- new Attribution.Builder("Material Design Icons")
- .addCopyrightNotice("Copyright 2014, Austin Andrews")
- .addLicense("SIL Open Font", "https://github.com/Templarian/MaterialDesign/blob/master/LICENSE")
- .setWebsite("https://materialdesignicons.com/")
- .build()
- )
- .addAttributions(
- new Attribution.Builder("WhatsNew")
- .addCopyrightNotice("Copyright 2017 Lizhaotailang")
- .addLicense(License.MIT)
- .setWebsite("https://github.com/TonnyL/WhatsNew")
- .build()
- )
- .addAttributions(
- new Attribution.Builder("Cyanea")
- .addCopyrightNotice("Copyright 2018 Jared Rummler")
- .addLicense(License.APACHE)
- .setWebsite("https://github.com/jaredrummler/Cyanea")
- .build()
- )
- .build();
-
- //show license dialogue
- attributionPresenter.showDialog("Open Source Libraries");
- }
-
- public void emailDev(View v) {
- String email = "gokulswamilive@gmail.com";
- try {
- startActivity(Utils.emailIntent(email, "Pdf Viewer Plus", APP_VERSION_RELEASE));
- } catch (ActivityNotFoundException e) {
- Toast.makeText(this, email, Toast.LENGTH_SHORT).show();
- }
- }
-
- public void navToGit(View v) {
- startActivity(Utils.linkIntent("https://github.com/JavaCafe01"));
- }
-
- public void navToSourceCode(View v) {
- startActivity(Utils.linkIntent("https://github.com/JavaCafe01/PdfViewer"));
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- if (item.getItemId() == android.R.id.home) {
- onBackPressed();
- return true;
- }
- return false;
- }
-
- public static class PrivacyInfoDialog extends DialogFragment {
- @NonNull
- @Override
- public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
- AlertDialog.Builder builder = new AlertDialog.Builder(requireContext());
- return builder.setTitle(R.string.privacy)
- .setMessage(R.string.privacy_info)
- .setPositiveButton(R.string.ok, (dialog, which) -> {})
- .setIcon(R.drawable.privacy_icon)
- .create();
- }
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/gsnathan/pdfviewer/App.java b/app/src/main/java/com/gsnathan/pdfviewer/App.java
deleted file mode 100755
index 8fbe6f50..00000000
--- a/app/src/main/java/com/gsnathan/pdfviewer/App.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.gsnathan.pdfviewer;
-
-import android.app.Application;
-import android.content.res.Configuration;
-
-import com.jaredrummler.cyanea.Cyanea;
-
-public class App extends Application {
-
- @Override
- public void onCreate() {
- super.onCreate();
- Cyanea.init(this, getResources());
- }
-
- @Override
- public void onConfigurationChanged(Configuration newConfig) {
- super.onConfigurationChanged(newConfig);
- }
-
- @Override
- public void onLowMemory() {
- super.onLowMemory();
- }
-}
diff --git a/app/src/main/java/com/gsnathan/pdfviewer/DownloadPDFFile.java b/app/src/main/java/com/gsnathan/pdfviewer/DownloadPDFFile.java
deleted file mode 100644
index ce0f03e4..00000000
--- a/app/src/main/java/com/gsnathan/pdfviewer/DownloadPDFFile.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.gsnathan.pdfviewer;
-
-import android.os.AsyncTask;
-import android.util.Log;
-import android.widget.Toast;
-
-import java.io.IOException;
-import java.lang.ref.WeakReference;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-import javax.net.ssl.SSLException;
-
-import static java.net.HttpURLConnection.HTTP_OK;
-
-/**
- * This class is used to get a PDF File from an URL
- */
-public class DownloadPDFFile extends AsyncTask {
-
- private final WeakReference mainActivityWR;
-
- public DownloadPDFFile(MainActivity activity) {
- mainActivityWR = new WeakReference<>(activity);
- }
-
- @Override
- protected Object doInBackground(String... strings) {
- String url = strings[0];
- HttpURLConnection httpConnection = null;
-
- try {
- httpConnection = (HttpURLConnection) new URL(url).openConnection();
- httpConnection.connect();
- int responseCode = httpConnection.getResponseCode();
- if (responseCode == HTTP_OK) {
- return Utils.readBytesToEnd(httpConnection.getInputStream());
- } else {
- Log.e("DownloadPDFFile", "Error during http request, response code : " + responseCode);
- return responseCode;
- }
- } catch (IOException e) {
- Log.e("DownloadPDFFile", "Error cannot get file at URL : " + url, e);
- return e;
- } finally {
- if (httpConnection != null) {
- httpConnection.disconnect();
- }
- }
- }
-
- @Override
- protected void onPostExecute(Object result) {
- MainActivity activity = mainActivityWR.get();
-
- if (activity != null) {
- activity.hideProgressBar();
-
- if (result == null) {
- Toast.makeText(activity, R.string.toast_generic_download_error, Toast.LENGTH_LONG).show();
- } else if (result instanceof Integer) {
- Toast.makeText(activity, R.string.toast_http_code_error, Toast.LENGTH_LONG).show();
- } else if (result instanceof SSLException) {
- Toast.makeText(activity, R.string.toast_ssl_error, Toast.LENGTH_LONG).show();
- } else if (result instanceof IOException) {
- Toast.makeText(activity, R.string.toast_generic_download_error, Toast.LENGTH_LONG).show();
- } else if (result instanceof byte[]) {
- activity.saveToFileAndDisplay((byte[]) result);
- }
- }
- }
-}
diff --git a/app/src/main/java/com/gsnathan/pdfviewer/MainActivity.java b/app/src/main/java/com/gsnathan/pdfviewer/MainActivity.java
deleted file mode 100755
index 8b62c557..00000000
--- a/app/src/main/java/com/gsnathan/pdfviewer/MainActivity.java
+++ /dev/null
@@ -1,549 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2018 Gokul Swaminathan
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.gsnathan.pdfviewer;
-
-import android.Manifest;
-import android.app.ActivityManager;
-import android.app.Dialog;
-import android.content.ActivityNotFoundException;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.database.Cursor;
-import android.graphics.Color;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.StrictMode;
-import android.preference.PreferenceManager;
-import android.print.PrintManager;
-import android.provider.OpenableColumns;
-import android.util.Log;
-import android.view.WindowManager;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.Window;
-import android.widget.Toast;
-
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts.OpenDocument;
-import androidx.activity.result.contract.ActivityResultContracts.RequestPermission;
-import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-import androidx.core.content.ContextCompat;
-import androidx.fragment.app.DialogFragment;
-
-import com.github.barteksc.pdfviewer.PDFView;
-import com.github.barteksc.pdfviewer.scroll.DefaultScrollHandle;
-import com.github.barteksc.pdfviewer.util.Constants;
-import com.github.barteksc.pdfviewer.util.FitPolicy;
-import com.gsnathan.pdfviewer.databinding.ActivityMainBinding;
-import com.gsnathan.pdfviewer.databinding.PasswordDialogBinding;
-import com.jaredrummler.cyanea.Cyanea;
-import com.jaredrummler.cyanea.app.CyaneaAppCompatActivity;
-import com.jaredrummler.cyanea.prefs.CyaneaSettingsActivity;
-import com.shockwave.pdfium.PdfDocument;
-import com.shockwave.pdfium.PdfPasswordException;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-import static android.content.pm.PackageManager.PERMISSION_GRANTED;
-
-public class MainActivity extends CyaneaAppCompatActivity {
-
- private static final String TAG = "MainActivity";
-
- private PrintManager mgr;
- private SharedPreferences prefManager;
-
- private Uri uri;
- private int pageNumber = 0;
- private String pdfPassword;
- private String pdfFileName = "";
-
- private byte[] downloadedPdfFileContent;
-
- private boolean isBottomNavigationHidden = false;
- private boolean isFullscreenToggled = false;
-
- private ActivityMainBinding viewBinding;
-
- private final ActivityResultLauncher documentPickerLauncher = registerForActivityResult(
- new OpenDocument(),
- this::openSelectedDocument
- );
-
- private final ActivityResultLauncher saveToDownloadPermissionLauncher = registerForActivityResult(
- new RequestPermission(),
- this::saveDownloadedFileAfterPermissionRequest
- );
-
- private final ActivityResultLauncher readFileErrorPermissionLauncher = registerForActivityResult(
- new RequestPermission(),
- this::restartAppIfGranted
- );
-
- private final ActivityResultLauncher settingsLauncher = registerForActivityResult(
- new StartActivityForResult(),
- result -> displayFromUri(uri)
- );
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- viewBinding = ActivityMainBinding.inflate(getLayoutInflater());
- setContentView(viewBinding.getRoot());
-
- Constants.THUMBNAIL_RATIO = 1f;
- setBottomBarListeners();
-
- // Workaround for https://stackoverflow.com/questions/38200282/
- StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
- StrictMode.setVmPolicy(builder.build());
-
- prefManager = PreferenceManager.getDefaultSharedPreferences(this);
-
- mgr = (PrintManager) getSystemService(PRINT_SERVICE);
- onFirstInstall();
- onFirstUpdate();
-
- if (savedInstanceState != null) {
- restoreInstanceState(savedInstanceState);
- } else {
- uri = getIntent().getData();
- if (uri == null)
- pickFile();
- }
- displayFromUri(uri);
- }
-
- @Override
- public void onResume() {
- super.onResume();
- getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
- if (prefManager.getBoolean("screen_on_pref", false)) {
- getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
- }
- // Workaround for android:background XML attribute not being applied on all devices
- viewBinding.bottomNavigation.setBackgroundColor(Cyanea.getInstance().getPrimary());
- }
-
- private void onFirstInstall() {
- boolean isFirstRun = prefManager.getBoolean("FIRSTINSTALL", true);
- if (isFirstRun) {
- startActivity(new Intent(this, MainIntroActivity.class));
- SharedPreferences.Editor editor = prefManager.edit();
- editor.putBoolean("FIRSTINSTALL", false);
- editor.apply();
- }
- }
-
- private void onFirstUpdate() {
- boolean isFirstRun = prefManager.getBoolean(Utils.getAppVersion(), true);
- if (isFirstRun) {
- Utils.showLog(this);
- SharedPreferences.Editor editor = prefManager.edit();
- editor.putBoolean(Utils.getAppVersion(), false);
- editor.apply();
- }
- }
-
- @Override
- protected void onSaveInstanceState(@NonNull Bundle outState) {
- outState.putParcelable("uri", uri);
- outState.putInt("pageNumber", pageNumber);
- outState.putString("pdfPassword", pdfPassword);
- super.onSaveInstanceState(outState);
- }
-
- private void restoreInstanceState(Bundle savedState) {
- uri = savedState.getParcelable("uri");
- pageNumber = savedState.getInt("pageNumber");
- pdfPassword = savedState.getString("pdfPassword");
- }
-
- void shareFile() {
- Intent sharingIntent;
- if (uri.getScheme() != null && uri.getScheme().startsWith("http")) {
- sharingIntent = Utils.plainTextShareIntent(getString(R.string.share), uri.toString());
- } else {
- sharingIntent = Utils.fileShareIntent(getString(R.string.share), pdfFileName, uri);
- }
- startActivity(sharingIntent);
- }
-
- private void openSelectedDocument(Uri selectedDocumentUri) {
- if (selectedDocumentUri == null) {
- return;
- }
-
- if (uri == null || selectedDocumentUri.equals(uri)) {
- uri = selectedDocumentUri;
- displayFromUri(uri);
- } else {
- Intent intent = new Intent(this, getClass());
- intent.setData(selectedDocumentUri);
- startActivity(intent);
- }
- }
-
- private void pickFile() {
- try {
- documentPickerLauncher.launch(new String[] { "application/pdf" });
- } catch (ActivityNotFoundException e) {
- //alert user that file manager not working
- Toast.makeText(this, R.string.toast_pick_file_error, Toast.LENGTH_SHORT).show();
- }
- }
-
- private void setBottomBarListeners() {
- viewBinding.bottomNavigation.setOnNavigationItemSelectedListener(item -> {
- switch (item.getItemId()) {
- case R.id.pickFile:
- pickFile();
- break;
- case R.id.metaFile:
- if (uri != null)
- showPdfMetaDialog();
- break;
- case R.id.shareFile:
- if (uri != null)
- shareFile();
- break;
- case R.id.printFile:
- if (uri != null)
- printDocument();
- break;
- case R.id.fullscreen:
- toggleFullscreen();
- return true;
- default:
- break;
- }
- return false;
- });
- }
-
- void configurePdfViewAndLoad(PDFView.Configurator viewConfigurator) {
- if (!prefManager.getBoolean("pdftheme_pref", false)) {
- viewBinding.pdfView.setBackgroundColor(Color.LTGRAY);
- } else {
- viewBinding.pdfView.setBackgroundColor(0xFF212121);
- }
- viewBinding.pdfView.useBestQuality(prefManager.getBoolean("quality_pref", false));
- viewBinding.pdfView.setMinZoom(0.5f);
- viewBinding.pdfView.setMidZoom(2.0f);
- viewBinding.pdfView.setMaxZoom(5.0f);
- viewConfigurator
- .defaultPage(pageNumber)
- .onPageChange(this::setCurrentPage)
- .enableAnnotationRendering(true)
- .enableAntialiasing(prefManager.getBoolean("alias_pref", true))
- .onTap(this::toggleBottomNavigationVisibility)
- .onPageScroll(this::toggleBottomNavigationAccordingToPosition)
- .scrollHandle(new DefaultScrollHandle(this))
- .spacing(10) // in dp
- .onError(this::handleFileOpeningError)
- .onPageError((page, err) -> Log.e(TAG, "Cannot load page " + page, err))
- .pageFitPolicy(FitPolicy.WIDTH)
- .password(pdfPassword)
- .swipeHorizontal(prefManager.getBoolean("scroll_pref", false))
- .autoSpacing(prefManager.getBoolean("scroll_pref", false))
- .pageSnap(prefManager.getBoolean("snap_pref", false))
- .pageFling(prefManager.getBoolean("fling_pref", false))
- .nightMode(prefManager.getBoolean("pdftheme_pref", false))
- .load();
- }
-
- private void handleFileOpeningError(Throwable exception) {
- if (exception instanceof PdfPasswordException) {
- if (pdfPassword != null) {
- Toast.makeText(this, R.string.wrong_password, Toast.LENGTH_SHORT).show();
- pdfPassword = null; // prevent the toast from being shown again if the user rotates the screen
- }
- askForPdfPassword();
- } else if (couldNotOpenFileDueToMissingPermission(exception)) {
- readFileErrorPermissionLauncher.launch(Manifest.permission.READ_EXTERNAL_STORAGE);
- } else {
- Toast.makeText(this, R.string.file_opening_error, Toast.LENGTH_LONG).show();
- Log.e(TAG, "Error when opening file", exception);
- }
- }
-
- private boolean couldNotOpenFileDueToMissingPermission(Throwable e) {
- if (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) == PERMISSION_GRANTED)
- return false;
-
- String exceptionMessage = e.getMessage();
- return e instanceof FileNotFoundException &&
- exceptionMessage != null && exceptionMessage.contains("Permission denied");
- }
-
- private void restartAppIfGranted(boolean isPermissionGranted) {
- if (isPermissionGranted) {
- // This is a quick and dirty way to make the system restart the current activity *and the current app process*.
- // This is needed because on Android 6 storage permission grants do not take effect until
- // the app process is restarted.
- System.exit(0);
- } else {
- Toast.makeText(this, R.string.file_opening_error, Toast.LENGTH_LONG).show();
- }
- }
-
- private void toggleBottomNavigationAccordingToPosition(int page, float positionOffset) {
- if (positionOffset == 0) {
- showBottomNavigationView();
- } else if (!isBottomNavigationHidden) {
- hideBottomNavigationView();
- }
- }
-
- private boolean toggleBottomNavigationVisibility(MotionEvent e) {
- if (isBottomNavigationHidden) {
- showBottomNavigationView();
- } else {
- hideBottomNavigationView();
- }
- return true;
- }
-
- private void hideBottomNavigationView() {
- isBottomNavigationHidden = true;
- viewBinding.bottomNavigation.animate()
- .translationY(viewBinding.bottomNavigation.getHeight())
- .setDuration(100);
- }
-
- private void showBottomNavigationView() {
- isBottomNavigationHidden = false;
- viewBinding.bottomNavigation.animate()
- .translationY(0)
- .setDuration(100);
- }
-
- private void toggleFullscreen() {
- final View view = viewBinding.pdfView;
- if (!isFullscreenToggled) {
- getSupportActionBar().hide();
- isFullscreenToggled = true;
- view.setSystemUiVisibility(
- View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
- | View.SYSTEM_UI_FLAG_FULLSCREEN
- | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
- } else {
- getSupportActionBar().show();
- isFullscreenToggled = false;
- view.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
- }
- }
-
- void displayFromUri(Uri uri) {
- if (uri == null) {
- setTitle("");
- return;
- }
-
- pdfFileName = getFileName(uri);
- setTitle(pdfFileName);
- setTaskDescription(new ActivityManager.TaskDescription(pdfFileName));
-
- String scheme = uri.getScheme();
- if (scheme != null && scheme.contains("http")) {
- downloadOrShowDownloadedFile(uri);
- } else {
- configurePdfViewAndLoad(viewBinding.pdfView.fromUri(uri));
- }
- }
-
- private void downloadOrShowDownloadedFile(Uri uri) {
- if (downloadedPdfFileContent == null) {
- downloadedPdfFileContent = (byte[]) getLastCustomNonConfigurationInstance();
- }
- if (downloadedPdfFileContent != null) {
- configurePdfViewAndLoad(viewBinding.pdfView.fromBytes(downloadedPdfFileContent));
- } else {
- // we will get the pdf asynchronously with the DownloadPDFFile object
- viewBinding.progressBar.setVisibility(View.VISIBLE);
- DownloadPDFFile downloadPDFFile = new DownloadPDFFile(this);
- downloadPDFFile.execute(uri.toString());
- }
- }
-
- @Override
- public Object onRetainCustomNonConfigurationInstance() {
- return downloadedPdfFileContent;
- }
-
- public void hideProgressBar() {
- viewBinding.progressBar.setVisibility(View.GONE);
- }
-
- void saveToFileAndDisplay(byte[] pdfFileContent) {
- downloadedPdfFileContent = pdfFileContent;
- saveToDownloadFolderIfAllowed(pdfFileContent);
- configurePdfViewAndLoad(viewBinding.pdfView.fromBytes(pdfFileContent));
- }
-
- private void saveToDownloadFolderIfAllowed(byte[] fileContent) {
- if (Utils.canWriteToDownloadFolder(this)) {
- trySaveToDownloadFolder(fileContent, false);
- } else {
- saveToDownloadPermissionLauncher.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE);
- }
- }
-
- private void trySaveToDownloadFolder(byte[] fileContent, boolean showSuccessMessage) {
- try {
- File downloadDirectory = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
- Utils.writeBytesToFile(downloadDirectory, pdfFileName, fileContent);
- if (showSuccessMessage) {
- Toast.makeText(this, R.string.saved_to_download, Toast.LENGTH_SHORT).show();
- }
- } catch (IOException e) {
- Log.e(TAG, "Error while saving file to download folder", e);
- Toast.makeText(this, R.string.save_to_download_failed, Toast.LENGTH_SHORT).show();
- }
- }
-
- private void saveDownloadedFileAfterPermissionRequest(boolean isPermissionGranted) {
- if (isPermissionGranted) {
- trySaveToDownloadFolder(downloadedPdfFileContent, true);
- } else {
- Toast.makeText(this, R.string.save_to_download_failed, Toast.LENGTH_SHORT).show();
- }
- }
-
- void navToSettings() {
- settingsLauncher.launch(new Intent(this, SettingsActivity.class));
- }
-
- private void setCurrentPage(int page, int pageCount) {
- pageNumber = page;
- setTitle(String.format("%s %s / %s", pdfFileName + " ", page + 1, pageCount));
- }
-
- public String getFileName(Uri uri) {
- String result = null;
- if (uri.getScheme() != null && uri.getScheme().equals("content")) {
- try (Cursor cursor = getContentResolver().query(uri, null, null, null, null)) {
- if (cursor != null && cursor.moveToFirst()) {
- int indexDisplayName = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
- if (indexDisplayName != -1) {
- result = cursor.getString(indexDisplayName);
- }
- }
- } catch (Exception e) {
- Log.w(TAG, "Couldn't retrieve file name", e);
- }
- }
- if (result == null) {
- result = uri.getLastPathSegment();
- }
- return result;
- }
-
- private void printDocument() {
- mgr.print(pdfFileName, new PdfDocumentAdapter(this, uri), null);
- }
-
- void askForPdfPassword() {
- PasswordDialogBinding dialogBinding = PasswordDialogBinding.inflate(getLayoutInflater());
- AlertDialog alert = new AlertDialog.Builder(this)
- .setTitle(R.string.protected_pdf)
- .setView(dialogBinding.getRoot())
- .setPositiveButton(R.string.ok, (dialog, which) -> {
- pdfPassword = dialogBinding.passwordInput.getText().toString();
- displayFromUri(uri);
- })
- .setIcon(R.drawable.lock_icon)
- .create();
- alert.setCanceledOnTouchOutside(false);
- alert.show();
- }
-
- void showPdfMetaDialog() {
- PdfDocument.Meta meta = viewBinding.pdfView.getDocumentMeta();
- if (meta != null) {
- Bundle dialogArgs = new Bundle();
- dialogArgs.putString(PdfMetaDialog.TITLE_ARGUMENT, meta.getTitle());
- dialogArgs.putString(PdfMetaDialog.AUTHOR_ARGUMENT, meta.getAuthor());
- dialogArgs.putString(PdfMetaDialog.CREATION_DATE_ARGUMENT, meta.getCreationDate());
- DialogFragment dialog = new PdfMetaDialog();
- dialog.setArguments(dialogArgs);
- dialog.show(getSupportFragmentManager(), "meta_dialog");
- }
- }
-
- @Override
- public boolean onCreateOptionsMenu(@NotNull Menu menu) {
- getMenuInflater().inflate(R.menu.menu, menu);
- return true;
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case R.id.action_about:
- startActivity(Utils.navIntent(this, AboutActivity.class));
- return true;
- case R.id.theme:
- startActivity(Utils.navIntent(getApplicationContext(), CyaneaSettingsActivity.class));
- return true;
- case R.id.settings:
- navToSettings();
- return true;
- default:
- return super.onOptionsItemSelected(item);
- }
- }
-
- public static class PdfMetaDialog extends DialogFragment {
-
- public static final String TITLE_ARGUMENT = "title";
- public static final String AUTHOR_ARGUMENT = "author";
- public static final String CREATION_DATE_ARGUMENT = "creation_date";
-
- @NonNull
- @Override
- public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
- AlertDialog.Builder builder = new AlertDialog.Builder(requireContext());
- return builder.setTitle(R.string.meta)
- .setMessage(getString(R.string.pdf_title, getArguments().getString(TITLE_ARGUMENT)) + "\n" +
- getString(R.string.pdf_author, getArguments().getString(AUTHOR_ARGUMENT)) + "\n" +
- getString(R.string.pdf_creation_date, getArguments().getString(CREATION_DATE_ARGUMENT)))
- .setPositiveButton(R.string.ok, (dialog, which) -> {})
- .setIcon(R.drawable.info_icon)
- .create();
- }
- }
-}
-
diff --git a/app/src/main/java/com/gsnathan/pdfviewer/MainActivity.kt b/app/src/main/java/com/gsnathan/pdfviewer/MainActivity.kt
new file mode 100644
index 00000000..24cb4a93
--- /dev/null
+++ b/app/src/main/java/com/gsnathan/pdfviewer/MainActivity.kt
@@ -0,0 +1,43 @@
+package com.gsnathan.pdfviewer
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import com.gsnathan.pdfviewer.ui.theme.PdfviewerTheme
+
+class MainActivity : ComponentActivity() {
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContent {
+ PdfviewerTheme {
+ // A surface container using the 'background' color from the theme
+ Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background) {
+ Greeting("Android")
+ }
+ }
+ }
+ }
+}
+
+@Composable
+fun Greeting(name: String, modifier: Modifier = Modifier) {
+ Text(
+ text = "Hello $name!",
+ modifier = modifier
+ )
+}
+
+@Preview(showBackground = true)
+@Composable
+fun GreetingPreview() {
+ PdfviewerTheme {
+ Greeting("Android")
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/gsnathan/pdfviewer/MainIntroActivity.java b/app/src/main/java/com/gsnathan/pdfviewer/MainIntroActivity.java
deleted file mode 100755
index 4e68ab71..00000000
--- a/app/src/main/java/com/gsnathan/pdfviewer/MainIntroActivity.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2018 Gokul Swaminathan
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.gsnathan.pdfviewer;
-
-import android.Manifest;
-import android.graphics.Color;
-import android.os.Build;
-import android.os.Bundle;
-
-import com.github.paolorotolo.appintro.AppIntro;
-import com.github.paolorotolo.appintro.AppIntroFragment;
-import com.github.paolorotolo.appintro.model.SliderPage;
-import com.jaredrummler.cyanea.prefs.CyaneaThemePickerActivity;
-
-import androidx.fragment.app.Fragment;
-
-public class MainIntroActivity extends AppIntro {
-
- int bg = Color.parseColor("#2481a1");
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- getSupportActionBar().hide();
-
- SliderPage first = new SliderPage();
- first.setTitle(getString(R.string.title_intro));
- first.setDescription(getString(R.string.description__intro));
- first.setImageDrawable(R.mipmap.ic_launcher);
- first.setBgColor(bg);
- addSlide(AppIntroFragment.newInstance(first));
-
- SliderPage second = new SliderPage();
- second.setTitle(getString(R.string.title_open));
- second.setDescription(getString(R.string.description_open));
- second.setImageDrawable(R.drawable.opensource_wide);
- second.setBgColor(bg);
- addSlide(AppIntroFragment.newInstance(second));
-
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
- SliderPage third = new SliderPage();
- third.setTitle(getString(R.string.title_permission));
- third.setDescription(getString(R.string.description__permission));
- third.setImageDrawable(R.drawable.patterns_permissions);
- third.setBgColor(bg);
- addSlide(AppIntroFragment.newInstance(third));
- askForPermissions(new String[]{ Manifest.permission.READ_EXTERNAL_STORAGE }, 3);
- }
-
- showSkipButton(false);
- showStatusBar(false);
- setNavBarColor("#2481a1");
- }
-
- @Override
- public void onDonePressed(Fragment currentFragment) {
- super.onDonePressed(currentFragment);
- finish();
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/gsnathan/pdfviewer/PdfDocumentAdapter.java b/app/src/main/java/com/gsnathan/pdfviewer/PdfDocumentAdapter.java
deleted file mode 100644
index 5483bf3f..00000000
--- a/app/src/main/java/com/gsnathan/pdfviewer/PdfDocumentAdapter.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.gsnathan.pdfviewer;
-
-import android.content.Context;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.CancellationSignal;
-import android.os.ParcelFileDescriptor;
-import android.print.PageRange;
-import android.print.PrintAttributes;
-import android.print.PrintDocumentInfo;
-import android.util.Log;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-class PdfDocumentAdapter extends ThreadedPrintDocumentAdapter {
-
- private final Uri documentUri;
-
- PdfDocumentAdapter(Context ctxt, Uri documentUri) {
- super(ctxt);
- this.documentUri = documentUri;
- }
-
- @Override
- LayoutJob buildLayoutJob(PrintAttributes oldAttributes,
- PrintAttributes newAttributes,
- CancellationSignal cancellationSignal,
- LayoutResultCallback callback, Bundle extras) {
- return new PdfLayoutJob(oldAttributes, newAttributes, cancellationSignal, callback, extras);
- }
-
- @Override
- WriteJob buildWriteJob(PageRange[] pages,
- ParcelFileDescriptor destination,
- CancellationSignal cancellationSignal,
- WriteResultCallback callback, Context ctxt) {
- return new PdfWriteJob(pages, destination, cancellationSignal, callback, ctxt);
- }
-
- private static class PdfLayoutJob extends LayoutJob {
- PdfLayoutJob(PrintAttributes oldAttributes,
- PrintAttributes newAttributes,
- CancellationSignal cancellationSignal,
- LayoutResultCallback callback, Bundle extras) {
- super(oldAttributes, newAttributes, cancellationSignal, callback, extras);
- }
-
- @Override
- public void run() {
- if (cancellationSignal.isCanceled()) {
- callback.onLayoutCancelled();
- } else {
- PrintDocumentInfo.Builder builder = new PrintDocumentInfo.Builder("document.pdf");
-
- builder.setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
- .setPageCount(PrintDocumentInfo.PAGE_COUNT_UNKNOWN)
- .build();
-
- callback.onLayoutFinished(builder.build(), !newAttributes.equals(oldAttributes));
- }
- }
- }
-
- private class PdfWriteJob extends WriteJob {
-
- PdfWriteJob(PageRange[] pages, ParcelFileDescriptor destination,
- CancellationSignal cancellationSignal,
- WriteResultCallback callback, Context ctxt) {
- super(pages, destination, cancellationSignal, callback, ctxt);
- }
-
- @Override
- public void run() {
- InputStream in = null;
- OutputStream out = null;
-
- try {
- in = ctxt.getContentResolver().openInputStream(documentUri);
- out = new FileOutputStream(destination.getFileDescriptor());
-
- byte[] buf = new byte[16384];
- int size;
- while ((size = in.read(buf)) >= 0
- && !cancellationSignal.isCanceled()) {
- out.write(buf, 0, size);
- }
-
- if (cancellationSignal.isCanceled()) {
- callback.onWriteCancelled();
- } else {
- callback.onWriteFinished(new PageRange[] { PageRange.ALL_PAGES });
- }
- } catch (Exception e) {
- callback.onWriteFailed(e.getMessage());
- Log.e(getClass().getSimpleName(), "Exception printing PDF", e);
- } finally {
- try {
- in.close();
- out.close();
- } catch (IOException e) {
- Log.e(getClass().getSimpleName(), "Exception cleaning up from printing PDF", e);
- }
- }
- }
- }
-}
diff --git a/app/src/main/java/com/gsnathan/pdfviewer/SettingsActivity.java b/app/src/main/java/com/gsnathan/pdfviewer/SettingsActivity.java
deleted file mode 100644
index 2a004c5b..00000000
--- a/app/src/main/java/com/gsnathan/pdfviewer/SettingsActivity.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.gsnathan.pdfviewer;
-
-import android.content.ComponentName;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.preference.Preference;
-import android.util.Log;
-import android.util.TypedValue;
-import android.view.MenuItem;
-import android.view.View;
-
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.widget.Toolbar;
-
-import com.jaredrummler.cyanea.app.CyaneaPreferenceActivity;
-
-import org.jetbrains.annotations.Nullable;
-
-import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
-import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
-import static android.content.pm.PackageManager.DONT_KILL_APP;
-import static android.util.TypedValue.COMPLEX_UNIT_DIP;
-
-public class SettingsActivity extends CyaneaPreferenceActivity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- setupActionBar();
- addPreferencesFromResource(R.xml.preferences);
- setupShowInLauncherPreference();
- }
-
- private void setupShowInLauncherPreference() {
- Preference showInLauncherPref = findPreference("show_in_launcher");
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
- // Starting from Android Q it is not possible anymore to hide the app from launcher
- // See https://developer.android.com/reference/android/content/pm/LauncherApps#getActivityList(java.lang.String,%20android.os.UserHandle)
- getPreferenceScreen().removePreference(showInLauncherPref);
- } else {
- setOptionsListTopMargin();
- showInLauncherPref.setOnPreferenceChangeListener((preference, newValue) -> {
- try {
- setLauncherAliasState((boolean) newValue);
- return true;
- } catch (Exception ignored) {
- return false;
- }
- });
- }
- }
-
- private void setOptionsListTopMargin() {
- int marginSize = (int) TypedValue.applyDimension(COMPLEX_UNIT_DIP, 10, getResources().getDisplayMetrics());
- View marginView = new View(this);
- marginView.setMinimumHeight(marginSize);
- getListView().addHeaderView(marginView, null, false);
- }
-
- private void setLauncherAliasState(boolean enableAlias) {
- getPackageManager().setComponentEnabledSetting(
- new ComponentName(this, "com.gsnathan.pdfviewer.LauncherAlias"),
- enableAlias ? COMPONENT_ENABLED_STATE_ENABLED : COMPONENT_ENABLED_STATE_DISABLED,
- DONT_KILL_APP
- );
- }
-
- private void setupActionBar() {
- ActionBar actionBar = getSupportActionBar();
- if (actionBar != null)
- actionBar.setDisplayHomeAsUpEnabled(true);
- }
-
- @Override
- public boolean onMenuItemSelected(int featureId, MenuItem item) {
- int id = item.getItemId();
- if (id == android.R.id.home) {
- if (!super.onMenuItemSelected(featureId, item)) {
- onBackPressed();
- }
- return true;
- }
- return super.onMenuItemSelected(featureId, item);
- }
-
- @Override
- public void setSupportActionBar(@Nullable Toolbar toolbar) {
- getDelegate().setSupportActionBar(toolbar);
- }
-}
diff --git a/app/src/main/java/com/gsnathan/pdfviewer/ThreadedPrintDocumentAdapter.java b/app/src/main/java/com/gsnathan/pdfviewer/ThreadedPrintDocumentAdapter.java
deleted file mode 100644
index 1281a2eb..00000000
--- a/app/src/main/java/com/gsnathan/pdfviewer/ThreadedPrintDocumentAdapter.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.gsnathan.pdfviewer;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.os.CancellationSignal;
-import android.os.ParcelFileDescriptor;
-import android.print.PageRange;
-import android.print.PrintAttributes;
-import android.print.PrintDocumentAdapter;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-abstract class ThreadedPrintDocumentAdapter extends PrintDocumentAdapter {
-
- private final Context ctxt;
- private final ExecutorService threadPool = Executors.newFixedThreadPool(1);
-
- ThreadedPrintDocumentAdapter(Context ctxt) {
- this.ctxt = ctxt;
- }
-
- abstract LayoutJob buildLayoutJob(PrintAttributes oldAttributes,
- PrintAttributes newAttributes,
- CancellationSignal cancellationSignal,
- LayoutResultCallback callback,
- Bundle extras);
-
- abstract WriteJob buildWriteJob(PageRange[] pages,
- ParcelFileDescriptor destination,
- CancellationSignal cancellationSignal,
- WriteResultCallback callback,
- Context ctxt);
-
- @Override
- public void onLayout(PrintAttributes oldAttributes,
- PrintAttributes newAttributes,
- CancellationSignal cancellationSignal,
- LayoutResultCallback callback, Bundle extras) {
- threadPool.submit(buildLayoutJob(oldAttributes, newAttributes,
- cancellationSignal, callback, extras));
- }
-
- @Override
- public void onWrite(PageRange[] pages,
- ParcelFileDescriptor destination,
- CancellationSignal cancellationSignal,
- WriteResultCallback callback) {
- threadPool.submit(buildWriteJob(pages, destination, cancellationSignal, callback, ctxt));
- }
-
- @Override
- public void onFinish() {
- threadPool.shutdown();
- super.onFinish();
- }
-
- protected abstract static class LayoutJob implements Runnable {
- PrintAttributes oldAttributes;
- PrintAttributes newAttributes;
- CancellationSignal cancellationSignal;
- LayoutResultCallback callback;
- Bundle extras;
-
- LayoutJob(PrintAttributes oldAttributes,
- PrintAttributes newAttributes,
- CancellationSignal cancellationSignal,
- LayoutResultCallback callback, Bundle extras) {
- this.oldAttributes = oldAttributes;
- this.newAttributes = newAttributes;
- this.cancellationSignal = cancellationSignal;
- this.callback = callback;
- this.extras = extras;
- }
- }
-
- protected abstract static class WriteJob implements Runnable {
- PageRange[] pages;
- ParcelFileDescriptor destination;
- CancellationSignal cancellationSignal;
- WriteResultCallback callback;
- Context ctxt;
-
- WriteJob(PageRange[] pages, ParcelFileDescriptor destination,
- CancellationSignal cancellationSignal,
- WriteResultCallback callback, Context ctxt) {
- this.pages = pages;
- this.destination = destination;
- this.cancellationSignal = cancellationSignal;
- this.callback = callback;
- this.ctxt = ctxt;
- }
- }
-}
-
diff --git a/app/src/main/java/com/gsnathan/pdfviewer/Utils.java b/app/src/main/java/com/gsnathan/pdfviewer/Utils.java
deleted file mode 100755
index c4228987..00000000
--- a/app/src/main/java/com/gsnathan/pdfviewer/Utils.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2018 Gokul Swaminathan
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.gsnathan.pdfviewer;
-
-import android.content.ClipData;
-import android.Manifest;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.graphics.Color;
-import android.net.Uri;
-import android.os.Build;
-
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.content.ContextCompat;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import io.github.tonnyl.whatsnew.WhatsNew;
-import io.github.tonnyl.whatsnew.item.WhatsNewItem;
-
-public class Utils {
-
- static void showLog(AppCompatActivity context) {
- WhatsNew log = WhatsNew.newInstance(
- new WhatsNewItem("Full screen mode", "A new button has been added to the bottom bar to read PDFs in full screen!", R.drawable.star_icon),
- new WhatsNewItem("Keep the screen on while reading", "You can enable this feature in Settings.", R.drawable.star_icon),
- new WhatsNewItem("Sharing improvements and fixes", "Including better support for third-party share dialogs.", R.drawable.star_icon),
- new WhatsNewItem("Bugs", "A bunch of bug fixes and robustness improvements.", R.drawable.star_icon)
- );
- log.setTitleColor(Color.BLACK);
- log.setTitleText(context.getResources().getString(R.string.appChangelog));
- log.setButtonText(context.getResources().getString(R.string.buttonLog));
- log.setButtonBackground(ContextCompat.getColor(context, R.color.colorPrimary));
- log.setButtonTextColor(Color.WHITE);
- log.setItemTitleColor(Color.parseColor("#339999")); // same as icons
- log.setItemContentColor(Color.parseColor("#808080"));
-
- log.show(context.getSupportFragmentManager(), "Log");
- }
-
- static Intent emailIntent(String emailAddress, String subject, String text) {
- Intent email = new Intent(Intent.ACTION_SENDTO);
- email.setData(Uri.parse("mailto:" + emailAddress));
- email.putExtra(Intent.EXTRA_SUBJECT, subject);
- email.putExtra(Intent.EXTRA_TEXT, text);
- return email;
- }
-
- static Intent plainTextShareIntent(String chooserTitle, String text) {
- Intent intent = new Intent(Intent.ACTION_SEND);
- intent.setType("text/plain");
- intent.putExtra(Intent.EXTRA_TEXT, text);
- return Intent.createChooser(intent, chooserTitle);
- }
-
- static Intent fileShareIntent(String chooserTitle, String fileName, Uri fileUri) {
- Intent intent = new Intent(Intent.ACTION_SEND);
- intent.setType("application/pdf");
- intent.putExtra(Intent.EXTRA_STREAM, fileUri);
- intent.setClipData(new ClipData(fileName, new String[] { "application/pdf" }, new ClipData.Item(fileUri)));
- intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
- return Intent.createChooser(intent, chooserTitle);
- }
-
- static Intent linkIntent(String url) {
- Intent link = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
- return link;
- }
-
- static Intent navIntent(Context context, Class activity) {
- Intent navigate = new Intent(context, activity);
- return navigate;
- }
-
- static String getAppVersion() {
- return BuildConfig.VERSION_NAME;
- }
-
- static boolean canWriteToDownloadFolder(Context context) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R)
- return true;
-
- return ContextCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE)
- == PackageManager.PERMISSION_GRANTED;
- }
-
- static byte[] readBytesToEnd(InputStream inputStream) throws IOException {
- ByteArrayOutputStream output = new ByteArrayOutputStream();
- byte[] buffer = new byte[8 * 1024];
- int bytesRead;
- while ((bytesRead = inputStream.read(buffer)) != -1) {
- output.write(buffer, 0, bytesRead);
- }
- return output.toByteArray();
- }
-
- static void writeBytesToFile(File directory, String fileName, byte[] fileContent) throws IOException {
- File file = new File(directory, fileName);
- try (FileOutputStream stream = new FileOutputStream(file)) {
- stream.write(fileContent);
- }
- }
-}
diff --git a/app/src/main/java/com/gsnathan/pdfviewer/ui/theme/Color.kt b/app/src/main/java/com/gsnathan/pdfviewer/ui/theme/Color.kt
new file mode 100644
index 00000000..c412c97a
--- /dev/null
+++ b/app/src/main/java/com/gsnathan/pdfviewer/ui/theme/Color.kt
@@ -0,0 +1,11 @@
+package com.gsnathan.pdfviewer.ui.theme
+
+import androidx.compose.ui.graphics.Color
+
+val Purple80 = Color(0xFFD0BCFF)
+val PurpleGrey80 = Color(0xFFCCC2DC)
+val Pink80 = Color(0xFFEFB8C8)
+
+val Purple40 = Color(0xFF6650a4)
+val PurpleGrey40 = Color(0xFF625b71)
+val Pink40 = Color(0xFF7D5260)
\ No newline at end of file
diff --git a/app/src/main/java/com/gsnathan/pdfviewer/ui/theme/Theme.kt b/app/src/main/java/com/gsnathan/pdfviewer/ui/theme/Theme.kt
new file mode 100644
index 00000000..087e1746
--- /dev/null
+++ b/app/src/main/java/com/gsnathan/pdfviewer/ui/theme/Theme.kt
@@ -0,0 +1,70 @@
+package com.gsnathan.pdfviewer.ui.theme
+
+import android.app.Activity
+import android.os.Build
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.core.view.WindowCompat
+
+private val DarkColorScheme = darkColorScheme(
+ primary = Purple80,
+ secondary = PurpleGrey80,
+ tertiary = Pink80
+)
+
+private val LightColorScheme = lightColorScheme(
+ primary = Purple40,
+ secondary = PurpleGrey40,
+ tertiary = Pink40
+
+ /* Other default colors to override
+ background = Color(0xFFFFFBFE),
+ surface = Color(0xFFFFFBFE),
+ onPrimary = Color.White,
+ onSecondary = Color.White,
+ onTertiary = Color.White,
+ onBackground = Color(0xFF1C1B1F),
+ onSurface = Color(0xFF1C1B1F),
+ */
+)
+
+@Composable
+fun PdfviewerTheme(
+ darkTheme: Boolean = isSystemInDarkTheme(),
+ // Dynamic color is available on Android 12+
+ dynamicColor: Boolean = true,
+ content: @Composable () -> Unit
+) {
+ val colorScheme = when {
+ dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
+ val context = LocalContext.current
+ if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
+ }
+
+ darkTheme -> DarkColorScheme
+ else -> LightColorScheme
+ }
+ val view = LocalView.current
+ if (!view.isInEditMode) {
+ SideEffect {
+ val window = (view.context as Activity).window
+ window.statusBarColor = colorScheme.primary.toArgb()
+ WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
+ }
+ }
+
+ MaterialTheme(
+ colorScheme = colorScheme,
+ typography = Typography,
+ content = content
+ )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/gsnathan/pdfviewer/ui/theme/Type.kt b/app/src/main/java/com/gsnathan/pdfviewer/ui/theme/Type.kt
new file mode 100644
index 00000000..5a5c90e1
--- /dev/null
+++ b/app/src/main/java/com/gsnathan/pdfviewer/ui/theme/Type.kt
@@ -0,0 +1,34 @@
+package com.gsnathan.pdfviewer.ui.theme
+
+import androidx.compose.material3.Typography
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
+
+// Set of Material typography styles to start with
+val Typography = Typography(
+ bodyLarge = TextStyle(
+ fontFamily = FontFamily.Default,
+ fontWeight = FontWeight.Normal,
+ fontSize = 16.sp,
+ lineHeight = 24.sp,
+ letterSpacing = 0.5.sp
+ )
+ /* Other default text styles to override
+ titleLarge = TextStyle(
+ fontFamily = FontFamily.Default,
+ fontWeight = FontWeight.Normal,
+ fontSize = 22.sp,
+ lineHeight = 28.sp,
+ letterSpacing = 0.sp
+ ),
+ labelSmall = TextStyle(
+ fontFamily = FontFamily.Default,
+ fontWeight = FontWeight.Medium,
+ fontSize = 11.sp,
+ lineHeight = 16.sp,
+ letterSpacing = 0.5.sp
+ )
+ */
+)
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
old mode 100755
new mode 100644
index c7bd21db..2b068d11
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -2,19 +2,15 @@
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
- android:viewportHeight="108"
- android:viewportWidth="108">
-
+ android:viewportWidth="108"
+ android:viewportHeight="108">
+