reload test

version 1.4 launched

.gitignore

@@ -1,33 +1,6 @@
-# Gradle files
-.gradle/
-build/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Log/OS Files
-*.log
-
-# Android Studio generated files and folders
-captures/
-.externalNativeBuild/
-.cxx/
-*.apk
-output.json
-
-# IntelliJ
-*.iml
-.idea/
-misc.xml
-deploymentTargetDropDown.xml
-render.experimental.xml
-
-# Keystore files
-*.jks
-*.keystore
-
-# Google Services (e.g. APIs or Firebase)
-google-services.json
-
-# Android Profiling
-*.hprof
+_site
+.bundle
+.sass-cache
+Gemfile.lock
+.DS_Store
+*.pem

.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "pwa-chrome",
+            "request": "launch",
+            "name": "Launch Chrome against localhost",
+            "url": "http://localhost:8000/hitomi-dev.html",
+            "webRoot": "${workspaceFolder}"
+        }
+    ]
+}

Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'github-pages', group: :jekyll_plugins

LICENSE

@@ -1,4 +0,0 @@
-License is specified in following module separately
-
-app/
-libpupil/

README.md

@@ -1,29 +1,69 @@
-![Banner](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/pupil-banner.png?raw=true)
-*Pupil, Hitomi.la viewer for Android*
+# Jekyll Cayman theme
 
-![](https://img.shields.io/github/downloads/tom5079/Pupil/total)  
-[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.3.18/Pupil-v5.3.18.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.3.18/Pupil-v5.3.18.apk)  
-[![](https://discordapp.com/api/guilds/610452916612104194/embed.png?style=banner2)](https://discord.gg/Stj4b5v)
+This is a [Jekyll][1] theme for [@jasonlong][2]'s [Cayman theme][4] on [GitHub Pages][3].
 
-# Features
+Cayman is a clean, responsive theme for [GitHub Pages](https://pages.github.com). This theme is available as an option if you use the [Automatic Page Generator](https://help.github.com/articles/creating-pages-with-the-automatic-generator/) or you can copy the template and styles to use on your own.
 
-![Main Screen](https://github.com/tom5079/Pupil/blob/gh-pages/assets/images/main-screenshot.jpg?raw=true)
+You can preview the theme at https://jasonlong.github.io/cayman-theme or with real content at https://jasonlong.github.io/geo_pattern.
 
-# Installation
+![](https://cl.ly/image/1T3r3d18311V/content)
 
-Go [Releases page](https://github.com/tom5079/Pupil/releases) and get latest version or  
-Visit [github page](https://tom5079.github.io/Pupil/) (only available in Korean)  
-or Build app yourself
+# How to use it?
 
-# Manual
+Download the theme @ https://github.com/pietromenna/jekyll-cayman-theme/archive/master.zip
 
-[Manual](https://tom5079.github.io/Pupil/2019/06/06/manual-kr.html) is only available in Korean.
-Consider using translator.
+Unzip it and use it as a regular jekyll folder.
 
-# Contribution
+```
+$ unzip jekyll-cayman-theme-master.zip
+```
 
-Any kind of contribution is appreciated. Feel free to leave PR!
+Get inside the newly extracted folder
+```
+$ cd jekyll-cayman-theme-master
+```
 
-## Tag Translation
+Get the required gems
+```
+$ bundle install
+```
 
-Head over to [tags branch](https://github.com/tom5079/Pupil/tree/tags)
+Use it!
+
+```
+$ jekyll serve
+```
+
+For more details read about [Jekyll][1] on its web page.
+
+# Setup
+
+Some important configuration can be done in the file `_config.yml`. Please, check the Setup section in that file.
+
+
+## baseurl
+
+`baseurl` parameter is required in the case the site doesn't sit on the root of the domain. For example: https://pietromenna.github.io/jekyll-cayman-theme
+
+In the case above the baseurl should be set to "/jekyll-cayman-theme".
+
+In the case the site sits in the root, you can leave `baseurl` as empty "".
+
+# Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/pietromenna/jekyll-cayman-theme.
+
+# Development
+
+To set up your environment to develop this theme, run `bundle install`.
+
+Your theme is setup just like a normal Jekyll site! To test your theme, run `bundle exec jekyll serve` and open your browser at `http://localhost:4000`. This starts a Jekyll server using your theme. Add pages, documents, data, etc. like normal to test your theme's contents. As you make modifications to your theme and to your content, your site will regenerate and you should see the changes in the browser after a refresh, just like normal.
+
+# License
+
+This work is licensed under a [Creative Commons Attribution 4.0 International](https://creativecommons.org/licenses/by/4.0/) license.
+
+[1]: https://jekyllrb.com/
+[2]: https://github.com/jasonlong
+[3]: https://pages.github.com/
+[4]: https://github.com/jasonlong/cayman-theme

_config.yml

@@ -0,0 +1,33 @@
+theme: jekyll-theme-cayman
+
+plugins:
+  - jekyll-sitemap
+
+title: Pupil
+description: Hitomi.la viewer for Android
+baseurl: "/Pupil"
+
+google_analytics: UA-119938781-2
+
+disqus_url: "https://pupil.disqus.com"
+discord_url: "https://discord.gg/Stj4b5v"
+
+github_url: "https://github.com/tom5079/Pupil"
+
+t:
+  en:
+    header: 
+      description: "Hitomi.la viewer for Android"
+      download: "Download app"
+      issue: "Having a problem?"
+      or: "or…"
+      email: "Send an E-mail"
+      discord: "Join Discord server"
+  ko:
+    header:
+      description: "안드로이드 Hitomi.la 뷰어"
+      download: "앱 다운로드"
+      issue: "문제가 있으세요?"
+      or: "또는…"
+      email: "이메일 보내기"
+      discord: "디스코드"

_drafts/info.md

@@ -0,0 +1,10 @@
+---
+layout: default
+lang: ko
+title: 히토미를 여행하는 신사들을 위한 안내서
+---
+
+![대충 히오스 로고]({{ "/assets/images/2019-05-16-hos.jpg" | absolute_url }})  
+*히옷!*
+
+안녕하십니까, 전국 방방곡곡의 신사 여러분들~!

_layouts/default.html

@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<html lang="{{ site.lang | default: " en-US " }}">
+
+<head>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
+    <script src="https://kit.fontawesome.com/695c47bd28.js" crossorigin="anonymous"></script>
+
+    {% if site.google_analytics %}
+    <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics }}"></script>
+    <script>
+        window.dataLayer = window.dataLayer || [];
+
+        function gtag() {
+            dataLayer.push(arguments);
+        }
+        gtag('js', new Date());
+        gtag('config', '{{ site.google_analytics }}');
+    </script>
+    {% endif %}
+    <meta charset="UTF-8">
+    
+    {% seo %}
+
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="theme-color" content="#157878">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+    <link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}">
+    <link rel="stylesheet" href="{{ '/assets/css/styles.css' | absolute_url }}">
+    <link rel="shortcut icon" href="/Pupil/favicon.ico" type="image/x-icon" />
+
+    <script>
+        /**
+         *  RECOMMENDED CONFIGURATION VARIABLES: EDIT AND UNCOMMENT THE SECTION BELOW TO INSERT DYNAMIC VALUES FROM YOUR PLATFORM OR CMS.
+         *  LEARN WHY DEFINING THESE VARIABLES IS IMPORTANT: https://disqus.com/admin/universalcode/#configuration-variables*/
+
+        var disqus_config = function() {
+            this.page.url = '{{ site.url }}{{ page.url }}'; // Replace PAGE_URL with your page's canonical URL variable
+            this.page.identifier = '{{ page.id }}'; // Replace PAGE_IDENTIFIER with your page's unique identifier variable
+            this.page.language = '{{ page.lang }}';
+        };
+
+        (function() { // DON'T EDIT BELOW THIS LINE
+            var d = document,
+                s = d.createElement('script');
+            s.src = 'https://pupil.disqus.com/embed.js';
+            s.setAttribute('data-timestamp', +new Date());
+            (d.head || d.body).appendChild(s);
+        })();
+    </script>
+
+    <script type='text/javascript' src='/Pupil/assets/js/pupil.js'></script>
+    <script>
+        Promise.resolve()
+            .then(getLatestRelease)
+            .then(result => {
+                let url = result["assets"][0]["browser_download_url"];
+
+                $("#download-btn").attr("href", url)
+            })
+            .catch(err => {
+                console.log(err)
+            })
+    </script>
+
+</head>
+
+<body>
+    <header class="page-header" role="banner">
+        <a href="https://tom5079.github.io/Pupil" style="text-decoration:none; color:inherit;"><h1 class="project-name">{{ page.title | default: site.title | default: site.github.repository_name }}</h1></a>
+        <h2 class="project-tagline">{{ site.t[page.lang].header.description }}</h2>
+        <a id="download-btn" class="btn">{{ site.t[page.lang].header.download }}</a>
+        <p/>
+        <div class="wrap">
+            <a href="{{ site.github_url }}"><i class="fab fa-github"></i></a>
+            <a href="mailto:pupil.hentai@gmail.com"><i class="fas fa-envelope"></i></a>
+            <a href="{{ site.discord_url }}"><i class="fab fa-discord"></i></a>
+        </div>
+    </header>
+
+    <main id="content" class="main-content" role="main">
+        {{ content }}
+
+        <footer class="site-footer">
+
+            <div id="disqus_thread"></div>
+            <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+
+            {% if site.github.is_project_page %}
+            <span class="site-footer-owner">{{ site.github.repository_name }} is maintained by <a href="{{ site.github.owner_url }}">{{ site.github.owner_name }}</a>.</span> {% endif %}
+            <span class="site-footer-credits">This page was generated by <a href="https://pages.github.com">GitHub Pages</a>.</span>
+        </footer>
+    </main>
+</body>
+
+</html>

_posts/2019-05-30-https-block-kr.md

@@ -0,0 +1,40 @@
+---
+layout: default
+lang: ko
+title: 접속 불가 현상 해결법
+description: 히토미 뷰어 Pupil 접속 불가 현상 해결법
+date: 2020-10-01
+---
+
+**현재 Intra/유니콘/Aspear 등으로 접속이 불가능합니다.**
+
+**1줄요약: [PowerTunnel](https://github.com/krlvm/PowerTunnel-Android) / [1.1.1.1](https://play.google.com/store/apps/details?id=com.cloudflare.onedotonedotonedotone)쓰세요**
+
+![로고]({{ "assets/images/warning.or.kr.jpg" | absolute_url  }})  
+*익숙한 `그` 화면*
+
+현재 일부 통신사에서 https 차단이 시행되고 있는 관계로 우회접속을 해야합니다.
+
+# 해결 방법
+
+## 1. PowerTunnel(속도저하 없음, 무료)
+테스트해본 앱 중 유일하게 작동하는 앱입니다.
+SNI 파편화로 작동하며, 외부 서버를 경유하지 않아 속도가 가장 빠릅니다.
+
+[Github](https://github.com/krlvm/PowerTunnel-Android)
+
+## 2. 1.1.1.1(속도저하 거의 없음, 무료)
+Cloudflare에서 제공하는 검열 우회 앱입니다.
+가까운 Cloudflare 서버를 경유하여 일반 VPN보다는 빠른 속도가 특징입니다.
+
+[플레이스토어 링크](https://play.google.com/store/apps/details?id=com.cloudflare.onedotonedotonedotone)
+
+## 3. VPN
+확실한 해결 방법입니다.
+추천 VPN으로는
+* Tunnelbear(한 달 1.5GB 무료, 이후 유료)
+* Betternet(무료)
+* NordVPN(유료)  
+
+가 있습니다. 속도는 NordVPN>Tunnelbear>Betternet순입니다.   
+개인적으로 Tunnelbear을 추천드립니다.

_posts/2019-06-06-manual-kr.md

@@ -0,0 +1,179 @@
+---
+layout: default
+lang: ko
+title: Pupil v4.0 사용 설명서
+description: 히토미 뷰어 Pupil 사용 설명서
+---
+
+일단 읽어 보셔봐  
+
+**취소 버튼이 없는 알림창은 알림창 밖을 누르면 취소됩니다**  
+**만화 내보내기 기본 위치는 `내장메모리/Pupil`폴더 입니다.**  
+**결과 없음/연결 오류/썸네일 안 나오시는 분들은 [접속 불가 해결법](https://tom5079.github.io/Pupil/2019/05/30/https-block-kr.html)을 참조해 주세요!**
+
+# 1. 메인 화면
+
+![메인 화면]({{ "assets/images/manual/main.png" | absolute_url  }})
+
+1. <span style="color:rgb(34,177,76)">사이드 메뉴 열기</span>
+2. <span style="color:rgb(255,127,39)">검색창</span>
+3. <span style="color:rgb(0,162,232)">설정</span>
+4. <span style="color:rgb(255,174,201)">기타</span>
+ - 정렬 설정 (시간순, 인기순)
+5. <span style="color:rgb(185,122,87)">다운로드 상태</span>
+ - 녹색: 다운로드 완료
+ - 적색: 다운로드 중
+ - 없음: 다운로드 안 됨
+6. <span style="color:rgb(237,28,36)">태그</span>
+ - 태그를 누르면 해당 태그로 검색됩니다
+7. <span style="color:rgb(163,73,164)">갤러리 번호</span>
+ - 태그를 누르면 검색됩니다
+8. <span style="color:rgb(255,242,0)">즐겨찾기</span>
+9. <span style="color:rgb(181,230,29)">추가 기능</span>
+ - 페이지 이동: 원하는 페이지로 바로 이동
+ - 갤러리 번호로 열기: 갤러리 번호로 뷰어를 엽니다
+
+## 1-1. 검색
+
+검색창에 태그/검색어를 입력하면 검색이 됩니다
+
+![추천 태그]({{ "assets/images/manual/search.png" | absolute_url  }})
+
+검색어를 덜 입력하면 추천 태그가 나옵니다.
+물론 즐겨찾기 된 태그가 제일 앞에 표시됩니다.
+
+우측 별 아이콘을 누르면 즐겨찾기 태그로 등록할 수 있습니다.
+
+![즐겨찾기 태그]({{ "assets/images/manual/search-favorite.png" | absolute_url }})
+즐겨찾기 태그는 검색어를 입력하지 않은 상태에서 나타납니다.
+
+## 1-2. 페이지 이동
+페이지 이동은 볼륨 버튼으로도 가능합니다
+```
+볼륨 상 -> 이전 페이지
+볼륨 하 -> 다음 페이지
+```
+
+### 1-2.1. 다음 페이지
+![다음]({{ "assets/images/manual/page-next.gif" | absolute_url  }})    
+페이지 맨 아래에서 한 번 더 끌어주시면 됩니다
+
+### 1-2.2. 이전 페이지
+![이전]({{ "assets/images/manual/page-prev.gif" | absolute_url  }})  
+페이지 맨 위에서 한 번 더 끌어주시면 됩니다
+
+## 1-3. 갤러리 상세 보기
+갤러리의 상세 정보를 볼 수 있습니다
+
+해당하는 갤러리를 길게 눌러 주세요
+
+![갤러리 상세정보]({{ "assets/images/manual/gallery-details.png" | absolute_url }})  
+
+* 갤러리 종류/작가/그룹/언어/태그를 볼 수 있습니다
+  - 클릭 시 해당 태그로 검색됩니다
+* 썸네일 표시
+* 연관 갤러리 표시
+
+# 2. 뷰어
+
+![뷰어]({{ "assets/images/manual/viewer.png" | absolute_url  }})
+
+1. <span style="color:rgb(0,0,0)">제목</span>
+2. <span style="color:rgb(34,177,76)">즐겨찾기</span>
+3. <span style="color:rgb(238,28,36)">hiyobi.me 사용 표시</span>
+ - hiyobi에서 이미지를 불러올 때 표시됩니다
+4. <span style="color:rgb(163,73,164)">페이지 표시</span>
+ - 클릭 시 페이지 이동
+5. <span style="color:rgb(255,127,39)">로딩 상태바</span>
+ - 다운로드 완료 시 사라짐
+6. <span style="color:rgb(255,201,14)">백그라운드 다운로드 버튼</span>
+7. <span style="color:rgb(0,162,232)">전체 화면 버튼</span>
+
+## 2-1. 스크롤 모드
+
+세로 스크롤 방식과 가로 스크롤 방식을 모두 지원합니다
+
+![스크롤]({{ "assets/images/manual/viewer-showcase.gif" | absolute_url  }})
+
+* 세로 스크롤
+  * 기본 방식
+* 세로 전체화면 스크롤
+  * 전체화면 버튼을 이용
+* 가로 전체화면 스크롤
+  * 이미지를 한 번 클릭
+  * 뒤로가기 버튼으로 나갈 수 있음
+
+# 3. 설정
+
+## 3-1. 검색 설정
+### 3-1.1. 한 번에 로드할 갤러리 수
+한 페이지당 갤러리 수를 설정합니다.  
+기본 값은 `25`입니다.
+
+### 3-1.2. 기본 검색어
+![기본 검색어]({{ "assets/images/manual/default-query.png" | absolute_url  }})
+
+메인 화면에서 검색어를 지정하지 않아도 추가되는 검색어입니다.  
+한국어만 보고 싶을 때나 *특정 태그*에 관심이 있을 때 아주 유용합니다.
+
+## 3-2. 캐시
+
+### 3-1.1 캐시 삭제
+캐시 된 갤러리를 삭제합니다.
+
+### 3-1.2 다운로드 삭제
+다운로드 된 갤러리를 삭제합니다.  
+다운로드 목록에서도 지워집니다.
+
+### 3-1.3 기록 삭제
+히스토리를 삭제합니다. 캐시된 이미지는 지워지지 않습니다.
+
+## 3-3. 앱 잠금
+시작 시 잠금을 지원합니다.
+
+현재 패턴 잠금만 지원합니다.
+
+패턴을 잊어버렸을 때는 앱을 재설치 해주시기 바랍니다.
+
+## 3-4. 기타
+### 3-4.1. hiyobi.me 사용
+이미지 로딩 속도 향상을 위해 ***가급적이면*** 히요비에서 불러옵니다.  
+요즘 히요비가 계속 죽어서 효과가 없는 것 같기도 하고...
+
+### 3-4.2. 보안 모드
+최근 앱 목록 창에서 끄지 못한 히토미를 남이 보는 불상사를 아주 조금 방지합니다.  
+
+![보안 모드 ON]({{ "assets/images/manual/with-secure-mode.png" | absolute_url  }})
+*보안 모드 ON*
+
+![보안 모드 OFF]({{ "assets/images/manual/without-secure-mode.png" | absolute_url  }})
+*보안 모드 OFF*
+
+혹시 모르니까 켜 놓는게 좋습니다. **진짜루요**
+
+### 3-4.3. 다크 모드
+앱의 테마를 어두운 색깔로 바꿉니다.
+밤에 볼때 좋겠지요^^*
+
+![다크 모드 OFF]({{ "assets/images/manual/light-theme.png" | absolute_url  }})
+*다크 모드 OFF*
+
+![다크 모드 ON]({{ "assets/images/manual/dark-theme.png" | absolute_url  }})
+*다크 모드 ON*
+
+## 3-4.4. 이미지 숨기기
+갤러리에서 다운로드한 이미지를 보이지 않게 합니다.
+
+이런 곤란한 상황을 막아줍니다
+
+![곤란...]({{ "assets/images/manual/oops.png" | absolute_url }})
+*곤란...*
+
+# 4. 갤러리 다운로드
+갤러리를 다운로드 하시면 `내장메모리/Pupil/<갤러리ID>` 폴더에 저장됩니다.  
+이미지는 `images` 폴더에 이미지 번호 순서대로 저장되어 있습니다.
+
+---
+
+일단 여기까지입니다.  
+더 궁금하신 게 있으시면 이메일 주세요!

app/.gitignore

@@ -1 +0,0 @@
-/build

app/LICENSE

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

app/README.md

@@ -1 +0,0 @@
-

app/build.gradle.kts

@@ -1,144 +0,0 @@
-plugins {
-    alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.kotlinx.serialization)
-    alias(libs.plugins.kotlin.compose)
-    alias(libs.plugins.gms.oss.licenses)
-    alias(libs.plugins.gms.google.services)
-    alias(libs.plugins.firebase.crashlytics)
-    alias(libs.plugins.firebase.perf)
-    id("kotlin-parcelize")
-}
-
-android {
-    namespace = "xyz.quaver.pupil"
-    compileSdk = 35
-
-    defaultConfig {
-        applicationId = "xyz.quaver.pupil"
-        minSdk = 21
-        targetSdk = 35
-        versionCode = 70
-        versionName = "5.3.18"
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables.useSupportLibrary = true
-    }
-    buildFeatures {
-        buildConfig = true
-        compose = true
-    }
-    buildTypes {
-        debug {
-            isMinifyEnabled = false
-            isShrinkResources = false
-
-            isDebuggable = true
-            applicationIdSuffix = ".debug"
-            versionNameSuffix = "-DEBUG"
-
-            extra.apply {
-                set("enableCrashlytics", false)
-                set("alwaysUpdateBuildId", false)
-            }
-        }
-        release {
-            isMinifyEnabled = true
-            isShrinkResources = true
-
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-    buildFeatures {
-        viewBinding = true
-    }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-}
-
-dependencies {
-    implementation(libs.kotlin.stdlib.jdk8)
-    implementation(libs.kotlinx.coroutines.android)
-    implementation(libs.kotlinx.serialization.json)
-    implementation(libs.kotlinx.datetime)
-
-    implementation(platform(libs.compose.bom))
-    androidTestImplementation(platform(libs.compose.bom))
-    implementation(libs.compose.material3)
-    implementation(libs.compose.ui)
-    implementation(libs.compose.ui.tooling.preview)
-    debugImplementation(libs.compose.ui.tooling)
-    androidTestImplementation(libs.compose.ui.test)
-    debugImplementation(libs.compose.ui.test.manifest)
-    implementation(libs.compose.icons)
-    implementation(libs.compose.adaptive)
-    implementation(libs.compose.activity)
-    implementation(libs.compose.lifecycle.viewmodel)
-    implementation(libs.compose.livedata)
-    implementation(libs.compose.navigation)
-
-    implementation(libs.accompanist.adaptive)
-
-    implementation(libs.core.ktx)
-    implementation(libs.appcompat)
-    implementation(libs.activity.ktx)
-    implementation(libs.fragment.ktx)
-    implementation(libs.preference.ktx)
-    implementation(libs.recyclerview)
-    implementation(libs.constraintlayout)
-    implementation(libs.gridlayout)
-    implementation(libs.biometric)
-    implementation(libs.work.runtime.ktx)
-
-    implementation(libs.library)
-
-    implementation(libs.material)
-
-    implementation(platform(libs.firebase.bom))
-    implementation(libs.firebase.analytics.ktx)
-    implementation(libs.firebase.crashlytics.ktx)
-    implementation(libs.firebase.perf.ktx)
-
-    implementation(libs.play.services.oss.licenses)
-    implementation(libs.play.services.mlkit.face.detection)
-
-    implementation(libs.fab)
-
-    implementation(libs.bigimageviewer)
-    implementation(libs.frescoimageloader)
-    implementation(libs.frescoimageviewfactory)
-    implementation(libs.imagepipeline.okhttp3)
-
-    //noinspection GradleDependency
-    implementation(libs.okhttp)
-    implementation(libs.ktor.network)
-
-    implementation(libs.dotsindicator)
-
-    implementation(libs.pinlockview)
-    implementation(libs.patternlockview)
-
-    implementation(libs.core)
-
-    implementation(libs.ripplebackground.library)
-    implementation(libs.recyclerview.fastscroller)
-
-    implementation(libs.jsoup)
-
-    implementation(libs.documentfilex)
-    implementation(libs.floatingsearchview)
-
-    testImplementation(libs.junit)
-    testImplementation(libs.kotlinx.coroutines.test)
-    androidTestImplementation(libs.ext.junit)
-    androidTestImplementation(libs.rules)
-    androidTestImplementation(libs.runner)
-    androidTestImplementation(libs.espresso.core)
-}

app/proguard-rules.pro

@@ -1,37 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
-
--dontobfuscate
-
--keepattributes *Annotation*, InnerClasses
--dontnote kotlinx.serialization.SerializationKt
--keep,includedescriptorclasses class xyz.quaver.**$$serializer { *; } # <-- change package name to your app's
--keepclassmembers class xyz.quaver.pupil.** { # <-- change package name to your app's
-    *** Companion;
-}
--keepclasseswithmembers class xyz.quaver.pupil.** { # <-- change package name to your app's
-    kotlinx.serialization.KSerializer serializer(...);
-}
--keep class xyz.quaver.pupil.ui.fragment.ManageFavoritesFragment
--keep class xyz.quaver.pupil.ui.fragment.ManageStorageFragment
--keep class xyz.quaver.pupil.** { *; }
--keep class app.cash.zipline.** { *; }

app/release/output-metadata.json

@@ -1,37 +0,0 @@
-{
-  "version": 3,
-  "artifactType": {
-    "type": "APK",
-    "kind": "Directory"
-  },
-  "applicationId": "xyz.quaver.pupil",
-  "variantName": "release",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "attributes": [],
-      "versionCode": 70,
-      "versionName": "5.3.18",
-      "outputFile": "app-release.apk"
-    }
-  ],
-  "elementType": "File",
-  "baselineProfiles": [
-    {
-      "minApi": 28,
-      "maxApi": 30,
-      "baselineProfiles": [
-        "baselineProfiles/1/app-release.dm"
-      ]
-    },
-    {
-      "minApi": 31,
-      "maxApi": 2147483647,
-      "baselineProfiles": [
-        "baselineProfiles/0/app-release.dm"
-      ]
-    }
-  ],
-  "minSdkVersionForDexing": 21
-}

app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt

@@ -1,183 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-@file:Suppress("UNUSED_VARIABLE")
-
-package xyz.quaver.pupil
-
-import android.util.Log
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import kotlinx.coroutines.runBlocking
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import xyz.quaver.pupil.hitomi.*
-import java.util.*
-import java.util.concurrent.TimeUnit
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-//    @Before
-//    fun init() {
-//        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-//    }
-
-    @Before
-    fun init() {
-        clientBuilder = OkHttpClient.Builder()
-            .readTimeout(0, TimeUnit.SECONDS)
-            .writeTimeout(0, TimeUnit.SECONDS)
-            .callTimeout(0, TimeUnit.SECONDS)
-            .connectTimeout(0, TimeUnit.SECONDS)
-            .addInterceptor { chain ->
-                val request = chain.request().newBuilder()
-                    .header("Referer", "https://hitomi.la/")
-                    .build()
-
-                chain.proceed(request)
-            }
-    }
-
-    @Test
-    fun test_empty() {
-        print(
-            "".trim()
-                .replace(Regex("""^\?"""), "")
-                .lowercase(Locale.getDefault())
-                .split(Regex("\\s+"))
-                .map {
-                    it.replace('_', ' ')
-                })
-    }
-    @Test
-    fun test_nozomi() {
-        val nozomi = getGalleryIDsFromNozomi(null, "index", "all")
-
-        Log.d("PUPILD", nozomi.size.toString())
-    }
-
-    @Test
-    fun test_search() {
-        val ids = getGalleryIDsForQuery("language:korean").reversed()
-
-        print(ids.size)
-    }
-
-    @Test
-    fun test_suggestions() {
-        val suggestions = getSuggestionsForQuery("language:g")
-
-        print(suggestions)
-    }
-
-    @Test
-    fun test_doSearch() {
-        val r = runBlocking {
-            doSearch("language:korean")
-        }
-
-        Log.d("PUPILD", r.take(10).toString())
-    }
-
-//    @Test
-//    fun test_getBlock() {
-//        val galleryBlock = getGalleryBlock(2097576)
-//
-//        print(galleryBlock)
-//    }
-//
-//    @Test
-//    fun test_getGallery() {
-//        val gallery = getGallery(2097751)
-//
-//        print(gallery)
-//    }
-
-    @Test
-    fun test_getGalleryInfo() {
-        val info = getGalleryInfo(1469394)
-
-        print(info)
-    }
-
-    @Test
-    fun test_getReader() {
-        val reader = getGalleryInfo(2128654)
-
-        Log.d("PUPILD", reader.toString())
-    }
-
-    @Test
-    fun test_getImages() { runBlocking {
-        val galleryID = 2128654
-
-        val images = getGalleryInfo(galleryID).files.map {
-            imageUrlFromImage(galleryID, it,false)
-        }
-
-        Log.d("PUPILD", images.toString())
-
-//        images.forEachIndexed { index, image ->
-//            println("Testing $index/${images.size}: $image")
-//            val response = client.newCall(
-//                Request.Builder()
-//                    .url(image)
-//                    .header("Referer", "https://hitomi.la/")
-//                    .build()
-//            ).execute()
-//
-//            assertEquals(200, response.code())
-//
-//            println("$index/${images.size} Passed")
-//        }
-    } }
-
-//    @Test
-//    fun test_urlFromUrlFromHash() {
-//        val url = urlFromUrlFromHash(1531795, GalleryFiles(
-//            212, "719d46a7556be0d0021c5105878507129b5b3308b02cf67f18901b69dbb3b5ef", 1, "00.jpg", 300
-//        ), "webp")
-//
-//        print(url)
-//    }
-
-//    @Test
-//    suspend fun test_doSearch_extreme() {
-//        val query = "language:korean -tag:sample -female:humiliation -female:diaper -female:strap-on -female:squirting -female:lizard_girl -female:voyeurism -type:artistcg -female:blood -female:ryona -male:blood -male:ryona -female:crotch_tattoo -male:urethra_insertion -female:living_clothes -male:tentacles -female:slave -female:gag -male:gag -female:wooden_horse -male:exhibitionism -male:miniguy -female:mind_break -male:mind_break -male:unbirth -tag:scanmark -tag:no_penetration -tag:nudity_only -female:enema -female:brain_fuck -female:navel_fuck -tag:novel -tag:mosaic_censorship -tag:webtoon -male:rape -female:rape -female:yuri -male:anal -female:anal -female:futanari -female:huge_breasts -female:big_areolae -male:torture -male:stuck_in_wall -female:stuck_in_wall -female:torture -female:birth -female:pregnant -female:drugs -female:bdsm -female:body_writing -female:cbt -male:dark_skin -male:insect -female:insect -male:vore -female:vore -female:vomit -female:urination -female:urethra_insertion -tag:mmf_threesome -female:sex_toys -female:double_penetration -female:eggs -female:prolapse -male:smell -male:bestiality -female:bestiality -female:big_ass -female:milf -female:mother -male:dilf -male:netorare -female:netorare -female:cosplaying -female:filming -female:armpit_sex -female:armpit_licking -female:tickling -female:lactation -male:skinsuit -female:skinsuit -male:bbm -female:prostitution -female:double_penetration -female:females_only -male:males_only -female:tentacles -female:tentacles -female:stomach_deformation -female:hairy_armpits -female:large_insertions -female:mind_control -male:orc -female:dark_skin -male:yandere -female:yandere -female:scat -female:toddlercon -female:bbw -female:hairy -male:cuntboy -male:lactation -male:drugs -female:body_modification -female:monoeye -female:chikan -female:long_tongue -female:harness -female:fisting -female:glory_hole -female:latex -male:latex -female:unbirth -female:giantess -female:sole_dickgirl -female:robot -female:doll_joints -female:machine -tag:artbook -male:cbt -female:farting -male:farting -male:midget -female:midget -female:exhibitionism  -male:monster -female:big_nipples -female:big_clit -female:gyaru -female:piercing -female:necrophilia -female:snuff -female:smell -male:cheating -female:cheating -male:snuff -female:harem -male:harem"
-//        print(doSearch(query).size)
-//    }
-
-//    @Test
-//    suspend fun test_parse() {
-//        print(doSearch("-male:yaoi -female:yaoi -female:loli").size)
-//    }
-
-//    @Test
-//    fun test_subdomainFromUrl() {
-//        val galleryInfo = getGalleryInfo(1929109).files[2]
-//        print(urlFromUrlFromHash(1929109, galleryInfo, "webp", null, "a"))
-//    }
-}

app/src/debug/res/values/strings.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~     Pupil, Hitomi.la viewer for Android
-  ~     Copyright (C) 2020  tom5079
-  ~
-  ~     This program is free software: you can redistribute it and/or modify
-  ~     it under the terms of the GNU General Public License as published by
-  ~     the Free Software Foundation, either version 3 of the License, or
-  ~     (at your option) any later version.
-  ~
-  ~     This program is distributed in the hope that it will be useful,
-  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~     GNU General Public License for more details.
-  ~
-  ~     You should have received a copy of the GNU General Public License
-  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<resources></resources>

app/src/main/AndroidManifest.xml

@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
-    <uses-permission
-        android:name="android.permission.READ_EXTERNAL_STORAGE"
-        android:maxSdkVersion="23" />
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="23" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission
-        android:name="android.permission.NEARBY_WIFI_DEVICES"
-        android:usesPermissionFlags="neverForLocation"
-        tools:targetApi="s" />
-    <uses-permission
-        android:name="android.permission.ACCESS_FINE_LOCATION"
-        android:maxSdkVersion="32"
-        tools:ignore="CoarseFineLocation" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-
-    <uses-feature
-        android:name="android.hardware.camera"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.camera.autofocus"
-        android:required="false" />
-
-    <application
-        android:name=".Pupil"
-        android:allowBackup="true"
-        android:fullBackupContent="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:networkSecurityConfig="@xml/network_security_config"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme"
-        tools:ignore="UnusedAttribute"
-        tools:replace="android:theme">
-
-        <meta-data
-            android:name="com.google.mlkit.vision.DEPENDENCIES"
-            android:value="face" />
-
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.provider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths" />
-
-        </provider>
-
-        <service
-            android:name=".services.DownloadService"
-            android:exported="false"
-            android:foregroundServiceType="dataSync" />
-
-        <service
-            android:name=".services.TransferClientService"
-            android:exported="false"
-            android:foregroundServiceType="dataSync" />
-
-        <service
-            android:name=".services.TransferServerService"
-            android:exported="false"
-            android:foregroundServiceType="dataSync" />
-
-        <receiver
-            android:name=".receiver.UpdateBroadcastReceiver"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
-            </intent-filter>
-        </receiver>
-
-        <activity android:name=".ui.LockActivity" />
-        <activity
-            android:name=".ui.ReaderActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:exported="true"
-            android:parentActivityName=".ui.MainComposeActivity">
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data android:host="*.hasha.in" />
-                <data android:pathPrefix="/reader" />
-            </intent-filter>
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data android:host="hitomi.la" />
-                <data android:pathPrefix="/galleries" />
-            </intent-filter>
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data android:host="hitomi.la" />
-                <data android:pathPrefix="/manga" />
-            </intent-filter>
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data android:host="hitomi.la" />
-                <data android:pathPrefix="/doujinshi" />
-            </intent-filter>
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data android:host="hitomi.la" />
-                <data android:pathPrefix="/cg" />
-            </intent-filter>
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data android:host="hitomi.la" />
-                <data android:pathPrefix="/imageset" />
-            </intent-filter>
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data android:host="hitomi.la" />
-                <data android:pathPrefix="/reader" />
-            </intent-filter>
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="http" />
-                <data android:host="e-hentai.org" />
-                <data android:pathPrefix="/g" />
-            </intent-filter>
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="https" />
-                <data android:host="e-hentai.org" />
-                <data android:pathPrefix="/g" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".ui.SettingsActivity"
-            android:label="@string/settings_title" />
-        <activity
-            android:name=".ui.MainComposeActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:exported="true"
-            android:theme="@android:style/Theme.Material.Light.NoActionBar"
-            android:windowSoftInputMode="adjustResize">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name=".ui.TransferActivity" />
-    </application>
-
-</manifest>

app/src/main/java/xyz/quaver/pupil/Pupil.kt

@@ -1,289 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil
-
-import android.app.Application
-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.os.Build
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.content.ContextCompat
-import androidx.preference.PreferenceManager
-import com.facebook.imagepipeline.backends.okhttp3.OkHttpImagePipelineConfigFactory
-import com.github.piasy.biv.BigImageViewer
-import com.github.piasy.biv.loader.fresco.FrescoImageLoader
-import com.google.android.gms.common.GooglePlayServicesNotAvailableException
-import com.google.android.gms.common.GooglePlayServicesRepairableException
-import com.google.android.gms.security.ProviderInstaller
-import com.google.firebase.FirebaseApp
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import okhttp3.Dispatcher
-import okhttp3.Interceptor
-import okhttp3.OkHttpClient
-import okhttp3.Response
-import xyz.quaver.io.FileX
-import xyz.quaver.pupil.types.Tag
-import xyz.quaver.pupil.util.Preferences
-import xyz.quaver.pupil.util.SavedSet
-import xyz.quaver.pupil.util.getProxyInfo
-import xyz.quaver.pupil.util.preferences
-import xyz.quaver.pupil.util.proxyInfo
-import java.io.File
-import java.security.KeyStore
-import java.security.SecureRandom
-import java.security.cert.CertificateFactory
-import java.util.UUID
-import java.util.concurrent.Executors
-import java.util.concurrent.TimeUnit
-import javax.net.ssl.SSLContext
-import javax.net.ssl.TrustManagerFactory
-import javax.net.ssl.X509TrustManager
-import kotlin.reflect.KClass
-
-typealias PupilInterceptor = (Interceptor.Chain) -> Response
-
-lateinit var histories: SavedSet<Int>
-    private set
-lateinit var favorites: SavedSet<Int>
-    private set
-lateinit var favoriteTags: SavedSet<Tag>
-    private set
-lateinit var searchHistory: SavedSet<String>
-    private set
-
-val interceptors = mutableMapOf<KClass<out Any>, PupilInterceptor>()
-
-lateinit var clientBuilder: OkHttpClient.Builder
-
-var clientHolder: OkHttpClient? = null
-val client: OkHttpClient
-    get() = clientHolder ?: clientBuilder.build().also {
-        clientHolder = it
-    }
-
-fun getSSLContext(context: Context): SSLContext {
-    val keyStore = KeyStore.getInstance(KeyStore.getDefaultType())
-    keyStore.load(null, null)
-
-    val certificateFactory = CertificateFactory.getInstance("X.509")
-
-    val certificate = context.resources.openRawResource(R.raw.isrgrootx1).use {
-        certificateFactory.generateCertificate(it)
-    }
-
-    keyStore.setCertificateEntry("isrgrootx1", certificate)
-
-    val defaultTrustManagerFactory =
-        TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
-    defaultTrustManagerFactory.init(null as KeyStore?)
-
-    defaultTrustManagerFactory.trustManagers.filterIsInstance<X509TrustManager>()
-        .forEach { trustManager ->
-            trustManager.acceptedIssuers.forEach { acceptedIssuer ->
-                keyStore.setCertificateEntry(acceptedIssuer.subjectDN.name, acceptedIssuer)
-            }
-        }
-
-    val trustManagerFactory =
-        TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
-    trustManagerFactory.init(keyStore)
-
-    val sslContext = SSLContext.getInstance("TLS")
-    sslContext.init(null, trustManagerFactory.trustManagers, SecureRandom())
-
-    return sslContext
-}
-
-class Pupil : Application() {
-    companion object {
-        lateinit var instance: Pupil
-            private set
-    }
-
-    override fun onCreate() {
-        instance = this
-
-        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
-
-        preferences = PreferenceManager.getDefaultSharedPreferences(this)
-
-        val userID = Preferences["user_id", ""].let { userID ->
-            if (userID.isEmpty()) UUID.randomUUID().toString().also { Preferences["user_id"] = it }
-            else userID
-        }
-
-        FirebaseApp.initializeApp(this)
-        FirebaseCrashlytics.getInstance().setUserId(userID)
-
-        val proxyInfo = getProxyInfo()
-
-        clientBuilder = OkHttpClient.Builder()
-//            .connectTimeout(0, TimeUnit.SECONDS)
-            .sslSocketFactory(getSSLContext(this).socketFactory)
-            .readTimeout(0, TimeUnit.SECONDS)
-            .proxyInfo(proxyInfo)
-            .addInterceptor { chain ->
-                val request = chain.request().newBuilder()
-                    .addHeader(
-                        "User-Agent",
-                        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36"
-                    )
-                    .header("Referer", "https://hitomi.la/")
-                    .build()
-
-                val tag = request.tag() ?: return@addInterceptor chain.proceed(request)
-
-                interceptors[tag::class]?.invoke(chain) ?: chain.proceed(request)
-            }.apply {
-                (Preferences.get<String>("max_concurrent_download").toIntOrNull() ?: 0).let {
-                    if (it != 0)
-                        dispatcher(Dispatcher(Executors.newFixedThreadPool(it)))
-                }
-            }
-
-        try {
-            Preferences.get<String>("download_folder").also {
-                if (it.startsWith("content://"))
-                    contentResolver.takePersistableUriPermission(
-                        Uri.parse(it),
-                        Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-                    )
-
-                if (!FileX(this, it).canWrite())
-                    throw Exception()
-            }
-        } catch (e: Exception) {
-            Preferences.remove("download_folder")
-        }
-
-        if (!Preferences["reset_secure", false]) {
-            Preferences["security_mode"] = false
-            Preferences["reset_secure"] = true
-        }
-
-        histories = SavedSet(File(ContextCompat.getDataDir(this), "histories.json"), 0)
-        favorites = SavedSet(File(ContextCompat.getDataDir(this), "favorites.json"), 0)
-        favoriteTags =
-            SavedSet(File(ContextCompat.getDataDir(this), "favorites_tags.json"), Tag.parse(""))
-        searchHistory = SavedSet(File(ContextCompat.getDataDir(this), "search_histories.json"), "")
-
-        favoriteTags.filter { it.tag.contains('_') }.forEach {
-            favoriteTags.remove(it)
-        }
-
-        /*
-        if (BuildConfig.DEBUG)
-            FirebaseAnalytics.getInstance(this).setAnalyticsCollectionEnabled(false)*/
-
-        try {
-            ProviderInstaller.installIfNeeded(this)
-        } catch (e: GooglePlayServicesRepairableException) {
-            e.printStackTrace()
-        } catch (e: GooglePlayServicesNotAvailableException) {
-            e.printStackTrace()
-        }
-
-        BigImageViewer.initialize(
-            FrescoImageLoader.with(
-                this,
-                OkHttpImagePipelineConfigFactory
-                    .newBuilder(this, client)
-                    .build()
-            )
-        )
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-
-            manager.createNotificationChannel(
-                NotificationChannel(
-                    "download",
-                    getString(R.string.channel_download),
-                    NotificationManager.IMPORTANCE_LOW
-                ).apply {
-                    description = getString(R.string.channel_download_description)
-                    enableLights(false)
-                    enableVibration(false)
-                    lockscreenVisibility = Notification.VISIBILITY_SECRET
-                })
-
-            manager.createNotificationChannel(
-                NotificationChannel(
-                    "downloader",
-                    getString(R.string.channel_downloader),
-                    NotificationManager.IMPORTANCE_LOW
-                ).apply {
-                    description = getString(R.string.channel_downloader_description)
-                    enableLights(false)
-                    enableVibration(false)
-                    lockscreenVisibility = Notification.VISIBILITY_SECRET
-                })
-
-            manager.createNotificationChannel(
-                NotificationChannel(
-                    "update",
-                    getString(R.string.channel_update),
-                    NotificationManager.IMPORTANCE_HIGH
-                ).apply {
-                    description = getString(R.string.channel_update_description)
-                    enableLights(true)
-                    enableVibration(true)
-                    lockscreenVisibility = Notification.VISIBILITY_SECRET
-                })
-
-            manager.createNotificationChannel(
-                NotificationChannel(
-                    "import",
-                    getString(R.string.channel_update),
-                    NotificationManager.IMPORTANCE_LOW
-                ).apply {
-                    description = getString(R.string.channel_update_description)
-                    enableLights(false)
-                    enableVibration(false)
-                    lockscreenVisibility = Notification.VISIBILITY_SECRET
-                })
-
-            manager.createNotificationChannel(
-                NotificationChannel(
-                    "transfer",
-                    getString(R.string.channel_transfer),
-                    NotificationManager.IMPORTANCE_LOW
-                ).apply {
-                    description = getString(R.string.channel_transfer_description)
-                    enableLights(false)
-                    enableVibration(false)
-                    lockscreenVisibility = Notification.VISIBILITY_SECRET
-                })
-        }
-
-        AppCompatDelegate.setDefaultNightMode(
-            when (Preferences.get<Boolean>("dark_mode")) {
-                true -> AppCompatDelegate.MODE_NIGHT_YES
-                false -> AppCompatDelegate.MODE_NIGHT_NO
-            }
-        )
-
-        super.onCreate()
-    }
-
-}

app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt

@@ -1,323 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.adapters
-
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
-import android.graphics.drawable.Drawable
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.RecyclerView
-import androidx.vectordrawable.graphics.drawable.Animatable2Compat
-import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
-import com.daimajia.swipe.SwipeLayout
-import com.daimajia.swipe.adapters.RecyclerSwipeAdapter
-import com.daimajia.swipe.interfaces.SwipeAdapterInterface
-import com.github.piasy.biv.loader.ImageLoader
-import kotlinx.coroutines.*
-import xyz.quaver.io.util.getChild
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.databinding.GalleryblockItemBinding
-import xyz.quaver.pupil.favoriteTags
-import xyz.quaver.pupil.favorites
-import xyz.quaver.pupil.hitomi.getGallery
-import xyz.quaver.pupil.hitomi.getGalleryInfo
-import xyz.quaver.pupil.types.Tag
-import xyz.quaver.pupil.ui.view.ProgressCard
-import xyz.quaver.pupil.util.Preferences
-import xyz.quaver.pupil.util.downloader.Cache
-import xyz.quaver.pupil.util.downloader.DownloadManager
-import xyz.quaver.pupil.util.wordCapitalize
-import java.io.File
-
-class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapter<RecyclerView.ViewHolder>(), SwipeAdapterInterface {
-
-    var updateAll = true
-    var thin: Boolean = Preferences["thin"]
-
-    inner class GalleryViewHolder(val binding: GalleryblockItemBinding) : RecyclerView.ViewHolder(binding.root) {
-        private var galleryID: Int = 0
-
-        init {
-            CoroutineScope(Dispatchers.Main).launch {
-                while (updateAll) {
-                    updateProgress(itemView.context)
-                    delay(1000)
-                }
-            }
-        }
-
-        private fun updateProgress(context: Context) = CoroutineScope(Dispatchers.Main).launch {
-            with(binding.galleryblockCard) {
-                val imageList = Cache.getInstance(context, galleryID).metadata.imageList
-
-                if (imageList == null) {
-                    max = 0
-                    return@with
-                }
-
-                progress = imageList.count { it != null }
-                max = imageList.size
-
-                this@GalleryViewHolder.binding.galleryblockId.setOnClickListener {
-                    (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(
-                        ClipData.newPlainText("gallery_id", galleryID.toString())
-                    )
-                    Toast.makeText(context, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
-                }
-
-                type = if (!imageList.contains(null)) {
-                    val downloadManager = DownloadManager.getInstance(context)
-
-                    if (downloadManager.getDownloadFolder(galleryID) == null)
-                        ProgressCard.Type.CACHE
-                    else
-                        ProgressCard.Type.DOWNLOAD
-                } else
-                    ProgressCard.Type.LOADING
-            }
-        }
-
-        fun bind(galleryID: Int) {
-            this.galleryID = galleryID
-            updateProgress(itemView.context)
-
-            val cache = Cache.getInstance(itemView.context, galleryID)
-
-            CoroutineScope(Dispatchers.IO).launch {
-                val galleryBlock = cache.getGalleryBlock() ?: return@launch
-
-                launch(Dispatchers.Main) {
-                    val resources = itemView.context.resources
-                    val languages = resources.getStringArray(R.array.languages).map {
-                        it.split("|").let { split ->
-                            Pair(split[0], split[1])
-                        }
-                    }.toMap()
-
-                    val artists = galleryBlock.artists
-                    val series = galleryBlock.series
-
-                    binding.galleryblockThumbnail.apply {
-                        setOnClickListener {
-                            itemView.performClick()
-                        }
-                        setOnLongClickListener {
-                            itemView.performLongClick()
-                        }
-                        setFailureImage(ContextCompat.getDrawable(context, R.drawable.image_broken_variant))
-                        setImageLoaderCallback(object: ImageLoader.Callback {
-                            override fun onFail(error: Exception?) {
-                                Cache.delete(context, galleryID)
-                            }
-
-                            override fun onCacheHit(imageType: Int, image: File?) {}
-                            override fun onCacheMiss(imageType: Int, image: File?) {}
-                            override fun onFinish() {}
-                            override fun onProgress(progress: Int) {}
-                            override fun onStart() {}
-                            override fun onSuccess(image: File?) {}
-                        })
-                        ssiv?.recycle()
-                        CoroutineScope(Dispatchers.IO).launch {
-                            cache.getThumbnail().let { launch(Dispatchers.Main) {
-                                showImage(it)
-                            } }
-                        }
-                    }
-
-                    binding.galleryblockTitle.text = galleryBlock.title
-                    with(binding.galleryblockArtist) {
-                        text = artists.joinToString { it.wordCapitalize() }
-                        visibility = when {
-                            artists.isNotEmpty() -> View.VISIBLE
-                            else -> View.GONE
-                        }
-
-                        CoroutineScope(Dispatchers.IO).launch {
-                            val gallery = runCatching {
-                                getGallery(galleryID)
-                            }.getOrNull()
-
-                            if (gallery?.groups?.isNotEmpty() != true)
-                                return@launch
-
-                            launch(Dispatchers.Main) {
-                                text = context.getString(
-                                    R.string.galleryblock_artist_with_group,
-                                    artists.joinToString { it.wordCapitalize() },
-                                    gallery.groups.joinToString { it.wordCapitalize() }
-                                )
-                            }
-                        }
-                    }
-                    with(binding.galleryblockSeries) {
-                        text =
-                            resources.getString(
-                                R.string.galleryblock_series,
-                                series.joinToString(", ") { it.wordCapitalize() })
-                        visibility = when {
-                            series.isNotEmpty() -> View.VISIBLE
-                            else -> View.GONE
-                        }
-                    }
-                    binding.galleryblockType.text = resources.getString(R.string.galleryblock_type, galleryBlock.type).wordCapitalize()
-                    with(binding.galleryblockLanguage) {
-                        text =
-                            resources.getString(R.string.galleryblock_language, languages[galleryBlock.language])
-                        visibility = when {
-                            !galleryBlock.language.isNullOrEmpty() -> View.VISIBLE
-                            else -> View.GONE
-                        }
-                    }
-
-                    with(binding.galleryblockTagGroup) {
-                        onClickListener = {
-                            onChipClickedHandler.forEach { callback ->
-                                callback.invoke(it)
-                            }
-                        }
-
-                        tags.clear()
-
-                        CoroutineScope(Dispatchers.IO).launch {
-                            tags.addAll(
-                                galleryBlock.relatedTags.sortedBy {
-                                    val tag = Tag.parse(it)
-
-                                    if (favoriteTags.contains(tag))
-                                        -1
-                                    else
-                                        when(Tag.parse(it).area) {
-                                            "female" -> 0
-                                            "male" -> 1
-                                            else -> 2
-                                        }
-                                }.map {
-                                    Tag.parse(it)
-                                }
-                            )
-
-                            launch(Dispatchers.Main) {
-                                refresh()
-                            }
-                        }
-                    }
-
-                    binding.galleryblockId.text = galleryBlock.id.toString()
-                    binding.galleryblockPagecount.text = "-"
-                    CoroutineScope(Dispatchers.IO).launch {
-                        val pageCount = kotlin.runCatching {
-                            getGalleryInfo(galleryBlock.id).files.size
-                        }.getOrNull() ?: return@launch
-                        withContext(Dispatchers.Main) {
-                            binding.galleryblockPagecount.text = itemView.context.getString(R.string.galleryblock_pagecount, pageCount)
-                        }
-                    }
-
-                    with(binding.galleryblockFavorite) {
-                        setImageResource(if (favorites.contains(galleryBlock.id)) R.drawable.ic_star_filled else R.drawable.ic_star_empty)
-                        setOnClickListener {
-                            when {
-                                favorites.contains(galleryBlock.id) -> {
-                                    favorites.remove(galleryBlock.id)
-
-                                    setImageResource(R.drawable.ic_star_empty)
-                                }
-                                else -> {
-                                    favorites.add(galleryBlock.id)
-
-                                    setImageDrawable(AnimatedVectorDrawableCompat.create(context, R.drawable.avd_star).apply {
-                                        this ?: return@apply
-
-                                        registerAnimationCallback(object: Animatable2Compat.AnimationCallback() {
-                                            override fun onAnimationEnd(drawable: Drawable?) {
-                                                setImageResource(R.drawable.ic_star_filled)
-                                            }
-                                        })
-                                        start()
-                                    })
-                                }
-                            }
-                        }
-                    }
-
-
-                }
-            }
-
-            // Make some views invisible to make it thinner
-            if (thin) {
-                binding.galleryblockTagGroup.visibility = View.GONE
-            }
-        }
-    }
-
-    val onChipClickedHandler = ArrayList<((Tag) -> Unit)>()
-    var onDownloadClickedHandler: ((Int) -> Unit)? = null
-    var onDeleteClickedHandler: ((Int) -> Unit)? = null
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return GalleryViewHolder(GalleryblockItemBinding.inflate(LayoutInflater.from(parent.context), parent, false))
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        if (holder is GalleryViewHolder) {
-            val galleryID = galleries[position]
-
-            holder.bind(galleryID)
-
-            holder.binding.galleryblockCard.binding.download.setOnClickListener {
-                onDownloadClickedHandler?.invoke(position)
-            }
-
-            holder.binding.galleryblockCard.binding.delete.setOnClickListener {
-                onDeleteClickedHandler?.invoke(position)
-            }
-
-            mItemManger.bindView(holder.binding.root, position)
-
-            holder.binding.galleryblockCard.binding.swipeLayout.addSwipeListener(object: SwipeLayout.SwipeListener {
-                override fun onStartOpen(layout: SwipeLayout?) {
-                    mItemManger.closeAllExcept(layout)
-
-                    holder.binding.galleryblockCard.binding.download.text =
-                        if (DownloadManager.getInstance(holder.binding.root.context).isDownloading(galleryID))
-                            holder.binding.root.context.getString(android.R.string.cancel)
-                        else
-                            holder.binding.root.context.getString(R.string.main_download)
-                }
-
-                override fun onClose(layout: SwipeLayout?) {}
-                override fun onHandRelease(layout: SwipeLayout?, xvel: Float, yvel: Float) {}
-                override fun onOpen(layout: SwipeLayout?) {}
-                override fun onStartClose(layout: SwipeLayout?) {}
-                override fun onUpdate(layout: SwipeLayout?, leftOffset: Int, topOffset: Int) {}
-            })
-        }
-    }
-
-    override fun getItemCount() = galleries.size
-
-    override fun getSwipeLayoutResourceId(position: Int) = R.id.swipe_layout
-}

app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt

@@ -1,250 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.adapters
-
-import android.content.Context
-import android.graphics.drawable.Animatable
-import android.net.Uri
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.content.ContextCompat
-import androidx.core.view.updateLayoutParams
-import androidx.recyclerview.widget.RecyclerView
-import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
-import com.facebook.drawee.backends.pipeline.Fresco
-import com.facebook.drawee.controller.BaseControllerListener
-import com.facebook.drawee.drawable.ScalingUtils
-import com.facebook.drawee.interfaces.DraweeController
-import com.facebook.drawee.view.SimpleDraweeView
-import com.facebook.imagepipeline.image.ImageInfo
-import com.github.piasy.biv.view.BigImageView
-import com.github.piasy.biv.view.ImageShownCallback
-import com.github.piasy.biv.view.ImageViewFactory
-import kotlinx.coroutines.*
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.databinding.ReaderItemBinding
-import xyz.quaver.pupil.hitomi.GalleryInfo
-import xyz.quaver.pupil.ui.ReaderActivity
-import xyz.quaver.pupil.util.downloader.Cache
-import java.io.File
-import kotlin.math.roundToInt
-
-class ReaderAdapter(
-    private val activity: ReaderActivity,
-    private val galleryID: Int
-) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {
-    var galleryInfo: GalleryInfo? = null
-
-    var isFullScreen = false
-
-    var onItemClickListener : (() -> (Unit))? = null
-
-    inner class ViewHolder(private val binding: ReaderItemBinding) : RecyclerView.ViewHolder(binding.root) {
-        init {
-            with (binding.image) {
-                setImageViewFactory(FrescoImageViewFactory().apply {
-                    updateView = { imageInfo ->
-                        binding.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
-                            dimensionRatio = "${imageInfo.width}:${imageInfo.height}"
-                        }
-                    }
-                })
-                setImageShownCallback(object : ImageShownCallback {
-                    override fun onMainImageShown() {
-                        binding.image.mainView.let { v ->
-                            when (v) {
-                                is SubsamplingScaleImageView ->
-                                    if (!isFullScreen) binding.image.layoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT
-                            }
-                        }
-                    }
-
-                    override fun onThumbnailShown() {}
-                })
-
-                setFailureImage(ContextCompat.getDrawable(itemView.context, R.drawable.image_broken_variant))
-                setOnClickListener {
-                    onItemClickListener?.invoke()
-                }
-            }
-
-            binding.root.setOnClickListener {
-                onItemClickListener?.invoke()
-            }
-        }
-
-        fun bind(position: Int) {
-            if (cache == null)
-                cache = Cache.getInstance(itemView.context, galleryID)
-
-            if (!isFullScreen) {
-                binding.root.setBackgroundResource(R.drawable.reader_item_boundary)
-                binding.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
-                    height = 0
-                    dimensionRatio =
-                        "${galleryInfo!!.files[position].width}:${galleryInfo!!.files[position].height}"
-                }
-            } else {
-                binding.root.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
-                binding.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
-                    height = ConstraintLayout.LayoutParams.MATCH_PARENT
-                    dimensionRatio = null
-                }
-                binding.root.background = null
-            }
-
-            binding.readerIndex.text = (position+1).toString()
-
-            val image = cache!!.getImage(position)
-            val progress = activity.downloader?.progress?.get(galleryID)?.get(position)
-
-            if (progress?.isInfinite() == true && image != null) {
-                binding.progressGroup.visibility = View.INVISIBLE
-                binding.image.showImage(image.uri)
-            } else {
-                binding.progressGroup.visibility = View.VISIBLE
-                binding.readerItemProgressbar.progress =
-                    if (progress?.isInfinite() == true)
-                        100
-                    else
-                        progress?.roundToInt() ?: 0
-
-                clear()
-
-                CoroutineScope(Dispatchers.Main).launch {
-                    delay(1000)
-                    notifyItemChanged(position)
-                }
-            }
-        }
-
-        fun clear() {
-            binding.image.mainView.let {
-                when (it) {
-                    is SubsamplingScaleImageView ->
-                        it.recycle()
-                    is SimpleDraweeView ->
-                        it.controller = null
-                }
-            }
-        }
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(ReaderItemBinding.inflate(LayoutInflater.from(parent.context), parent, false))
-    }
-
-    private var cache: Cache? = null
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder.bind(position)
-    }
-
-    override fun getItemCount() = galleryInfo?.files?.size ?: 0
-
-    override fun onViewRecycled(holder: ViewHolder) {
-        holder.clear()
-    }
-
-}
-
-class FrescoImageViewFactory : ImageViewFactory() {
-    var updateView: ((ImageInfo) -> Unit)? = null
-
-    override fun createAnimatedImageView(
-        context: Context, imageType: Int,
-        initScaleType: Int
-    ): View {
-        val view = SimpleDraweeView(context)
-        view.hierarchy.actualImageScaleType = scaleType(initScaleType)
-        return view
-    }
-
-    override fun loadAnimatedContent(
-        view: View, imageType: Int,
-        imageFile: File
-    ) {
-        if (view is SimpleDraweeView) {
-            val controller: DraweeController = Fresco.newDraweeControllerBuilder()
-                .setUri(Uri.parse("file://" + imageFile.absolutePath))
-                .setAutoPlayAnimations(true)
-                .setControllerListener(object: BaseControllerListener<ImageInfo>() {
-                    override fun onIntermediateImageSet(id: String?, imageInfo: ImageInfo?) {
-                        imageInfo?.let { updateView?.invoke(it) }
-                    }
-
-                    override fun onFinalImageSet(id: String?, imageInfo: ImageInfo?, animatable: Animatable?) {
-                        imageInfo?.let { updateView?.invoke(it) }
-                    }
-                })
-                .build()
-            view.controller = controller
-        }
-    }
-
-    override fun createThumbnailView(
-        context: Context,
-        scaleType: ImageView.ScaleType, willLoadFromNetwork: Boolean
-    ): View {
-        return if (willLoadFromNetwork) {
-            val thumbnailView = SimpleDraweeView(context)
-            thumbnailView.hierarchy.actualImageScaleType = scaleType(scaleType)
-            thumbnailView
-        } else {
-            super.createThumbnailView(context, scaleType, false)
-        }
-    }
-
-    override fun loadThumbnailContent(view: View, thumbnail: Uri) {
-        if (view is SimpleDraweeView) {
-            val controller: DraweeController = Fresco.newDraweeControllerBuilder()
-                .setUri(thumbnail)
-                .build()
-            view.controller = controller
-        }
-    }
-
-    private fun scaleType(value: Int): ScalingUtils.ScaleType {
-        return when (value) {
-            BigImageView.INIT_SCALE_TYPE_CENTER -> ScalingUtils.ScaleType.CENTER
-            BigImageView.INIT_SCALE_TYPE_CENTER_CROP -> ScalingUtils.ScaleType.CENTER_CROP
-            BigImageView.INIT_SCALE_TYPE_CENTER_INSIDE -> ScalingUtils.ScaleType.CENTER_INSIDE
-            BigImageView.INIT_SCALE_TYPE_FIT_END -> ScalingUtils.ScaleType.FIT_END
-            BigImageView.INIT_SCALE_TYPE_FIT_START -> ScalingUtils.ScaleType.FIT_START
-            BigImageView.INIT_SCALE_TYPE_FIT_XY -> ScalingUtils.ScaleType.FIT_XY
-            BigImageView.INIT_SCALE_TYPE_FIT_CENTER -> ScalingUtils.ScaleType.FIT_CENTER
-            else -> ScalingUtils.ScaleType.FIT_CENTER
-        }
-    }
-
-    private fun scaleType(scaleType: ImageView.ScaleType): ScalingUtils.ScaleType {
-        return when (scaleType) {
-            ImageView.ScaleType.CENTER -> ScalingUtils.ScaleType.CENTER
-            ImageView.ScaleType.CENTER_CROP -> ScalingUtils.ScaleType.CENTER_CROP
-            ImageView.ScaleType.CENTER_INSIDE -> ScalingUtils.ScaleType.CENTER_INSIDE
-            ImageView.ScaleType.FIT_END -> ScalingUtils.ScaleType.FIT_END
-            ImageView.ScaleType.FIT_START -> ScalingUtils.ScaleType.FIT_START
-            ImageView.ScaleType.FIT_XY -> ScalingUtils.ScaleType.FIT_XY
-            ImageView.ScaleType.FIT_CENTER -> ScalingUtils.ScaleType.FIT_CENTER
-            else -> ScalingUtils.ScaleType.FIT_CENTER
-        }
-    }
-}

app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailAdapter.kt

@@ -1,52 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.adapters
-
-import android.net.Uri
-import android.view.ViewGroup
-import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.RecyclerView
-import com.github.piasy.biv.view.BigImageView
-import xyz.quaver.pupil.R
-
-class ThumbnailAdapter(var thumbnails: List<String>) : RecyclerView.Adapter<ThumbnailAdapter.ViewHolder>() {
-
-    class ViewHolder(val view: BigImageView) : RecyclerView.ViewHolder(view) {
-        fun clear() {
-            view.ssiv?.recycle()
-        }
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(BigImageView(parent.context).apply {
-            setFailureImage(ContextCompat.getDrawable(context, R.drawable.image_broken_variant))
-        })
-    }
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder.view.showImage(Uri.parse(thumbnails[position]))
-    }
-
-    override fun getItemCount() = thumbnails.size
-
-    override fun onViewRecycled(holder: ViewHolder) {
-        holder.clear()
-    }
-
-}

app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailPageAdapter.kt

@@ -1,52 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.adapters
-
-import android.view.ViewGroup
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import kotlin.math.min
-
-class ThumbnailPageAdapter(private val thumbnails: List<String>) : RecyclerView.Adapter<ThumbnailPageAdapter.ViewHolder>() {
-
-    class ViewHolder(val view: RecyclerView) : RecyclerView.ViewHolder(view)
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(RecyclerView(parent.context).apply {
-            val layoutManager = GridLayoutManager(parent.context, 3)
-            val adapter = ThumbnailAdapter(listOf())
-
-            this.layoutManager = layoutManager
-            this.adapter = adapter
-            layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
-        })
-    }
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        (holder.view.adapter as ThumbnailAdapter).apply {
-            thumbnails = this@ThumbnailPageAdapter.thumbnails.slice(9*position until min(9*position+9, this@ThumbnailPageAdapter.thumbnails.size))
-            notifyDataSetChanged()
-
-            (holder.view.layoutManager as GridLayoutManager).scrollToPosition(8)
-        }
-    }
-
-    override fun getItemCount() = if (thumbnails.isEmpty()) 0 else thumbnails.size/9 + if (thumbnails.size%9 != 0) 1 else 0
-
-}

app/src/main/java/xyz/quaver/pupil/adapters/TransferPeersAdapter.kt

@@ -1,44 +0,0 @@
-package xyz.quaver.pupil.adapters
-
-import android.net.wifi.p2p.WifiP2pDevice
-import android.net.wifi.p2p.WifiP2pDeviceList
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.BaseAdapter
-import androidx.recyclerview.widget.RecyclerView
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.databinding.TransferPeerListItemBinding
-
-class TransferPeersAdapter(
-    private val devices: Collection<WifiP2pDevice>,
-    private val onDeviceSelected: (WifiP2pDevice) -> Unit
-): RecyclerView.Adapter<TransferPeersAdapter.ViewHolder>() {
-
-    class ViewHolder(val binding: TransferPeerListItemBinding): RecyclerView.ViewHolder(binding.root)
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val binding = TransferPeerListItemBinding.inflate(
-            LayoutInflater.from(parent.context),
-            parent,
-            false
-        )
-        return ViewHolder(binding)
-    }
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val device = devices.elementAt(position)
-
-        holder.binding.deviceName.text = device.deviceName
-        holder.binding.deviceAddress.text = device.deviceAddress
-
-        holder.binding.root.setOnClickListener {
-            onDeviceSelected(device)
-        }
-    }
-
-    override fun getItemCount(): Int {
-        return devices.size
-    }
-}

app/src/main/java/xyz/quaver/pupil/hitomi/common.kt

@@ -1,273 +0,0 @@
-/*
- *    Copyright 2019 tom5079
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package xyz.quaver.pupil.hitomi
-
-import kotlinx.coroutines.*
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.datetime.Clock.System.now
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.json.Json
-import okhttp3.Call
-import okhttp3.Callback
-import okhttp3.Request
-import okhttp3.Response
-import xyz.quaver.pupil.client
-import java.io.IOException
-import java.net.URL
-import java.util.concurrent.Executors
-import kotlin.coroutines.resumeWithException
-import kotlin.time.Duration.Companion.minutes
-import kotlin.time.ExperimentalTime
-
-const val protocol = "https:"
-
-@Serializable
-data class Artist(
-    val artist: String,
-    val url: String
-)
-
-@Serializable
-data class Group(
-    val group: String,
-    val url: String
-)
-
-@Serializable
-data class Parody(
-    val parody: String,
-    val url: String
-)
-
-@Serializable
-data class Character(
-    val character: String,
-    val url: String
-)
-
-@Serializable
-data class Tag(
-    val tag: String,
-    val url: String,
-    val female: String? = null,
-    val male: String? = null
-)
-
-@Serializable
-data class Language(
-    val galleryid: String,
-    val url: String,
-    val language_localname: String,
-    val name: String
-)
-
-@Serializable
-data class GalleryInfo(
-    val id: String,
-    val title: String,
-    val japanese_title: String? = null,
-    val language: String? = null,
-    val type: String,
-    val date: String,
-    val artists: List<Artist>? = null,
-    val groups: List<Group>? = null,
-    val parodys: List<Parody>? = null,
-    val tags: List<Tag>? = null,
-    val related: List<Int> = emptyList(),
-    val languages: List<Language> = emptyList(),
-    val characters: List<Character>? = null,
-    val scene_indexes: List<Int>? = emptyList(),
-    val files: List<GalleryFiles> = emptyList()
-)
-
-val json = Json {
-    isLenient = true
-    ignoreUnknownKeys = true
-    allowSpecialFloatingPointValues = true
-    useArrayPolymorphism = true
-}
-
-typealias HeaderSetter = (Request.Builder) -> Request.Builder
-fun URL.readText(settings: HeaderSetter? = null): String {
-    val request = Request.Builder()
-        .url(this).let {
-            settings?.invoke(it) ?: it
-        }.build()
-
-    return client.newCall(request).execute().also{ if (it.code() != 200) throw IOException("CODE ${it.code()}") }.body()?.use { it.string() } ?: throw IOException()
-}
-
-fun URL.readBytes(settings: HeaderSetter? = null): ByteArray {
-    val request = Request.Builder()
-        .url(this).let {
-            settings?.invoke(it) ?: it
-        }.build()
-
-    return client.newCall(request).execute().also { if (it.code() != 200) throw IOException("CODE ${it.code()}") }.body()?.use { it.bytes() } ?: throw IOException()
-}
-
-@Suppress("EXPERIMENTAL_API_USAGE")
-fun getGalleryInfo(galleryID: Int) =
-    json.decodeFromString<GalleryInfo>(
-        URL("$protocol//$domain/galleries/$galleryID.js").readText()
-            .replace("var galleryinfo = ", "")
-    )
-
-//common.js
-const val domain = "ltn.hitomi.la"
-const val galleryblockextension = ".html"
-const val galleryblockdir = "galleryblock"
-const val nozomiextension = ".nozomi"
-
-val evaluationContext = Dispatchers.Main + Job()
-
-object gg {
-    private var lastRetrieval: Long? = null
-
-    private val mutex = Mutex()
-
-    private var mDefault = 0
-    private val mMap = mutableMapOf<Int, Int>()
-
-    private var b = ""
-
-    @OptIn(ExperimentalTime::class, ExperimentalCoroutinesApi::class)
-    private suspend fun refresh() = withContext(Dispatchers.IO) {
-        mutex.withLock {
-            if (lastRetrieval == null || (lastRetrieval!! + 60000) < System.currentTimeMillis()) {
-                val ggjs: String = suspendCancellableCoroutine { continuation ->
-                    val call = client.newCall(Request.Builder().url("https://ltn.hitomi.la/gg.js").build())
-
-                    call.enqueue(object: Callback {
-                        override fun onFailure(call: Call, e: IOException) {
-                            if (continuation.isCancelled) return
-                            continuation.resumeWithException(e)
-                        }
-
-                        override fun onResponse(call: Call, response: Response) {
-                            if (!call.isCanceled) {
-                                response.body()?.use {
-                                    continuation.resume(it.string()) {
-                                        call.cancel()
-                                    }
-                                }
-                            }
-                        }
-                    })
-
-                    continuation.invokeOnCancellation {
-                        call.cancel()
-                    }
-                }
-
-                mDefault = Regex("var o = (\\d)").find(ggjs)!!.groupValues[1].toInt()
-                val o = Regex("o = (\\d); break;").find(ggjs)!!.groupValues[1].toInt()
-
-                mMap.clear()
-                Regex("case (\\d+):").findAll(ggjs).forEach {
-                    val case = it.groupValues[1].toInt()
-                    mMap[case] = o
-                }
-
-                b = Regex("b: '(.+)'").find(ggjs)!!.groupValues[1]
-
-                lastRetrieval = System.currentTimeMillis()
-            }
-        }
-    }
-
-    suspend fun m(g: Int): Int {
-        refresh()
-
-        return mMap[g] ?: mDefault
-    }
-
-    suspend fun b(): String {
-        refresh()
-        return b
-    }
-    fun s(h: String): String {
-        val m = Regex("(..)(.)$").find(h)
-        return m!!.groupValues.let { it[2]+it[1] }.toInt(16).toString(10)
-    }
-}
-
-suspend fun subdomainFromURL(url: String, base: String? = null) : String {
-    var retval = "b"
-
-    if (!base.isNullOrBlank())
-        retval = base
-
-    val b = 16
-
-    val r = Regex("""/[0-9a-f]{61}([0-9a-f]{2})([0-9a-f])""")
-    val m = r.find(url) ?: return "a"
-
-    val g = m.groupValues.let { it[2]+it[1] }.toIntOrNull(b)
-
-    if (g != null) {
-        retval = (97+ gg.m(g)).toChar().toString() + retval
-    }
-
-    return retval
-}
-
-suspend fun urlFromUrl(url: String, base: String? = null) : String {
-    return url.replace(Regex("""//..?\.hitomi\.la/"""), "//${subdomainFromURL(url, base)}.hitomi.la/")
-}
-
-suspend fun fullPathFromHash(hash: String) : String =
-    "${gg.b()}${gg.s(hash)}/$hash"
-
-fun realFullPathFromHash(hash: String): String =
-    hash.replace(Regex("""^.*(..)(.)$"""), "$2/$1/$hash")
-
-suspend fun urlFromHash(galleryID: Int, image: GalleryFiles, dir: String? = null, ext: String? = null) : String {
-    val ext = ext ?: dir ?: image.name.takeLastWhile { it != '.' }
-    val dir = dir ?: "images"
-    return "https://a.hitomi.la/$dir/${fullPathFromHash(image.hash)}.$ext"
-}
-
-suspend fun urlFromUrlFromHash(galleryID: Int, image: GalleryFiles, dir: String? = null, ext: String? = null, base: String? = null) =
-    if (base == "tn")
-        urlFromUrl("https://a.hitomi.la/$dir/${realFullPathFromHash(image.hash)}.$ext", base)
-    else
-        urlFromUrl(urlFromHash(galleryID, image, dir, ext), base)
-
-suspend fun rewriteTnPaths(html: String) {
-    html.replace(Regex("""//tn\.hitomi\.la/[^/]+/[0-9a-f]/[0-9a-f]{2}/[0-9a-f]{64}""")) { url ->
-        runBlocking {
-            urlFromUrl(url.value, "tn")
-        }
-    }
-}
-
-suspend fun imageUrlFromImage(galleryID: Int, image: GalleryFiles, noWebp: Boolean) : String {
-    return urlFromUrlFromHash(galleryID, image, "webp", null, "a")
-//    return when {
-//        noWebp ->
-//            urlFromUrlFromHash(galleryID, image)
-////        image.hasavif != 0 ->
-////            urlFromUrlFromHash(galleryID, image, "avif", null, "a")
-//        image.haswebp != 0 ->
-//            urlFromUrlFromHash(galleryID, image, "webp", null, "a")
-//        else ->
-//            urlFromUrlFromHash(galleryID, image)
-//    }
-}

app/src/main/java/xyz/quaver/pupil/hitomi/galleries.kt

@@ -1,54 +0,0 @@
-/*
- *    Copyright 2019 tom5079
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package xyz.quaver.pupil.hitomi
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class Gallery(
-    val related: List<Int>,
-    val langList: List<Pair<String, String>>,
-    val cover: String,
-    val title: String,
-    val artists: List<String>,
-    val groups: List<String>,
-    val type: String,
-    val language: String,
-    val series: List<String>,
-    val characters: List<String>,
-    val tags: List<String>,
-    val thumbnails: List<String>
-)
-
-suspend fun getGallery(galleryID: Int) : Gallery {
-    val info = getGalleryInfo(galleryID)
-
-    return Gallery(
-        info.related,
-        info.languages.map { it.name to it.galleryid },
-        urlFromUrlFromHash(galleryID, info.files.first(), "webpbigtn", "webp", "tn"),
-        info.title,
-        info.artists?.map { it.artist }.orEmpty(),
-        info.groups?.map { it.group }.orEmpty(),
-        info.type,
-        info.language.orEmpty(),
-        info.parodys?.map { it.parody }.orEmpty(),
-        info.characters?.map { it.character }.orEmpty(),
-        info.tags?.map { "${if (it.female.isNullOrEmpty()) "" else "female:"}${if (it.male.isNullOrEmpty()) "" else "male:"}${it.tag}" }.orEmpty(),
-        info.files.map { urlFromUrlFromHash(galleryID, it, "webpsmalltn", "webp", "tn") }
-    )
-}

app/src/main/java/xyz/quaver/pupil/hitomi/galleryblock.kt

@@ -1,92 +0,0 @@
-/*
- *    Copyright 2019 tom5079
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package xyz.quaver.pupil.hitomi
-
-import kotlinx.serialization.Serializable
-import org.jsoup.Jsoup
-import java.net.URL
-import java.net.URLDecoder
-import java.nio.ByteBuffer
-import java.nio.ByteOrder
-import javax.net.ssl.HttpsURLConnection
-import kotlin.io.readText
-
-//galleryblock.js
-fun fetchNozomi(area: String? = null, tag: String = "index", language: String = "all", start: Int = -1, count: Int = -1) : Pair<List<Int>, Int> {
-    val url = when(area) {
-        null -> "$protocol//$domain/$tag-$language$nozomiextension"
-        else -> "$protocol//$domain/$area/$tag-$language$nozomiextension"
-    }
-
-    with(URL(url).openConnection() as HttpsURLConnection) {
-        requestMethod = "GET"
-
-        if (start != -1 && count != -1) {
-            val startByte = start*4
-            val endByte = (start+count)*4-1
-
-            setRequestProperty("Range", "bytes=$startByte-$endByte")
-        }
-
-        connect()
-
-        val totalItems = getHeaderField("Content-Range")
-            .replace(Regex("^[Bb]ytes \\d+-\\d+/"), "").toInt() / 4
-
-        val nozomi = ArrayList<Int>()
-
-        val arrayBuffer = ByteBuffer
-            .wrap(inputStream.readBytes())
-            .order(ByteOrder.BIG_ENDIAN)
-
-        while (arrayBuffer.hasRemaining())
-            nozomi.add(arrayBuffer.int)
-
-        return Pair(nozomi, totalItems)
-    }
-}
-
-@Serializable
-data class GalleryBlock(
-    val id: Int,
-    val galleryUrl: String,
-    val thumbnails: List<String>,
-    val title: String,
-    val artists: List<String>,
-    val series: List<String>,
-    val type: String,
-    val language: String,
-    val relatedTags: List<String>,
-    val groups: List<String> = emptyList()
-)
-
-suspend fun getGalleryBlock(galleryID: Int) : GalleryBlock {
-    val info = getGalleryInfo(galleryID)
-
-    return GalleryBlock(
-        galleryID,
-        "",
-        listOf(urlFromUrlFromHash(galleryID, info.files.first(), "webpbigtn", "webp", "tn")),
-        info.title,
-        info.artists?.map { it.artist }.orEmpty(),
-        info.parodys?.map { it.parody }.orEmpty(),
-        info.type,
-        info.language.orEmpty(),
-        info.tags?.map { "${if (it.female.isNullOrEmpty()) "" else "female:"}${if (it.male.isNullOrEmpty()) "" else "male:"}${it.tag}" }.orEmpty(),
-        info.groups?.map { it.group }.orEmpty()
-    )
-}

app/src/main/java/xyz/quaver/pupil/hitomi/reader.kt

@@ -1,38 +0,0 @@
-/*
- *    Copyright 2019 tom5079
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package xyz.quaver.pupil.hitomi
-
-import kotlinx.serialization.Serializable
-import xyz.quaver.pupil.hitomi.GalleryInfo
-import xyz.quaver.pupil.hitomi.getGalleryInfo
-
-@Serializable
-data class GalleryFiles(
-    val width: Int,
-    val hash: String,
-    val haswebp: Int = 0,
-    val name: String,
-    val height: Int,
-    val hasavif: Int = 0,
-    val hasavifsmalltn: Int? = 0
-)
-
-//Set header `Referer` to reader url to avoid 403 error
-@Deprecated("", replaceWith = ReplaceWith("getGalleryInfo"))
-fun getReader(galleryID: Int) : GalleryInfo {
-   return getGalleryInfo(galleryID)
-}

app/src/main/java/xyz/quaver/pupil/hitomi/results.kt

@@ -1,94 +0,0 @@
-/*
- *    Copyright 2019 tom5079
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package xyz.quaver.pupil.hitomi
-
-import kotlinx.coroutines.async
-import kotlinx.coroutines.coroutineScope
-import java.util.LinkedList
-
-suspend fun doSearch(query: String, sortMode: SortMode): List<Int> = coroutineScope {
-    val terms = query
-        .trim()
-        .replace(Regex("""^\?"""), "")
-        .lowercase()
-        .split(Regex("\\s+"))
-        .map {
-            it.replace('_', ' ')
-        }
-
-    val positiveTerms = LinkedList<String>()
-    val negativeTerms = LinkedList<String>()
-
-    for (term in terms) {
-        if (term.startsWith("-"))
-            negativeTerms.push(term.substring(1))
-        else if (term.isNotBlank())
-            positiveTerms.push(term)
-    }
-
-    val positiveResults = positiveTerms.map {
-        async {
-            runCatching {
-                getGalleryIDsForQuery(it, sortMode)
-            }.getOrElse { emptySet() }
-        }
-    }
-
-    val negativeResults = negativeTerms.map {
-        async {
-            runCatching {
-                getGalleryIDsForQuery(it, sortMode)
-            }.getOrElse { emptySet() }
-        }
-    }
-
-    val results = when {
-        positiveTerms.isEmpty() -> getGalleryIDsFromNozomi(
-            SearchArgs("all", "index", "all"),
-            sortMode
-        )
-
-        else -> emptySet()
-    }.toMutableSet()
-
-    fun filterPositive(newResults: Set<Int>) {
-        when {
-            results.isEmpty() -> results.addAll(newResults)
-            else -> results.retainAll(newResults)
-        }
-    }
-
-    fun filterNegative(newResults: Set<Int>) {
-        results.removeAll(newResults)
-    }
-
-    //positive results
-    positiveResults.forEach {
-        filterPositive(it.await())
-    }
-
-    //negative results
-    negativeResults.forEach {
-        filterNegative(it.await())
-    }
-
-    return@coroutineScope if (sortMode != SortMode.RANDOM) {
-        results.toList()
-    } else {
-        results.shuffled()
-    }
-}

app/src/main/java/xyz/quaver/pupil/hitomi/search.kt

@@ -1,409 +0,0 @@
-/*
- *    Copyright 2019 tom5079
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package xyz.quaver.pupil.hitomi
-
-import kotlinx.serialization.json.jsonArray
-import okhttp3.Request
-import xyz.quaver.pupil.client
-import xyz.quaver.pupil.util.content
-import java.net.URL
-import java.nio.ByteBuffer
-import java.nio.ByteOrder
-import java.security.MessageDigest
-import kotlin.math.min
-
-data class SearchArgs(
-    val area: String?,
-    val tag: String,
-    val language: String,
-) {
-    companion object {
-        fun fromQuery(query: String): SearchArgs? {
-            if (!query.contains(':')) {
-                return null
-            }
-
-            val (left, right) = query.split(':')
-
-            return when (left) {
-                "male", "female" -> SearchArgs("tag", query, "all")
-                "language" -> SearchArgs("all", "index", right)
-                else -> SearchArgs(left, right, "all")
-            }
-        }
-    }
-}
-
-enum class SortMode {
-    DATE_ADDED,
-    DATE_PUBLISHED,
-    POPULAR_TODAY,
-    POPULAR_WEEK,
-    POPULAR_MONTH,
-    POPULAR_YEAR,
-    RANDOM;
-
-    val orderBy: String
-        get() = when (this) {
-            DATE_ADDED, DATE_PUBLISHED, RANDOM -> "date"
-            POPULAR_TODAY, POPULAR_WEEK, POPULAR_MONTH, POPULAR_YEAR -> "popular"
-        }
-
-    val orderByKey: String
-        get() = when (this) {
-            DATE_ADDED, RANDOM -> "added"
-            DATE_PUBLISHED -> "published"
-            POPULAR_TODAY -> "today"
-            POPULAR_WEEK -> "week"
-            POPULAR_MONTH -> "month"
-            POPULAR_YEAR -> "year"
-        }
-}
-
-//searchlib.js
-const val separator = "-"
-const val extension = ".html"
-const val index_dir = "tagindex"
-const val galleries_index_dir = "galleriesindex"
-const val max_node_size = 464
-const val B = 16
-const val compressed_nozomi_prefix = "n"
-
-val tag_index_version: String by lazy { getIndexVersion("tagindex") }
-val galleries_index_version: String by lazy { getIndexVersion("galleriesindex") }
-val tagIndexDomain = "tagindex.hitomi.la"
-
-fun sha256(data: ByteArray): ByteArray {
-    return MessageDigest.getInstance("SHA-256").digest(data)
-}
-
-@OptIn(ExperimentalUnsignedTypes::class)
-fun hashTerm(term: String): UByteArray {
-    return sha256(term.toByteArray()).toUByteArray().sliceArray(0 until 4)
-}
-
-fun sanitize(input: String): String {
-    return input.replace(Regex("[/#]"), "")
-}
-
-fun getIndexVersion(name: String) =
-    URL("$protocol//$domain/$name/version?_=${System.currentTimeMillis()}").readText()
-
-//search.js
-fun getGalleryIDsForQuery(query: String, sortMode: SortMode): Set<Int> {
-    val sanitizedQuery = query.replace("_", " ")
-
-    val args = SearchArgs.fromQuery(sanitizedQuery)
-
-    return if (args != null) {
-        getGalleryIDsFromNozomi(args, sortMode)
-    } else {
-        val key = hashTerm(sanitizedQuery)
-        val field = "galleries"
-
-        val node = getNodeAtAddress(field, 0)
-
-        val data = bSearch(field, key, node)
-
-        if (data != null)
-            return getGalleryIDsFromData(data)
-
-        return emptySet()
-    }
-}
-
-fun encodeSearchQueryForUrl(s: Char) =
-    when (s) {
-        ' ' -> "_"
-        '/' -> "slash"
-        '.' -> "dot"
-        else -> s.toString()
-    }
-
-fun getSuggestionsForQuery(query: String): List<Suggestion> {
-    query.replace('_', ' ').let {
-        var field = "global"
-        var term = it
-
-        if (term.indexOf(':') > -1) {
-            val sides = it.split(':')
-            field = sides[0]
-            term = sides[1]
-        }
-
-        val chars = term.map(::encodeSearchQueryForUrl)
-        val url =
-            "https://$tagIndexDomain/$field${if (chars.isNotEmpty()) "/${chars.joinToString("/")}" else ""}.json"
-
-        val request = Request.Builder()
-            .url(url)
-            .build()
-
-        val suggestions = json.parseToJsonElement(
-            client.newCall(request).execute().body()?.use { body -> body.string() }
-                ?: return emptyList())
-
-        return buildList {
-            suggestions.jsonArray.forEach { suggestionRaw ->
-                val suggestion = suggestionRaw.jsonArray
-                if (suggestion.size < 3) {
-                    return@forEach
-                }
-                val ns = suggestion[2].content ?: ""
-
-                val tagname = sanitize(suggestion[0].content ?: return@forEach)
-                val url = when (ns) {
-                    "female", "male" -> "/tag/$ns:$tagname${separator}1$extension"
-                    "language" -> "/index-$tagname${separator}1$extension"
-                    else -> "/$ns/$tagname${separator}all${separator}1$extension"
-                }
-
-                add(
-                    Suggestion(
-                        suggestion[0].content ?: "",
-                        suggestion[1].content?.toIntOrNull() ?: 0,
-                        url,
-                        ns
-                    )
-                )
-            }
-        }
-    }
-}
-
-data class Suggestion(val s: String, val t: Int, val u: String, val n: String)
-
-fun getSuggestionsFromData(field: String, data: Pair<Long, Int>): List<Suggestion> {
-    val url = "$protocol//$domain/$index_dir/$field.$tag_index_version.data"
-    val (offset, length) = data
-    if (length > 10000 || length <= 0)
-        throw Exception("length $length is too long")
-
-    val inbuf = getURLAtRange(url, offset.until(offset + length))
-
-    val suggestions = ArrayList<Suggestion>()
-
-    val buffer = ByteBuffer
-        .wrap(inbuf)
-        .order(ByteOrder.BIG_ENDIAN)
-    val numberOfSuggestions = buffer.int
-
-    if (numberOfSuggestions > 100 || numberOfSuggestions <= 0)
-        throw Exception("number of suggestions $numberOfSuggestions is too long")
-
-    for (i in 0.until(numberOfSuggestions)) {
-        var top = buffer.int
-
-        val ns = inbuf.sliceArray(buffer.position().until(buffer.position() + top))
-            .toString(charset("UTF-8"))
-        buffer.position(buffer.position() + top)
-
-        top = buffer.int
-
-        val tag = inbuf.sliceArray(buffer.position().until(buffer.position() + top))
-            .toString(charset("UTF-8"))
-        buffer.position(buffer.position() + top)
-
-        val count = buffer.int
-
-        val tagname = sanitize(tag)
-        val u =
-            when (ns) {
-                "female", "male" -> "/tag/$ns:$tagname${separator}1$extension"
-                "language" -> "/index-$tagname${separator}1$extension"
-                else -> "/$ns/$tagname${separator}all${separator}1$extension"
-            }
-
-        suggestions.add(Suggestion(tag, count, u, ns))
-    }
-
-    return suggestions
-}
-
-fun nozomiAddressFromArgs(args: SearchArgs, sortMode: SortMode) = when {
-    sortMode != SortMode.DATE_ADDED && sortMode != SortMode.RANDOM ->
-        if (args.area == "all") "$protocol//$domain/$compressed_nozomi_prefix/${sortMode.orderBy}/${sortMode.orderByKey}-${args.language}$nozomiextension"
-        else "$protocol//$domain/$compressed_nozomi_prefix/${args.area}/${sortMode.orderBy}/${sortMode.orderByKey}/${args.tag}-${args.language}$nozomiextension"
-
-    args.area == "all" -> "$protocol//$domain/$compressed_nozomi_prefix/${args.tag}-${args.language}$nozomiextension"
-    else -> "$protocol//$domain/$compressed_nozomi_prefix/${args.area}/${args.tag}-${args.language}$nozomiextension"
-}
-
-fun getGalleryIDsFromNozomi(args: SearchArgs, sortMode: SortMode): Set<Int> {
-    val nozomiAddress = nozomiAddressFromArgs(args, sortMode)
-
-    val bytes = URL(nozomiAddress).readBytes()
-
-    val nozomi = mutableSetOf<Int>()
-
-    val arrayBuffer = ByteBuffer
-        .wrap(bytes)
-        .order(ByteOrder.BIG_ENDIAN)
-
-    while (arrayBuffer.hasRemaining())
-        nozomi.add(arrayBuffer.int)
-
-    return nozomi
-}
-
-fun getGalleryIDsFromData(data: Pair<Long, Int>): Set<Int> {
-    val url = "$protocol//$domain/$galleries_index_dir/galleries.$galleries_index_version.data"
-    val (offset, length) = data
-    if (length > 100000000 || length <= 0)
-        throw Exception("length $length is too long")
-
-    val inbuf = getURLAtRange(url, offset.until(offset + length))
-
-    val galleryIDs = mutableSetOf<Int>()
-
-    val buffer = ByteBuffer
-        .wrap(inbuf)
-        .order(ByteOrder.BIG_ENDIAN)
-
-    val numberOfGalleryIDs = buffer.int
-
-    val expectedLength = numberOfGalleryIDs * 4 + 4
-
-    if (numberOfGalleryIDs > 10000000 || numberOfGalleryIDs <= 0)
-        throw Exception("number_of_galleryids $numberOfGalleryIDs is too long")
-    else if (inbuf.size != expectedLength)
-        throw Exception("inbuf.byteLength ${inbuf.size} != expected_length $expectedLength")
-
-    for (i in 0.until(numberOfGalleryIDs))
-        galleryIDs.add(buffer.int)
-
-    return galleryIDs
-}
-
-fun getNodeAtAddress(field: String, address: Long): Node {
-    val url =
-        when (field) {
-            "galleries" -> "$protocol//$domain/$galleries_index_dir/galleries.$galleries_index_version.index"
-            "languages" -> "$protocol//$domain/$galleries_index_dir/languages.$galleries_index_version.index"
-            "nozomiurl" -> "$protocol//$domain/$galleries_index_dir/nozomiurl.$galleries_index_version.index"
-            else -> "$protocol//$domain/$index_dir/$field.$tag_index_version.index"
-        }
-
-    val nodedata = getURLAtRange(url, address.until(address + max_node_size))
-
-    return decodeNode(nodedata)
-}
-
-fun getURLAtRange(url: String, range: LongRange): ByteArray {
-    val request = Request.Builder()
-        .url(url)
-        .header("Range", "bytes=${range.first}-${range.last}")
-        .build()
-
-    return client.newCall(request).execute().body()?.use { it.bytes() } ?: byteArrayOf()
-}
-
-@OptIn(ExperimentalUnsignedTypes::class)
-data class Node(
-    val keys: List<UByteArray>,
-    val datas: List<Pair<Long, Int>>,
-    val subNodeAddresses: List<Long>
-)
-
-@OptIn(ExperimentalUnsignedTypes::class)
-fun decodeNode(data: ByteArray): Node {
-    val buffer = ByteBuffer
-        .wrap(data)
-        .order(ByteOrder.BIG_ENDIAN)
-
-    val uData = data.toUByteArray()
-
-    val numberOfKeys = buffer.int
-    val keys = ArrayList<UByteArray>()
-
-    for (i in 0.until(numberOfKeys)) {
-        val keySize = buffer.int
-
-        if (keySize == 0 || keySize > 32)
-            throw Exception("fatal: !keySize || keySize > 32")
-
-        keys.add(uData.sliceArray(buffer.position().until(buffer.position() + keySize)))
-        buffer.position(buffer.position() + keySize)
-    }
-
-    val numberOfDatas = buffer.int
-    val datas = ArrayList<Pair<Long, Int>>()
-
-    for (i in 0.until(numberOfDatas)) {
-        val offset = buffer.long
-        val length = buffer.int
-
-        datas.add(Pair(offset, length))
-    }
-
-    val numberOfSubNodeAddresses = B + 1
-    val subNodeAddresses = ArrayList<Long>()
-
-    for (i in 0.until(numberOfSubNodeAddresses)) {
-        val subNodeAddress = buffer.long
-        subNodeAddresses.add(subNodeAddress)
-    }
-
-    return Node(keys, datas, subNodeAddresses)
-}
-
-@OptIn(ExperimentalUnsignedTypes::class)
-fun bSearch(field: String, key: UByteArray, node: Node): Pair<Long, Int>? {
-    fun compareArrayBuffers(dv1: UByteArray, dv2: UByteArray): Int {
-        val top = min(dv1.size, dv2.size)
-
-        for (i in 0.until(top)) {
-            if (dv1[i] < dv2[i])
-                return -1
-            else if (dv1[i] > dv2[i])
-                return 1
-        }
-
-        return 0
-    }
-
-    fun locateKey(key: UByteArray, node: Node): Pair<Boolean, Int> {
-        for (i in node.keys.indices) {
-            val cmpResult = compareArrayBuffers(key, node.keys[i])
-
-            if (cmpResult <= 0)
-                return Pair(cmpResult == 0, i)
-        }
-
-        return Pair(false, node.keys.size)
-    }
-
-    fun isLeaf(node: Node): Boolean {
-        for (subnode in node.subNodeAddresses)
-            if (subnode != 0L)
-                return false
-
-        return true
-    }
-
-    if (node.keys.isEmpty())
-        return null
-
-    val (there, where) = locateKey(key, node)
-    if (there)
-        return node.datas[where]
-    else if (isLeaf(node))
-        return null
-
-    val nextNode = getNodeAtAddress(field, node.subNodeAddresses[where])
-    return bSearch(field, key, nextNode)
-}

app/src/main/java/xyz/quaver/pupil/receiver/UpdateBroadcastReceiver.kt

@@ -1,96 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.receiver
-
-import android.app.DownloadManager
-import android.app.PendingIntent
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.os.Build
-import android.webkit.MimeTypeMap
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.content.FileProvider
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.util.Preferences
-import java.io.File
-
-class UpdateBroadcastReceiver : BroadcastReceiver() {
-
-    override fun onReceive(context: Context?, intent: Intent?) {
-        context ?: return
-
-        when (intent?.action) {
-            DownloadManager.ACTION_DOWNLOAD_COMPLETE -> {
-
-                // Validate download
-                val downloadID: Long = Preferences["update_download_id"]
-                val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-
-                if (intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -2) != downloadID)
-                    return
-
-                // Get target uri
-
-                val query = DownloadManager.Query()
-                    .setFilterById(downloadID)
-
-                val uri = downloadManager.query(query).use { cursor ->
-                    if (cursor.moveToFirst()) {
-                        cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI))?.let {
-                            val uri = Uri.parse(it)
-
-                            when (uri.scheme) {
-                                "file" ->
-                                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-                                        FileProvider.getUriForFile(context, context.applicationContext.packageName + ".provider", File(uri.path!!))
-                                    else
-                                        uri
-                                "content" -> uri
-                                else -> null
-                            }
-                        }
-                    } else
-                        null
-                } ?: return
-
-                // Build Notification
-
-                val notificationManager = NotificationManagerCompat.from(context)
-
-                val pendingIntent = PendingIntent.getActivity(context, System.currentTimeMillis().toInt(), Intent(Intent.ACTION_VIEW).apply {
-                    flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK
-                    setDataAndType(uri, MimeTypeMap.getSingleton().getMimeTypeFromExtension("apk"))
-                }, if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_IMMUTABLE else 0)
-
-                val notification = NotificationCompat.Builder(context, "update")
-                    .setSmallIcon(android.R.drawable.stat_sys_download_done)
-                    .setContentTitle(context.getText(R.string.update_download_completed))
-                    .setContentText(context.getText(R.string.update_download_completed_description))
-                    .setContentIntent(pendingIntent)
-                    .build()
-
-                notificationManager.notify(R.id.notification_id_update, notification)
-            }
-        }
-    }
-
-}

app/src/main/java/xyz/quaver/pupil/receiver/WifiDirectBroadcastReceiver.kt

@@ -1,64 +0,0 @@
-package xyz.quaver.pupil.receiver
-
-import android.Manifest
-import android.annotation.SuppressLint
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.net.wifi.p2p.WifiP2pManager
-import android.os.Build
-import android.os.Parcelable
-import android.util.Log
-import androidx.core.app.ActivityCompat
-import xyz.quaver.pupil.ui.ErrorType
-import xyz.quaver.pupil.ui.TransferStep
-import xyz.quaver.pupil.ui.TransferViewModel
-
-private inline fun <reified T : Parcelable> Intent.getParcelableExtraCompat(key: String): T? = when {
-    Build.VERSION.SDK_INT >= 33 -> getParcelableExtra(key, T::class.java)
-    else -> @Suppress("DEPRECATION") getParcelableExtra(key) as? T
-}
-
-class WifiDirectBroadcastReceiver(
-    private val manager: WifiP2pManager,
-    private val channel: WifiP2pManager.Channel,
-    private val viewModel: TransferViewModel
-): BroadcastReceiver() {
-    @SuppressLint("MissingPermission")
-    override fun onReceive(context: Context?, intent: Intent?) {
-        context!!
-        when (intent?.action) {
-            WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION -> {
-                val state = intent.getIntExtra(WifiP2pManager.EXTRA_WIFI_STATE, -1)
-                Log.d("PUPILD", "Wifi P2P state changed: $state")
-                viewModel.setWifiP2pEnabled(state == WifiP2pManager.WIFI_P2P_STATE_ENABLED)
-            }
-            WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION -> {
-                Log.d("PUPILD", "Wifi P2P peers changed")
-                manager.requestPeers(channel) { peers ->
-                    viewModel.setPeers(peers)
-                }
-            }
-            WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION -> {
-                // Respond to new connection or disconnections
-                val networkInfo = intent.getParcelableExtraCompat<android.net.NetworkInfo>(WifiP2pManager.EXTRA_NETWORK_INFO)
-
-                Log.d("PUPILD", "Wifi P2P connection changed: $networkInfo ${networkInfo?.isConnected}")
-
-                if (networkInfo?.isConnected == true) {
-                    manager.requestConnectionInfo(channel) { info ->
-                        viewModel.setConnectionInfo(info)
-                    }
-                } else {
-                    viewModel.setConnectionInfo(null)
-                }
-            }
-            WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION -> {
-                // Respond to this device's wifi state changing
-                Log.d("PUPILD", "Wifi P2P this device changed")
-                viewModel.setThisDevice(intent.getParcelableExtraCompat(WifiP2pManager.EXTRA_WIFI_P2P_DEVICE))
-            }
-        }
-    }
-}

app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt

@@ -1,444 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.services
-
-import android.annotation.SuppressLint
-import android.app.PendingIntent
-import android.app.Service
-import android.content.Context
-import android.content.Intent
-import android.content.pm.ServiceInfo
-import android.os.Build
-import android.util.Log
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.app.TaskStackBuilder
-import androidx.core.content.ContextCompat
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
-import okhttp3.Call
-import okhttp3.Callback
-import okhttp3.Response
-import okhttp3.ResponseBody
-import okio.*
-import xyz.quaver.pupil.*
-import xyz.quaver.pupil.ui.ReaderActivity
-import xyz.quaver.pupil.util.*
-import xyz.quaver.pupil.util.downloader.Cache
-import xyz.quaver.pupil.util.downloader.DownloadManager
-import java.io.IOException
-import java.util.concurrent.ConcurrentHashMap
-import kotlin.math.ceil
-import kotlin.math.log10
-
-private typealias ProgressListener = (DownloadService.Tag, Long, Long, Boolean) -> Unit
-class DownloadService : Service() {
-    data class Tag(val galleryID: Int, val index: Int, val startId: Int? = null)
-
-    //region Notification
-    private val notificationManager by lazy {
-        NotificationManagerCompat.from(this)
-    }
-
-    private val serviceNotification by lazy {
-        NotificationCompat.Builder(this, "downloader")
-            .setContentTitle(getString(R.string.downloader_running))
-            .setProgress(0, 0, false)
-            .setSmallIcon(R.drawable.ic_notification)
-            .setOngoing(true)
-    }
-
-    private val notification = ConcurrentHashMap<Int, NotificationCompat.Builder?>()
-
-    private fun initNotification(galleryID: Int) {
-        val intent = Intent(this, ReaderActivity::class.java)
-            .putExtra("galleryID", galleryID)
-
-        val pendingIntent = TaskStackBuilder.create(this).run {
-            addNextIntentWithParentStack(intent)
-            getPendingIntent(galleryID, PendingIntent.FLAG_UPDATE_CURRENT or if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_MUTABLE else 0)
-        }
-        val action =
-            NotificationCompat.Action.Builder(0, getText(android.R.string.cancel),
-                PendingIntent.getService(
-                    this,
-                    R.id.notification_download_cancel_action.normalizeID(),
-                    Intent(this, DownloadService::class.java)
-                        .putExtra(KEY_COMMAND, COMMAND_CANCEL)
-                        .putExtra(KEY_ID, galleryID),
-                    PendingIntent.FLAG_UPDATE_CURRENT or if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_MUTABLE else 0),
-            ).build()
-
-        notification[galleryID] = NotificationCompat.Builder(this, "download").apply {
-            setContentTitle(getString(R.string.reader_loading))
-            setContentText(getString(R.string.reader_notification_text))
-            setSmallIcon(R.drawable.ic_notification)
-            setContentIntent(pendingIntent)
-            addAction(action)
-            setProgress(0, 0, true)
-            setOngoing(true)
-        }
-
-        notify(galleryID)
-    }
-
-    @SuppressLint("RestrictedApi", "MissingPermission")
-    private fun notify(galleryID: Int) {
-        val max = progress[galleryID]?.size ?: 0
-        val progress = progress[galleryID]?.count { it == Float.POSITIVE_INFINITY } ?: 0
-
-        val notification = notification[galleryID] ?: return
-
-        if (!checkNotificationEnabled(this)) return
-
-        if (isCompleted(galleryID)) {
-            notification
-                .setContentText(getString(R.string.reader_notification_complete))
-                .setProgress(0, 0, false)
-                .setOngoing(false)
-                .mActions.clear()
-
-            notificationManager.cancel(galleryID)
-        } else
-            notification
-                .setProgress(max, progress, false)
-                .setContentText("$progress/$max")
-
-        if (DownloadManager.getInstance(this).getDownloadFolder(galleryID) != null || galleryID == priority)
-            notification.let { notificationManager.notify(galleryID, it.build()) }
-        else
-            notificationManager.cancel(galleryID)
-    }
-    //endregion
-
-    //region ProgressListener
-    @Suppress("UNCHECKED_CAST")
-    private val progressListener: ProgressListener = { (galleryID, index), bytesRead, contentLength, done ->
-        if (!done && progress[galleryID]?.get(index)?.isFinite() == true)
-            progress[galleryID]?.set(index, bytesRead * 100F / contentLength)
-    }
-
-    private class ProgressResponseBody(
-        val tag: Any?,
-        val responseBody: ResponseBody,
-        val progressListener : ProgressListener
-    ) : ResponseBody() {
-        private var bufferedSource : BufferedSource? = null
-
-        override fun contentLength() = responseBody.contentLength()
-        override fun contentType() = responseBody.contentType()
-
-        override fun source(): BufferedSource {
-            if (bufferedSource == null)
-                bufferedSource = Okio.buffer(source(responseBody.source()))
-
-            return bufferedSource!!
-        }
-
-        private fun source(source: Source) = object: ForwardingSource(source) {
-            var totalBytesRead = 0L
-
-            override fun read(sink: Buffer, byteCount: Long): Long {
-                val bytesRead = super.read(sink, byteCount)
-
-                totalBytesRead += if (bytesRead == -1L) 0L else bytesRead
-                progressListener.invoke(tag as Tag, totalBytesRead, responseBody.contentLength(), bytesRead == -1L)
-
-                return bytesRead
-            }
-        }
-    }
-
-    private val interceptor: PupilInterceptor = { chain ->
-        val request = chain.request()
-
-        var response = kotlin.runCatching {
-            chain.proceed(request)
-        }.getOrNull()
-        var limit = 10
-
-        while (response?.isSuccessful != true) {
-            if (response?.code() == 503) {
-                Thread.sleep(200)
-            } else if (--limit < 0)
-                break
-
-            response = kotlin.runCatching {
-                chain.proceed(request)
-            }.getOrNull()
-        }
-
-        if (response == null)
-            response = chain.proceed(request)
-
-        response!!.newBuilder()
-            .body(response.body()?.let {
-                ProgressResponseBody(request.tag(), it, progressListener)
-            }).build()
-    }
-    //endregion
-
-    //region Downloader
-    /**
-    * KEY
-    *  primary galleryID
-    *  secondary index
-    * PRIMARY VALUE
-    *  MutableList -> Download in progress
-    *  null -> Loading / Gallery doesn't exist
-    * SECONDARY VALUE
-    *  0 <= value < 100 -> Download in progress
-    *  Float.POSITIVE_INFINITY -> Download completed
-    */
-    val progress = ConcurrentHashMap<Int, MutableList<Float>>()
-    var priority = 0
-
-    fun isCompleted(galleryID: Int) = progress[galleryID]?.toList()?.all { it == Float.POSITIVE_INFINITY } == true
-
-    private val callback = object: Callback {
-
-        override fun onFailure(call: Call, e: IOException) {
-            Log.d("PUPILD", "ONFAILURE ${call.request().tag()}, ${e}")
-            FirebaseCrashlytics.getInstance().recordException(e)
-
-            if (e.message?.contains("cancel", true) == false) {
-                val galleryID = (call.request().tag() as Tag).galleryID
-            }
-        }
-
-        override fun onResponse(call: Call, response: Response) {
-            val (galleryID, index, startId) = call.request().tag() as Tag
-            val ext = call.request().url().encodedPath().split('.').last()
-
-            CoroutineScope(Dispatchers.IO).launch {
-                runCatching {
-                    val image = response.also { if (it.code() != 200) throw IOException( "$galleryID $index ${response.request().url()} CODE ${it.code()}" ) }.body()?.use { it.bytes() } ?: throw Exception("Response null")
-                    val padding = ceil(progress[galleryID]?.size?.let { log10(it.toFloat()) } ?: 0F).toInt()
-
-                    Cache.getInstance(this@DownloadService, galleryID)
-                        .putImage(index, "${index.toString().padStart(padding, '0')}.$ext", image)
-
-                    progress[galleryID]?.set(index, Float.POSITIVE_INFINITY)
-                    notify(galleryID)
-
-                    if (isCompleted(galleryID)) {
-                        if (DownloadManager.getInstance(this@DownloadService)
-                                .getDownloadFolder(galleryID) != null
-                        )
-                            Cache.getInstance(this@DownloadService, galleryID).moveToDownload()
-
-                        startId?.let { stopSelf(it) }
-                    }
-                }.onFailure {
-                    FirebaseCrashlytics.getInstance().recordException(it)
-                }
-            }
-        }
-    }
-
-    fun cancel(startId: Int? = null) {
-        client.dispatcher().queuedCalls().filter {
-            it.request().tag() is Tag
-        }.forEach {
-            (it.request().tag() as? Tag)?.startId?.let { stopSelf(it) }
-            it.cancel()
-        }
-        client.dispatcher().runningCalls().filter {
-            it.request().tag() is Tag
-        }.forEach {
-            (it.request().tag() as? Tag)?.startId?.let { stopSelf(it) }
-            it.cancel()
-        }
-
-        progress.clear()
-        notification.clear()
-        notificationManager.cancelAll()
-
-        startId?.let { stopSelf(it) }
-    }
-
-    fun cancel(galleryID: Int, startId: Int? = null) {
-        client.dispatcher().queuedCalls().filter {
-            (it.request().tag() as? Tag)?.galleryID == galleryID
-        }.forEach {
-            (it.request().tag() as? Tag)?.startId?.let { stopSelf(it) }
-            it.cancel()
-        }
-        client.dispatcher().runningCalls().filter {
-            (it.request().tag() as? Tag)?.galleryID == galleryID
-        }.forEach {
-            (it.request().tag() as? Tag)?.startId?.let { stopSelf(it) }
-            it.cancel()
-        }
-
-        progress.remove(galleryID)
-        notification.remove(galleryID)
-        notificationManager.cancel(galleryID)
-
-        startId?.let { stopSelf(it) }
-    }
-
-    fun delete(galleryID: Int, startId: Int? = null) = CoroutineScope(Dispatchers.IO).launch {
-        cancel(galleryID)
-        DownloadManager.getInstance(this@DownloadService).deleteDownloadFolder(galleryID)
-        Cache.delete(this@DownloadService, galleryID)
-
-        startId?.let { stopSelf(it) }
-    }
-
-    fun download(galleryID: Int, priority: Boolean = false, startId: Int? = null): Job = CoroutineScope(Dispatchers.IO).launch {
-        if (DownloadManager.getInstance(this@DownloadService).isDownloading(galleryID))
-            return@launch
-
-        cleanCache(this@DownloadService)
-
-        val cache = Cache.getInstance(this@DownloadService, galleryID)
-
-        initNotification(galleryID)
-
-        val galleryInfo = cache.getGalleryInfo()
-
-        // Gallery doesn't exist
-        if (galleryInfo == null) {
-            delete(galleryID)
-            progress[galleryID] = mutableListOf()
-            return@launch
-        }
-
-        histories.add(galleryID)
-
-        progress[galleryID] = MutableList(galleryInfo.files.size) { 0F }
-
-        cache.metadata.imageList?.let {
-            it.forEachIndexed { index, image ->
-                progress[galleryID]?.set(index, if (image != null) Float.POSITIVE_INFINITY else 0F)
-            }
-        }
-
-        if (isCompleted(galleryID)) {
-            if (DownloadManager.getInstance(this@DownloadService).getDownloadFolder(galleryID) != null)
-                Cache.getInstance(this@DownloadService, galleryID).moveToDownload()
-
-            notificationManager.cancel(galleryID)
-            startId?.let { stopSelf(it) }
-            return@launch
-        }
-
-        notification[galleryID]?.setContentTitle(galleryInfo.title.ellipsize(32))
-        notify(galleryID)
-
-        val queued = mutableSetOf<Int>()
-
-        if (priority) {
-            client.dispatcher().queuedCalls().forEach {
-                val queuedID = (it.request().tag() as? Tag)?.galleryID ?: return@forEach
-
-                if (queued.add(queuedID))
-                    cancel(queuedID)
-            }
-        }
-
-        galleryInfo.getRequestBuilders().forEachIndexed { index, it ->
-            if (progress[galleryID]?.get(index)?.isInfinite() == false) {
-                val request = it.tag(Tag(galleryID, index, startId)).build()
-                client.newCall(request).enqueue(callback)
-            }
-        }
-
-        queued.forEach { download(it) }
-    }
-    //endregion
-
-    companion object {
-        const val KEY_COMMAND = "COMMAND"   // String
-        const val KEY_ID = "ID"             // Int
-        const val KEY_PRIORITY = "PRIORITY" // Boolean
-
-        const val COMMAND_DOWNLOAD = "DOWNLOAD"
-        const val COMMAND_CANCEL = "CANCEL"
-        const val COMMAND_DELETE = "DELETE"
-
-        private fun command(context: Context, extras: Intent.() -> Unit) {
-            ContextCompat.startForegroundService(context, Intent(context, DownloadService::class.java).apply(extras))
-        }
-
-        fun download(context: Context, galleryID: Int, priority: Boolean = false) {
-            command(context) {
-                putExtra(KEY_COMMAND, COMMAND_DOWNLOAD)
-                putExtra(KEY_PRIORITY, priority)
-                putExtra(KEY_ID, galleryID)
-            }
-        }
-
-        fun cancel(context: Context, galleryID: Int? = null) {
-            command(context) {
-                putExtra(KEY_COMMAND, COMMAND_CANCEL)
-                galleryID?.let { putExtra(KEY_ID, it) }
-            }
-        }
-
-        fun delete(context: Context, galleryID: Int) {
-            command(context) {
-                putExtra(KEY_COMMAND, COMMAND_DELETE)
-                putExtra(KEY_ID, galleryID)
-            }
-        }
-    }
-
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.TIRAMISU) {
-            startForeground(R.id.downloader_notification_id, serviceNotification.build())
-        } else {
-            startForeground(R.id.downloader_notification_id, serviceNotification.build(), ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC)
-        }
-
-        when (intent?.getStringExtra(KEY_COMMAND)) {
-            COMMAND_DOWNLOAD -> intent.getIntExtra(KEY_ID, -1).let { if (it > 0)
-                download(it, intent.getBooleanExtra(KEY_PRIORITY, false), startId)
-            }
-            COMMAND_CANCEL -> intent.getIntExtra(KEY_ID, -1).let { if (it > 0) cancel(it, startId) else cancel(startId = startId) }
-            COMMAND_DELETE -> intent.getIntExtra(KEY_ID, -1).let { if (it > 0) delete(it, startId) }
-        }
-
-        return START_NOT_STICKY
-    }
-
-    inner class Binder : android.os.Binder() {
-        val service = this@DownloadService
-    }
-
-    private val binder = Binder()
-    override fun onBind(p0: Intent?) = binder
-
-    override fun onCreate() {
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.TIRAMISU) {
-            startForeground(R.id.downloader_notification_id, serviceNotification.build())
-        } else {
-            startForeground(R.id.downloader_notification_id, serviceNotification.build(), ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC)
-        }
-        interceptors[Tag::class] = interceptor
-    }
-
-    override fun onDestroy() {
-        interceptors.remove(Tag::class)
-    }
-}

app/src/main/java/xyz/quaver/pupil/services/TransferClientService.kt

@@ -1,128 +0,0 @@
-package xyz.quaver.pupil.services
-
-import android.app.Service
-import android.content.Intent
-import android.content.pm.ServiceInfo
-import android.os.Build
-import android.os.IBinder
-import android.util.Log
-import androidx.core.app.NotificationCompat
-import androidx.core.app.ServiceCompat
-import io.ktor.network.selector.SelectorManager
-import io.ktor.network.sockets.aSocket
-import io.ktor.network.sockets.openReadChannel
-import io.ktor.network.sockets.openWriteChannel
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.channels.trySendBlocking
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withTimeout
-import xyz.quaver.pupil.R
-import kotlin.coroutines.Continuation
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
-
-class TransferClientService : Service() {
-    private val selectorManager = SelectorManager(Dispatchers.IO)
-    private val channel = Channel<Pair<TransferPacket, Continuation<TransferPacket>>>()
-    private var job: Job? = null
-
-    private fun startForeground() = runCatching {
-        val notification = NotificationCompat.Builder(this, "transfer")
-            .setContentTitle("Pupil")
-            .setContentText("Transfer server is running")
-            .setSmallIcon(R.drawable.ic_notification)
-            .build()
-
-        ServiceCompat.startForeground(
-            this,
-            1,
-            notification,
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
-            } else 0
-        )
-    }
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        val address = intent?.getStringExtra("address") ?: run {
-            stopSelf(startId)
-            return START_STICKY
-        }
-
-        startForeground()
-
-        Log.d("PUPILD", "Starting service with address $address")
-
-        job?.cancel()
-        job = CoroutineScope(Dispatchers.IO).launch {
-            Log.d("PUPILD", "Connecting to $address")
-
-            val socket = aSocket(selectorManager).tcp().connect(address, 12221)
-
-            Log.d("PUPILD", "Connected to $address")
-
-            val readChannel = socket.openReadChannel()
-            val writeChannel = socket.openWriteChannel(autoFlush = true)
-
-            runCatching {
-                TransferPacket.Hello().writeToChannel(writeChannel)
-                val handshake = TransferPacket.readFromChannel(readChannel)
-
-                if (handshake !is TransferPacket.Hello || handshake.version != TRANSFER_PROTOCOL_VERSION) {
-                    throw IllegalStateException("Invalid handshake")
-                }
-
-                while (true) {
-                    val (packet, continuation) = channel.receive()
-
-                    Log.d("PUPILD", "Sending packet $packet")
-
-                    packet.writeToChannel(writeChannel)
-
-                    val response = TransferPacket.readFromChannel(readChannel).also {
-                        Log.d("PUPILD", "Received packet $it")
-                    }
-
-                    continuation.resume(response)
-                }
-            }.onFailure {
-                Log.d("PUPILD", "Connection closed with error $it")
-                channel.close()
-                socket.close()
-                stopSelf(startId)
-            }
-        }
-
-        return START_STICKY
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        job?.cancel()
-    }
-
-    inner class Binder: android.os.Binder() {
-
-
-        @OptIn(DelicateCoroutinesApi::class)
-        suspend fun sendPacket(packet: TransferPacket): Result<TransferPacket.ListResponse> = runCatching {
-            check(job != null) { "Service not running" }
-            check(!channel.isClosedForSend) { "Service not running" }
-
-            val response = suspendCoroutine { continuation ->
-                check (channel.trySend(packet to continuation).isSuccess) { "Service not running" }
-            }
-
-            check (response is TransferPacket.ListResponse) { "Invalid response" }
-
-            response
-        }
-    }
-
-    private val binder = Binder()
-
-    override fun onBind(intent: Intent?): IBinder = binder
-}

app/src/main/java/xyz/quaver/pupil/services/TransferProtocol.kt

@@ -1,94 +0,0 @@
-package xyz.quaver.pupil.services
-
-import io.ktor.utils.io.ByteReadChannel
-import io.ktor.utils.io.ByteWriteChannel
-
-const val TRANSFER_PROTOCOL_VERSION: UByte = 1u
-
-enum class TransferType(val value: UByte) {
-    INVALID(255u),
-    HELLO(0u),
-    PING(1u),
-    PONG(2u),
-    LIST_REQUEST(3u),
-    LIST_RESPONSE(4u),
-}
-
-sealed interface TransferPacket {
-    val type: TransferType
-
-    suspend fun writeToChannel(channel: ByteWriteChannel)
-
-    data class Hello(val version: UByte = TRANSFER_PROTOCOL_VERSION): TransferPacket {
-        override val type = TransferType.HELLO
-
-        override suspend fun writeToChannel(channel: ByteWriteChannel) {
-            channel.writeByte(type.value.toByte())
-            channel.writeByte(version.toByte())
-        }
-    }
-
-    data object Ping: TransferPacket {
-        override val type = TransferType.PING
-        override suspend fun writeToChannel(channel: ByteWriteChannel) {
-            channel.writeByte(type.value.toByte())
-        }
-    }
-
-    data object Pong: TransferPacket {
-        override val type = TransferType.PONG
-        override suspend fun writeToChannel(channel: ByteWriteChannel) {
-            channel.writeByte(type.value.toByte())
-        }
-    }
-
-    data object ListRequest: TransferPacket {
-        override val type = TransferType.LIST_REQUEST
-        override suspend fun writeToChannel(channel: ByteWriteChannel) {
-            channel.writeByte(type.value.toByte())
-        }
-    }
-
-    data object Invalid: TransferPacket {
-        override val type = TransferType.INVALID
-        override suspend fun writeToChannel(channel: ByteWriteChannel) {
-            channel.writeByte(type.value.toByte())
-        }
-    }
-
-    data class ListResponse(
-        val favoritesCount: Int,
-        val historyCount: Int,
-        val downloadsCount: Int,
-    ): TransferPacket {
-        override val type = TransferType.LIST_RESPONSE
-
-        override suspend fun writeToChannel(channel: ByteWriteChannel) {
-            channel.writeByte(type.value.toByte())
-            channel.writeInt(favoritesCount)
-            channel.writeInt(historyCount)
-            channel.writeInt(downloadsCount)
-        }
-    }
-
-    companion object {
-        suspend fun readFromChannel(channel: ByteReadChannel): TransferPacket {
-            return when(val type = channel.readByte().toUByte()) {
-                TransferType.HELLO.value -> {
-                    val version = channel.readByte().toUByte()
-                    Hello(version)
-                }
-                TransferType.PING.value -> Ping
-                TransferType.PONG.value -> Pong
-                TransferType.LIST_REQUEST.value -> ListRequest
-                TransferType.LIST_RESPONSE.value -> {
-                    val favoritesCount = channel.readInt()
-                    val historyCount = channel.readInt()
-                    val downloadsCount = channel.readInt()
-                    ListResponse(favoritesCount, historyCount, downloadsCount)
-                }
-                else -> throw IllegalArgumentException("Unknown packet type: $type")
-            }
-        }
-    }
-}

app/src/main/java/xyz/quaver/pupil/services/TransferServerService.kt

@@ -1,123 +0,0 @@
-package xyz.quaver.pupil.services
-
-import android.app.Service
-import android.content.Intent
-import android.content.pm.ServiceInfo
-import android.os.Build
-import android.os.IBinder
-import android.util.Log
-import androidx.core.app.NotificationCompat
-import androidx.core.app.ServiceCompat
-import io.ktor.network.selector.SelectorManager
-import io.ktor.network.sockets.ServerSocket
-import io.ktor.network.sockets.Socket
-import io.ktor.network.sockets.aSocket
-import io.ktor.network.sockets.openReadChannel
-import io.ktor.network.sockets.openWriteChannel
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.launch
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.favorites
-import xyz.quaver.pupil.histories
-import xyz.quaver.pupil.util.downloader.DownloadManager
-
-class TransferServerService : Service() {
-    private val selectorManager = SelectorManager(Dispatchers.IO)
-    private var serverSocket: ServerSocket? = null
-    private val job = Job()
-
-    private fun startForeground() = runCatching {
-        val notification = NotificationCompat.Builder(this, "transfer")
-            .setContentTitle("Pupil")
-            .setContentText("Transfer server is running")
-            .setSmallIcon(R.drawable.ic_notification)
-            .build()
-
-        ServiceCompat.startForeground(
-            this,
-            1,
-            notification,
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
-            } else 0
-        )
-    }
-
-    private fun generateListResponse(): TransferPacket.ListResponse {
-        val favoritesCount = favorites.size
-        val historyCount = histories.size
-        val downloadsCount = DownloadManager.getInstance(this).downloadFolderMap.size
-        return TransferPacket.ListResponse(favoritesCount, historyCount, downloadsCount)
-    }
-
-    private suspend fun handleConnection(socket: Socket) {
-        val readChannel = socket.openReadChannel()
-        val writeChannel = socket.openWriteChannel(autoFlush = true)
-
-        runCatching {
-            while (true) {
-                val packet = TransferPacket.readFromChannel(readChannel)
-
-                Log.d("PUPILD", "Received packet $packet")
-
-                binder.channel.trySend(packet)
-
-                val response = when (packet) {
-                    is TransferPacket.Hello -> TransferPacket.Hello()
-                    is TransferPacket.Ping -> TransferPacket.Pong
-                    is TransferPacket.ListRequest -> generateListResponse()
-                    else -> TransferPacket.Invalid
-                }
-
-                response.writeToChannel(writeChannel)
-            }
-        }.onFailure {
-            socket.close()
-        }
-    }
-
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        val address = intent?.getStringExtra("address") ?: run {
-            stopSelf(startId)
-            return START_STICKY
-        }
-
-        if (serverSocket != null) {
-            return START_STICKY
-        }
-
-        startForeground()
-
-        val serverSocket = aSocket(selectorManager).tcp().bind(address, 12221).also {
-            this@TransferServerService.serverSocket = it
-        }
-
-        CoroutineScope(Dispatchers.IO + job).launch {
-            while (true) {
-                Log.d("PUPILD", "Waiting for connection")
-                val socket = serverSocket.accept()
-                Log.d("PUPILD", "Accepted connection from ${socket.remoteAddress}")
-                launch { handleConnection(socket) }
-            }
-        }
-
-        return START_STICKY
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        job.cancel()
-        serverSocket?.close()
-    }
-
-    inner class Binder: android.os.Binder() {
-        val channel = Channel<TransferPacket>()
-    }
-
-    private val binder = Binder()
-
-    override fun onBind(intent: Intent?): IBinder = binder
-}

app/src/main/java/xyz/quaver/pupil/types/SendLogException.kt

@@ -1,22 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2022  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.types
-
-class SendLogException : Exception()
-class JavascriptException(message: String?) : Exception(message)

app/src/main/java/xyz/quaver/pupil/types/Suggestions.kt

@@ -1,50 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.types
-
-import kotlinx.parcelize.IgnoredOnParcel
-import kotlinx.parcelize.Parcelize
-import xyz.quaver.floatingsearchview.suggestions.model.SearchSuggestion
-import xyz.quaver.pupil.hitomi.Suggestion
-import xyz.quaver.pupil.util.translations
-
-@Parcelize
-data class TagSuggestion(val s: String, val t: Int, val u: String, val n: String) : SearchSuggestion {
-    constructor(s: Suggestion) : this(s.s, s.t, s.u, s.n)
-
-    @IgnoredOnParcel
-    override val body =
-        if (translations[s] != null)
-            "${translations[s]} ($s)"
-        else
-            s
-}
-
-@Parcelize
-class Suggestion(override val body: String) : SearchSuggestion
-
-@Parcelize
-class NoResultSuggestion(override val body: String) : SearchSuggestion
-
-@Parcelize
-class LoadingSuggestion(override val body: String) : SearchSuggestion
-
-@Parcelize
-@Suppress("PARCELABLE_PRIMARY_CONSTRUCTOR_IS_EMPTY")
-class FavoriteHistorySwitch(override val body: String) : SearchSuggestion

app/src/main/java/xyz/quaver/pupil/types/Tags.kt

@@ -1,111 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.types
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class Tag(val area: String?, val tag: String, val isNegative: Boolean = false) {
-    companion object {
-        fun parse(tag: String) : Tag {
-            if (tag.firstOrNull() == '-') {
-                tag.substring(1).split(Regex(":"), 2).let {
-                    return when(it.size) {
-                        2 -> Tag(it[0], it[1], true)
-                        else -> Tag(null, tag, true)
-                    }
-                }
-            }
-            tag.split(Regex(":"), 2).let {
-                return when(it.size) {
-                    2 -> Tag(it[0], it[1])
-                    else -> Tag(null, tag)
-                }
-            }
-        }
-    }
-
-    override fun toString(): String {
-        return (if (isNegative) "-" else "") + when(area) {
-            null -> tag
-            else -> "$area:$tag"
-        }
-    }
-
-    fun toQuery(): String {
-        return toString().replace(' ', '_')
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (other !is Tag)
-            return false
-
-        if (other.area == area && other.tag == tag)
-            return true
-
-        return false
-    }
-
-    override fun hashCode() = toString().hashCode()
-}
-
-class Tags(val tags: MutableSet<Tag> = mutableSetOf()) : MutableSet<Tag> by tags {
-
-    companion object {
-        fun parse(tags: String) : Tags {
-            return Tags(
-                tags.split(' ').map {
-                    if (it.isNotEmpty())
-                        Tag.parse(it)
-                    else
-                        null
-                }.filterNotNull().toMutableSet()
-            )
-        }
-    }
-
-    fun contains(element: String): Boolean {
-        tags.forEach {
-            if (it.toString() == element)
-                return true
-        }
-
-        return false
-    }
-
-    fun add(element: String): Boolean {
-        return tags.add(Tag.parse(element))
-    }
-
-    fun remove(element: String) {
-        tags.filter { it.toString() == element }.forEach {
-            tags.remove(it)
-        }
-    }
-
-    fun removeByArea(area: String, isNegative: Boolean? = null) {
-        tags.filter { it.area == area && (if(isNegative == null) true else (it.isNegative == isNegative)) }.forEach {
-            tags.remove(it)
-        }
-    }
-
-    override fun toString(): String {
-        return tags.joinToString(" ") { it.toString() }
-    }
-}

app/src/main/java/xyz/quaver/pupil/ui/BaseActivity.kt

@@ -1,105 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.ui
-
-import android.content.Intent
-import android.os.Bundle
-import android.os.PersistableBundle
-import android.view.WindowManager
-import androidx.activity.ComponentActivity
-import androidx.activity.enableEdgeToEdge
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.annotation.CallSuper
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.WindowCompat
-import xyz.quaver.pupil.util.LockManager
-import xyz.quaver.pupil.util.Preferences
-
-open class BaseComponentActivity : ComponentActivity() {
-    private var locked: Boolean = true
-
-    private val lockLauncher =
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-            if (it.resultCode == RESULT_OK)
-                locked = false
-            else
-                finish()
-        }
-
-    @CallSuper
-    override fun onCreate(savedInstanceState: Bundle?) {
-        enableEdgeToEdge()
-        super.onCreate(savedInstanceState)
-
-        WindowCompat.setDecorFitsSystemWindows(window, false)
-
-        locked = !LockManager(this).locks.isNullOrEmpty()
-    }
-
-    @CallSuper
-    override fun onResume() {
-        super.onResume()
-
-        if (Preferences["security_mode"])
-            window.setFlags(
-                WindowManager.LayoutParams.FLAG_SECURE,
-                WindowManager.LayoutParams.FLAG_SECURE
-            )
-        else
-            window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
-
-        if (locked)
-            lockLauncher.launch(Intent(this, LockActivity::class.java))
-    }
-}
-
-open class BaseActivity : AppCompatActivity() {
-    private var locked: Boolean = true
-
-    private val lockLauncher =
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-            if (it.resultCode == RESULT_OK)
-                locked = false
-            else
-                finish()
-        }
-
-    @CallSuper
-    override fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
-        super.onCreate(savedInstanceState, persistentState)
-
-        locked = !LockManager(this).locks.isNullOrEmpty()
-    }
-
-    @CallSuper
-    override fun onResume() {
-        super.onResume()
-
-        if (Preferences["security_mode"])
-            window.setFlags(
-                WindowManager.LayoutParams.FLAG_SECURE,
-                WindowManager.LayoutParams.FLAG_SECURE
-            )
-        else
-            window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
-
-        if (locked)
-            lockLauncher.launch(Intent(this, LockActivity::class.java))
-    }
-}

app/src/main/java/xyz/quaver/pupil/ui/LockActivity.kt

@@ -1,280 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.ui
-
-import android.app.Activity
-import android.app.AlertDialog
-import android.os.Bundle
-import android.view.animation.Animation
-import android.view.animation.AnimationUtils
-import androidx.appcompat.app.AppCompatActivity
-import androidx.biometric.BiometricManager
-import androidx.biometric.BiometricPrompt
-import androidx.core.content.ContextCompat
-import com.andrognito.patternlockview.PatternLockView
-import com.google.android.material.snackbar.Snackbar
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.databinding.LockActivityBinding
-import xyz.quaver.pupil.ui.fragment.PINLockFragment
-import xyz.quaver.pupil.ui.fragment.PatternLockFragment
-import xyz.quaver.pupil.util.Lock
-import xyz.quaver.pupil.util.LockManager
-import xyz.quaver.pupil.util.Preferences
-
-private var lastUnlocked = 0L
-class LockActivity : AppCompatActivity() {
-
-    private lateinit var lockManager: LockManager
-    private var mode: String? = null
-
-    private lateinit var binding: LockActivityBinding
-
-    private val patternLockFragment = PatternLockFragment().apply {
-        var lastPass = ""
-        onPatternDrawn = {
-            when(mode) {
-                null -> {
-                    val result = lockManager.check(it)
-
-                    if (result == true) {
-                        lastUnlocked = System.currentTimeMillis()
-                        setResult(Activity.RESULT_OK)
-                        finish()
-                    } else
-                        binding.patternLockView.setViewMode(PatternLockView.PatternViewMode.WRONG)
-                }
-                "add_lock" -> {
-                    if (lastPass.isEmpty()) {
-                        lastPass = it
-
-                        Snackbar.make(view!!, R.string.settings_lock_confirm, Snackbar.LENGTH_LONG).show()
-                    } else {
-                        if (lastPass == it) {
-                            LockManager(context!!).add(Lock.generate(Lock.Type.PATTERN, it))
-                            finish()
-                        } else {
-                            binding.patternLockView.setViewMode(PatternLockView.PatternViewMode.WRONG)
-                            lastPass = ""
-
-                            Snackbar.make(view!!, R.string.settings_lock_wrong_confirm, Snackbar.LENGTH_LONG).show()
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private val pinLockFragment = PINLockFragment().apply {
-        var lastPass = ""
-        onPINEntered = {
-            when(mode) {
-                null -> {
-                    val result = lockManager.check(it)
-
-                    if (result == true) {
-                        lastUnlocked = System.currentTimeMillis()
-                        setResult(Activity.RESULT_OK)
-                        finish()
-                    } else {
-                        binding.indicatorDots.startAnimation(AnimationUtils.loadAnimation(context, R.anim.shake).apply {
-                            setAnimationListener(object: Animation.AnimationListener {
-                                override fun onAnimationEnd(animation: Animation?) {
-                                    binding.pinLockView.resetPinLockView()
-                                    binding.pinLockView.isEnabled = true
-                                }
-
-                                override fun onAnimationStart(animation: Animation?) {
-                                    binding.pinLockView.isEnabled = false
-                                }
-
-                                override fun onAnimationRepeat(animation: Animation?) {
-                                    // Do Nothing
-                                }
-                            })
-                        })
-                    }
-                }
-                "add_lock" -> {
-                    if (lastPass.isEmpty()) {
-                        lastPass = it
-
-                        binding.pinLockView.resetPinLockView()
-                        Snackbar.make(view!!, R.string.settings_lock_confirm, Snackbar.LENGTH_LONG).show()
-                    } else {
-                        if (lastPass == it) {
-                            LockManager(context!!).add(Lock.generate(Lock.Type.PIN, it))
-                            finish()
-                        } else {
-                            binding.indicatorDots.startAnimation(AnimationUtils.loadAnimation(context, R.anim.shake).apply {
-                                setAnimationListener(object: Animation.AnimationListener {
-                                    override fun onAnimationEnd(animation: Animation?) {
-                                        binding.pinLockView.resetPinLockView()
-                                        binding.pinLockView.isEnabled = true
-                                    }
-
-                                    override fun onAnimationStart(animation: Animation?) {
-                                        binding.pinLockView.isEnabled = false
-                                    }
-
-                                    override fun onAnimationRepeat(animation: Animation?) {
-                                        // Do Nothing
-                                    }
-                                })
-                            })
-                            lastPass = ""
-
-                            Snackbar.make(view!!, R.string.settings_lock_wrong_confirm, Snackbar.LENGTH_LONG).show()
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private fun showBiometricPrompt() {
-        val promptInfo = BiometricPrompt.PromptInfo.Builder()
-            .setTitle(getText(R.string.settings_lock_fingerprint_prompt))
-            .setSubtitle(getText(R.string.settings_lock_fingerprint_prompt_subtitle))
-            .setNegativeButtonText(getText(android.R.string.cancel))
-            .setConfirmationRequired(false)
-            .build()
-
-        val biometricPrompt = BiometricPrompt(this, ContextCompat.getMainExecutor(this),
-            object : BiometricPrompt.AuthenticationCallback() {
-                override fun onAuthenticationSucceeded(
-                    result: BiometricPrompt.AuthenticationResult) {
-                    super.onAuthenticationSucceeded(result)
-                    lastUnlocked = System.currentTimeMillis()
-                    setResult(RESULT_OK)
-                    finish()
-                    return
-                }
-            })
-
-        // Displays the "log in" prompt.
-        biometricPrompt.authenticate(promptInfo)
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = LockActivityBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        lockManager = try {
-            LockManager(this)
-        } catch (e: Exception) {
-            AlertDialog.Builder(this).apply {
-                setTitle(R.string.warning)
-                setMessage(R.string.lock_corrupted)
-                setPositiveButton(android.R.string.ok) { _, _ ->
-                    finish()
-                }
-            }.show()
-            return
-        }
-
-        mode = intent.getStringExtra("mode")
-        val force = intent.getBooleanExtra("force", false)
-
-        when(mode) {
-            null -> {
-                if (lockManager.isEmpty()) {
-                    setResult(RESULT_OK)
-                    finish()
-                    return
-                }
-
-                if (System.currentTimeMillis() - lastUnlocked < 5*60*1000 && !force) {
-                    lastUnlocked = System.currentTimeMillis()
-                    setResult(RESULT_OK)
-                    finish()
-                    return
-                }
-
-                if (
-                    Preferences["lock_fingerprint"]
-                    && BiometricManager.from(this).canAuthenticate() == BiometricManager.BIOMETRIC_SUCCESS
-                ) {
-                    binding.fingerprintBtn.apply {
-                        isEnabled = true
-                        setOnClickListener {
-                            showBiometricPrompt()
-                        }
-                    }
-                    showBiometricPrompt()
-                }
-
-                binding.patternBtn.apply {
-                    isEnabled = lockManager.contains(Lock.Type.PATTERN)
-                    setOnClickListener {
-                        supportFragmentManager.beginTransaction().replace(
-                            R.id.lock_content, patternLockFragment
-                        ).commit()
-                    }
-                }
-                binding.pinBtn.apply {
-                    isEnabled = lockManager.contains(Lock.Type.PIN)
-                    setOnClickListener {
-                        supportFragmentManager.beginTransaction().replace(
-                            R.id.lock_content, pinLockFragment
-                        ).commit()
-                    }
-                }
-                binding.passwordBtn.isEnabled = false
-
-                when (lockManager.locks!!.first().type) {
-                    Lock.Type.PIN -> {
-
-                        supportFragmentManager.beginTransaction().add(
-                            R.id.lock_content, pinLockFragment
-                        ).commit()
-                    }
-                    Lock.Type.PATTERN -> {
-                        supportFragmentManager.beginTransaction().add(
-                            R.id.lock_content, patternLockFragment
-                        ).commit()
-                    }
-                    else -> return
-                }
-            }
-            "add_lock" -> {
-                binding.patternBtn.isEnabled = false
-                binding.pinBtn.isEnabled = false
-                binding.fingerprintBtn.isEnabled = false
-                binding.passwordBtn.isEnabled = false
-
-                when(intent.getStringExtra("type")!!) {
-                    "pattern" -> {
-                        binding.patternBtn.isEnabled = true
-                        supportFragmentManager.beginTransaction().add(
-                            R.id.lock_content, patternLockFragment
-                        ).commit()
-                    }
-                    "pin" -> {
-                        binding.pinBtn.isEnabled = true
-                        supportFragmentManager.beginTransaction().add(
-                            R.id.lock_content, pinLockFragment
-                        ).commit()
-                    }
-                }
-            }
-        }
-    }
-
-}

app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt

@@ -1,969 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.ui
-
-import android.annotation.SuppressLint
-import android.content.Intent
-import android.net.Uri
-import android.os.Build
-import android.os.Bundle
-import android.text.InputType
-import android.text.util.Linkify
-import android.view.KeyEvent
-import android.view.MenuItem
-import android.view.View
-import android.view.animation.DecelerateInterpolator
-import android.widget.EditText
-import android.widget.TextView
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AlertDialog
-import androidx.core.content.ContextCompat
-import androidx.core.view.GravityCompat
-import androidx.core.view.ViewCompat
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.navigation.NavigationView
-import com.google.android.material.snackbar.Snackbar
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Deferred
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.async
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.withContext
-import kotlinx.coroutines.withTimeout
-import kotlinx.coroutines.withTimeoutOrNull
-import xyz.quaver.floatingsearchview.FloatingSearchView
-import xyz.quaver.floatingsearchview.suggestions.model.SearchSuggestion
-import xyz.quaver.floatingsearchview.util.view.MenuView
-import xyz.quaver.floatingsearchview.util.view.SearchInputView
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.adapters.GalleryBlockAdapter
-import xyz.quaver.pupil.databinding.MainActivityBinding
-import xyz.quaver.pupil.favoriteTags
-import xyz.quaver.pupil.favorites
-import xyz.quaver.pupil.histories
-import xyz.quaver.pupil.hitomi.SortMode
-import xyz.quaver.pupil.hitomi.doSearch
-import xyz.quaver.pupil.hitomi.getSuggestionsForQuery
-import xyz.quaver.pupil.searchHistory
-import xyz.quaver.pupil.services.DownloadService
-import xyz.quaver.pupil.types.FavoriteHistorySwitch
-import xyz.quaver.pupil.types.LoadingSuggestion
-import xyz.quaver.pupil.types.NoResultSuggestion
-import xyz.quaver.pupil.types.Suggestion
-import xyz.quaver.pupil.types.Tag
-import xyz.quaver.pupil.types.TagSuggestion
-import xyz.quaver.pupil.ui.dialog.DownloadLocationDialogFragment
-import xyz.quaver.pupil.ui.dialog.GalleryDialog
-import xyz.quaver.pupil.ui.view.MainView
-import xyz.quaver.pupil.ui.view.ProgressCard
-import xyz.quaver.pupil.util.ItemClickSupport
-import xyz.quaver.pupil.util.Preferences
-import xyz.quaver.pupil.util.checkUpdate
-import xyz.quaver.pupil.util.downloader.Cache
-import xyz.quaver.pupil.util.downloader.DownloadManager
-import xyz.quaver.pupil.util.requestNotificationPermission
-import xyz.quaver.pupil.util.restore
-import xyz.quaver.pupil.util.showNotificationPermissionExplanationDialog
-import java.util.regex.Pattern
-import kotlin.math.ceil
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.math.roundToInt
-
-val sortModeLookup = mapOf(
-    R.id.main_menu_sort_date_added to SortMode.DATE_ADDED,
-    R.id.main_menu_sort_date_published to SortMode.DATE_PUBLISHED,
-    R.id.main_menu_sort_popular_today to SortMode.POPULAR_TODAY,
-    R.id.main_menu_sort_popular_week to SortMode.POPULAR_WEEK,
-    R.id.main_menu_sort_popular_month to SortMode.POPULAR_MONTH,
-    R.id.main_menu_sort_popular_year to SortMode.POPULAR_YEAR,
-    R.id.main_menu_sort_random to SortMode.RANDOM
-)
-
-class MainActivity :
-    BaseActivity(),
-    NavigationView.OnNavigationItemSelectedListener {
-
-    enum class Mode {
-        SEARCH,
-        HISTORY,
-        DOWNLOAD,
-        FAVORITE
-    }
-
-
-    private val galleries = ArrayList<Int>()
-
-    private var query = ""
-        set(value) {
-            field = value
-            with(findViewById<SearchInputView>(R.id.search_bar_text)) {
-                if (text.toString() != value)
-                    setText(query, TextView.BufferType.EDITABLE)
-            }
-        }
-    private var queryStack = mutableListOf<String>()
-
-    private var mode = Mode.SEARCH
-    private var sortMode = SortMode.DATE_ADDED
-
-    private var galleryIDs: Deferred<List<Int>>? = null
-    private var totalItems = 0
-    private var loadingJob: Job? = null
-    private var currentPage = 0
-
-    private lateinit var binding: MainActivityBinding
-
-    private val requestNotificationPermssionLauncher =
-        registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
-            if (!isGranted) {
-                showNotificationPermissionExplanationDialog(this)
-            }
-        }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = MainActivityBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        if (intent.action == Intent.ACTION_VIEW) {
-            intent.dataString?.let { url ->
-                restore(url,
-                    onFailure = {
-                        Snackbar.make(
-                            binding.contents.recyclerview,
-                            R.string.settings_backup_failed,
-                            Snackbar.LENGTH_LONG
-                        ).show()
-                    }, onSuccess = {
-                        Snackbar.make(
-                            binding.contents.recyclerview,
-                            getString(R.string.settings_restore_success, it),
-                            Snackbar.LENGTH_LONG
-                        ).show()
-                    }
-                )
-            }
-        }
-
-        requestNotificationPermission(this, requestNotificationPermssionLauncher, false) {}
-
-        if (Preferences["download_folder", ""].isEmpty())
-            DownloadLocationDialogFragment().show(
-                supportFragmentManager,
-                "Download Location Dialog"
-            )
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && !Preferences["download_folder_ignore_warning", false] &&
-            ContextCompat.getExternalFilesDirs(this, null).filterNotNull()
-                .map { Uri.fromFile(it).toString() }
-                .contains(Preferences["download_folder", ""])
-        ) {
-            AlertDialog.Builder(this)
-                .setTitle(R.string.warning)
-                .setMessage(R.string.unaccessible_download_folder)
-                .setPositiveButton(android.R.string.ok) { _, _ ->
-                    DownloadLocationDialogFragment().show(
-                        supportFragmentManager,
-                        "Download Location Dialog"
-                    )
-                }.setNegativeButton(R.string.ignore) { _, _ ->
-                    Preferences["download_folder_ignore_warning"] = true
-                }.show()
-        }
-
-        initView()
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        checkUpdate(this)
-    }
-
-    override fun onBackPressed() {
-        when {
-            binding.drawer.isDrawerOpen(GravityCompat.START) -> binding.drawer.closeDrawer(
-                GravityCompat.START
-            )
-
-            queryStack.removeLastOrNull() != null && queryStack.isNotEmpty() -> runOnUiThread {
-                query = queryStack.last()
-
-                cancelFetch()
-                clearGalleries()
-                fetchGalleries(query, sortMode)
-                loadBlocks()
-            }
-
-            else -> super.onBackPressed()
-        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-
-        (binding.contents.recyclerview.adapter as? GalleryBlockAdapter)?.updateAll = false
-    }
-
-    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
-        val perPage = Preferences["per_page", "25"].toInt()
-        val maxPage = ceil(totalItems / perPage.toDouble()).roundToInt()
-
-        return when (keyCode) {
-            KeyEvent.KEYCODE_VOLUME_UP -> {
-                if (currentPage > 0) {
-                    runOnUiThread {
-                        currentPage--
-
-                        cancelFetch()
-                        clearGalleries()
-                        fetchGalleries(query, sortMode)
-                        loadBlocks()
-                    }
-                }
-
-                true
-            }
-
-            KeyEvent.KEYCODE_VOLUME_DOWN -> {
-                if (currentPage < maxPage) {
-                    runOnUiThread {
-                        currentPage++
-
-                        cancelFetch()
-                        clearGalleries()
-                        fetchGalleries(query, sortMode)
-                        loadBlocks()
-                    }
-                }
-
-                true
-            }
-
-            else -> super.onKeyDown(keyCode, event)
-        }
-    }
-
-    private fun initView() {
-        binding.contents.recyclerview.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                // -height of the search view < translationY < 0
-                binding.contents.searchview.translationY =
-                    min(
-                        max(
-                            binding.contents.searchview.translationY - dy,
-                            -binding.contents.searchview.binding.querySection.root.height.toFloat()
-                        ), 0F
-                    )
-
-                if (dy > 0)
-                    binding.contents.fab.hideMenuButton(true)
-                else if (dy < 0)
-                    binding.contents.fab.showMenuButton(true)
-            }
-        })
-
-        Linkify.addLinks(
-            binding.contents.noresult,
-            Pattern.compile(getString(R.string.https_text)),
-            null,
-            null,
-            { _, _ -> getString(R.string.https) })
-
-        //NavigationView
-        binding.navView.setNavigationItemSelectedListener(this)
-
-        with(binding.contents.cancelFab) {
-            setImageResource(R.drawable.cancel)
-            setOnClickListener {
-                DownloadService.cancel(this@MainActivity)
-            }
-        }
-
-        with(binding.contents.jumpFab) {
-            setImageResource(R.drawable.ic_jump)
-            setOnClickListener {
-                val perPage = Preferences["per_page", "25"].toInt()
-                val editText = EditText(context)
-
-                AlertDialog.Builder(context).apply {
-                    setView(editText)
-                    setTitle(R.string.main_jump_title)
-                    setMessage(
-                        getString(
-                            R.string.main_jump_message,
-                            currentPage + 1,
-                            ceil(totalItems / perPage.toDouble()).roundToInt()
-                        )
-                    )
-
-                    setPositiveButton(android.R.string.ok) { _, _ ->
-                        currentPage =
-                            (editText.text.toString().toIntOrNull() ?: return@setPositiveButton) - 1
-
-                        runOnUiThread {
-                            cancelFetch()
-                            clearGalleries()
-                            loadBlocks()
-                        }
-                    }
-                }.show()
-            }
-        }
-
-        with(binding.contents.randomFab) {
-            setImageResource(R.drawable.shuffle_variant)
-            setOnClickListener {
-                runBlocking {
-                    withTimeoutOrNull(100) {
-                        galleryIDs?.await()
-                    }
-                }.let {
-                    if (it?.isEmpty() == false) {
-                        val galleryID = it.random()
-
-                        GalleryDialog(this@MainActivity, galleryID).apply {
-                            onChipClickedHandler.add {
-                                runOnUiThread {
-                                    query = it.toQuery()
-                                    currentPage = 0
-
-                                    cancelFetch()
-                                    clearGalleries()
-                                    fetchGalleries(query, sortMode)
-                                    loadBlocks()
-                                }
-                                dismiss()
-                            }
-                        }.show()
-                    }
-                }
-            }
-        }
-
-        with(binding.contents.idFab) {
-            setImageResource(R.drawable.numeric)
-            setOnClickListener {
-                val editText = EditText(context).apply {
-                    inputType = InputType.TYPE_CLASS_NUMBER
-                }
-
-                AlertDialog.Builder(context).apply {
-                    setView(editText)
-                    setTitle(R.string.main_open_gallery_by_id)
-
-                    setPositiveButton(android.R.string.ok) { _, _ ->
-                        val galleryID =
-                            editText.text.toString().toIntOrNull() ?: return@setPositiveButton
-
-                        GalleryDialog(this@MainActivity, galleryID).apply {
-                            onChipClickedHandler.add {
-                                runOnUiThread {
-                                    query = it.toQuery()
-                                    currentPage = 0
-
-                                    cancelFetch()
-                                    clearGalleries()
-                                    fetchGalleries(query, sortMode)
-                                    loadBlocks()
-                                }
-                                dismiss()
-                            }
-                        }.show()
-                    }
-                }.show()
-            }
-        }
-
-        with(binding.contents.view) {
-            setOnPageTurnListener(object : MainView.OnPageTurnListener {
-                override fun onPrev(page: Int) {
-                    currentPage--
-
-                    // disable pageturn until the contents are loaded
-                    setCurrentPage(1, false)
-
-                    ViewCompat.animate(binding.contents.searchview)
-                        .setDuration(100)
-                        .setInterpolator(DecelerateInterpolator())
-                        .translationY(0F)
-
-                    cancelFetch()
-                    clearGalleries()
-                    fetchGalleries(query, sortMode)
-                    loadBlocks()
-                }
-
-                override fun onNext(page: Int) {
-                    currentPage++
-
-                    // disable pageturn until the contents are loaded
-                    setCurrentPage(1, false)
-
-                    ViewCompat.animate(binding.contents.searchview)
-                        .setDuration(100)
-                        .setInterpolator(DecelerateInterpolator())
-                        .translationY(0F)
-
-                    cancelFetch()
-                    clearGalleries()
-                    fetchGalleries(query, sortMode)
-                    loadBlocks()
-                }
-            })
-        }
-
-        setupSearchBar()
-        setupRecyclerView()
-        fetchGalleries(query, sortMode)
-        loadBlocks()
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    private fun setupRecyclerView() {
-        with(binding.contents.recyclerview) {
-            adapter = GalleryBlockAdapter(galleries).apply {
-                onChipClickedHandler.add {
-                    runOnUiThread {
-                        query = it.toQuery()
-                        currentPage = 0
-
-                        cancelFetch()
-                        clearGalleries()
-                        fetchGalleries(query, sortMode)
-                        loadBlocks()
-                    }
-                }
-                onDownloadClickedHandler = { position ->
-                    val galleryID = galleries[position]
-
-                    requestNotificationPermission(
-                        this@MainActivity,
-                        requestNotificationPermssionLauncher
-                    ) {
-                        if (DownloadManager.getInstance(context)
-                                .isDownloading(galleryID)
-                        ) {     //download in progress
-                            DownloadService.cancel(this@MainActivity, galleryID)
-                        } else {
-                            DownloadManager.getInstance(context).addDownloadFolder(galleryID)
-                            DownloadService.download(this@MainActivity, galleryID)
-                        }
-                    }
-
-                    closeAllItems()
-                }
-
-                onDeleteClickedHandler = { position ->
-                    val galleryID = galleries[position]
-                    DownloadService.delete(this@MainActivity, galleryID)
-
-                    histories.remove(galleryID)
-
-                    if (this@MainActivity.mode != Mode.SEARCH)
-                        runOnUiThread {
-                            cancelFetch()
-                            clearGalleries()
-                            fetchGalleries(query, sortMode)
-                            loadBlocks()
-                        }
-
-                    closeAllItems()
-                }
-            }
-            ItemClickSupport.addTo(this).apply {
-                onItemClickListener = listener@{ _, position, v ->
-                    if (v !is ProgressCard)
-                        return@listener
-
-                    val intent = Intent(this@MainActivity, ReaderActivity::class.java)
-                    intent.putExtra("galleryID", galleries[position])
-
-                    //TODO: Maybe sprinkling some transitions will be nice :D
-                    startActivity(intent)
-                }
-
-                onItemLongClickListener = listener@{ _, position, v ->
-                    if (v !is ProgressCard)
-                        return@listener false
-
-                    val galleryID = galleries.getOrNull(position) ?: return@listener true
-
-                    GalleryDialog(this@MainActivity, galleryID).apply {
-                        onChipClickedHandler.add {
-                            runOnUiThread {
-                                query = it.toQuery()
-                                currentPage = 0
-
-                                cancelFetch()
-                                clearGalleries()
-                                fetchGalleries(query, sortMode)
-                                loadBlocks()
-                            }
-                            dismiss()
-                        }
-                    }.show()
-
-                    true
-                }
-            }
-        }
-    }
-
-    private var isFavorite = false
-    private val defaultSuggestions: List<SearchSuggestion>
-        get() = when {
-            isFavorite -> {
-                favoriteTags.map {
-                    TagSuggestion(it.tag, -1, "", it.area ?: "tag")
-                } + FavoriteHistorySwitch(getString(R.string.search_show_histories))
-            }
-
-            else -> {
-                searchHistory.map {
-                    Suggestion(it)
-                }.takeLast(10) + FavoriteHistorySwitch(getString(R.string.search_show_tags))
-            }
-        }.reversed()
-
-    private var suggestionJob: Job? = null
-    private fun setupSearchBar() {
-        with(binding.contents.searchview) {
-            val scrollSuggestionToTop = {
-                with(binding.suggestionSection.suggestionsList) {
-                    MainScope().launch {
-                        withTimeout(1000) {
-                            val layoutManager = layoutManager as LinearLayoutManager
-                            while (layoutManager.findLastVisibleItemPosition() != adapter?.itemCount?.minus(
-                                    1
-                                )
-                            ) {
-                                layoutManager.scrollToPosition(adapter?.itemCount?.minus(1) ?: 0)
-                                delay(100)
-                            }
-                        }
-                    }
-                }
-            }
-
-            onMenuStatusChangeListener = object : FloatingSearchView.OnMenuStatusChangeListener {
-                override fun onMenuOpened() {
-                    (this@MainActivity.binding.contents.recyclerview.adapter as GalleryBlockAdapter).closeAllItems()
-                }
-
-                override fun onMenuClosed() {
-                    //Do Nothing
-                }
-            }
-
-            post {
-                findViewById<MenuView>(R.id.menu_view).menuItems.firstOrNull {
-                    (it as MenuItem).itemId == R.id.main_menu_thin
-                }?.let {
-                    (it as MenuItem).isChecked = Preferences["thin"]
-                }
-            }
-
-            onHistoryDeleteClickedListener = {
-                searchHistory.remove(it)
-                swapSuggestions(defaultSuggestions)
-            }
-            onFavoriteHistorySwitchClickListener = {
-                isFavorite = !isFavorite
-                swapSuggestions(defaultSuggestions)
-                scrollSuggestionToTop()
-            }
-
-            onMenuItemClickListener = {
-                onActionMenuItemSelected(it)
-            }
-
-            onQueryChangeListener = lambda@{ _, query ->
-                this@MainActivity.query = query
-
-                suggestionJob?.cancel()
-
-                if (query.isEmpty() or query.endsWith(' ')) {
-                    swapSuggestions(defaultSuggestions)
-                    scrollSuggestionToTop()
-
-                    return@lambda
-                }
-
-                swapSuggestions(listOf(LoadingSuggestion(getText(R.string.reader_loading).toString())))
-
-                val currentQuery = query.split(" ").last()
-                    .replace(Regex("^-"), "")
-                    .replace('_', ' ')
-
-                suggestionJob = CoroutineScope(Dispatchers.IO).launch {
-                    val suggestions = kotlin.runCatching {
-                        getSuggestionsForQuery(currentQuery).map { TagSuggestion(it) }
-                            .toMutableList()
-                    }.getOrElse { mutableListOf() }
-
-                    suggestions.filter {
-                        val tag = "${it.n}:${it.s.replace(Regex("\\s"), "_")}"
-                        favoriteTags.contains(Tag.parse(tag))
-                    }.reversed().forEach {
-                        suggestions.remove(it)
-                        suggestions.add(0, it)
-                    }
-
-                    withContext(Dispatchers.Main) {
-                        swapSuggestions(
-                            if (suggestions.isNotEmpty()) suggestions else listOf(
-                                NoResultSuggestion(getText(R.string.main_no_result).toString())
-                            )
-                        )
-                    }
-                }
-            }
-
-            onFocusChangeListener = object : FloatingSearchView.OnFocusChangeListener {
-                override fun onFocus() {
-                    if (query.isEmpty() or query.endsWith(' ')) {
-                        swapSuggestions(defaultSuggestions)
-                        scrollSuggestionToTop()
-                    }
-                }
-
-                override fun onFocusCleared() {
-                    suggestionJob?.cancel()
-
-                    runOnUiThread {
-                        cancelFetch()
-                        clearGalleries()
-                        currentPage = 0
-                        fetchGalleries(query, sortMode)
-                        loadBlocks()
-                    }
-                }
-            }
-
-            attachNavigationDrawerToMenuButton(this@MainActivity.binding.drawer)
-        }
-    }
-
-    fun onActionMenuItemSelected(item: MenuItem?) {
-        when (item?.itemId) {
-            R.id.main_menu_settings -> startActivity(
-                Intent(
-                    this@MainActivity,
-                    SettingsActivity::class.java
-                )
-            )
-
-            R.id.main_menu_thin -> {
-                val thin = !item.isChecked
-
-                item.isChecked = thin
-                binding.contents.recyclerview.apply {
-                    (adapter as GalleryBlockAdapter).apply {
-                        this.thin = thin
-
-                        Preferences["thin"] = thin
-                    }
-
-                    adapter = adapter       // Force to redraw
-                }
-            }
-
-            R.id.main_menu_sort_date_added,
-            R.id.main_menu_sort_date_published,
-            R.id.main_menu_sort_popular_today,
-            R.id.main_menu_sort_popular_week,
-            R.id.main_menu_sort_popular_month,
-            R.id.main_menu_sort_popular_year,
-            R.id.main_menu_sort_random -> {
-                sortMode = sortModeLookup[item.itemId]!!
-                item.isChecked = true
-
-                runOnUiThread {
-                    currentPage = 0
-
-                    cancelFetch()
-                    clearGalleries()
-                    fetchGalleries(query, sortMode)
-                    loadBlocks()
-                }
-            }
-        }
-    }
-
-    override fun onNavigationItemSelected(item: MenuItem): Boolean {
-        runOnUiThread {
-            binding.drawer.closeDrawers()
-
-            when (item.itemId) {
-                R.id.main_drawer_home -> {
-                    cancelFetch()
-                    clearGalleries()
-                    currentPage = 0
-                    query = ""
-                    queryStack.clear()
-                    mode = Mode.SEARCH
-                    fetchGalleries(query, sortMode)
-                    loadBlocks()
-                }
-
-                R.id.main_drawer_history -> {
-                    cancelFetch()
-                    clearGalleries()
-                    currentPage = 0
-                    query = ""
-                    queryStack.clear()
-                    mode = Mode.HISTORY
-                    fetchGalleries(query, sortMode)
-                    loadBlocks()
-                }
-
-                R.id.main_drawer_downloads -> {
-                    cancelFetch()
-                    clearGalleries()
-                    currentPage = 0
-                    query = ""
-                    queryStack.clear()
-                    mode = Mode.DOWNLOAD
-                    fetchGalleries(query, sortMode)
-                    loadBlocks()
-                }
-
-                R.id.main_drawer_favorite -> {
-                    cancelFetch()
-                    clearGalleries()
-                    currentPage = 0
-                    query = ""
-                    queryStack.clear()
-                    mode = Mode.FAVORITE
-                    fetchGalleries(query, sortMode)
-                    loadBlocks()
-                }
-
-                R.id.main_drawer_help -> {
-                    startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.help))))
-                }
-
-                R.id.main_drawer_github -> {
-                    startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.github))))
-                }
-
-                R.id.main_drawer_homepage -> {
-                    startActivity(
-                        Intent(
-                            Intent.ACTION_VIEW,
-                            Uri.parse(getString(R.string.home_page))
-                        )
-                    )
-                }
-
-                R.id.main_drawer_email -> {
-                    startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.email))))
-                }
-
-                R.id.main_drawer_kakaotalk -> {
-                    startActivity(
-                        Intent(
-                            Intent.ACTION_VIEW,
-                            Uri.parse(getString(R.string.discord))
-                        )
-                    )
-                }
-            }
-        }
-
-        return true
-    }
-
-    private fun cancelFetch() {
-        galleryIDs?.cancel()
-        loadingJob?.cancel()
-    }
-
-    private fun clearGalleries() = CoroutineScope(Dispatchers.Main).launch {
-        galleries.clear()
-
-        with(binding.contents.recyclerview.adapter as GalleryBlockAdapter?) {
-            this ?: return@with
-
-            this.notifyDataSetChanged()
-        }
-
-        binding.contents.noresult.visibility = View.INVISIBLE
-        binding.contents.progressbar.show()
-    }
-
-    private fun fetchGalleries(query: String, sortMode: SortMode) {
-        val defaultQuery: String = Preferences["default_query"]
-
-        if (query.isNotBlank())
-            searchHistory.add(query)
-
-        if (query != queryStack.lastOrNull()) {
-            queryStack.remove(query)
-            queryStack.add(query)
-        }
-
-        if (query.isNotEmpty() && mode != Mode.SEARCH) {
-            Snackbar.make(binding.contents.recyclerview, R.string.search_all, Snackbar.LENGTH_SHORT)
-                .apply {
-                    setAction(android.R.string.ok) {
-                        cancelFetch()
-                        clearGalleries()
-                        currentPage = 0
-                        mode = Mode.SEARCH
-                        queryStack.clear()
-                        fetchGalleries(query, sortMode)
-                        loadBlocks()
-                    }
-                }.show()
-        }
-
-        galleryIDs = null
-
-        if (galleryIDs?.isActive == true)
-            return
-
-        galleryIDs = CoroutineScope(Dispatchers.IO).async {
-            when (mode) {
-                Mode.SEARCH -> {
-                    doSearch(
-                        "$defaultQuery $query",
-                        sortMode
-                    ).also {
-                        totalItems = it.size
-                    }
-                }
-
-                Mode.HISTORY -> {
-                    when {
-                        query.isEmpty() -> {
-                            histories.reversed().also {
-                                totalItems = it.size
-                            }
-                        }
-
-                        else -> {
-                            val result = doSearch(query, SortMode.DATE_ADDED).sorted()
-                            histories.reversed().filter { result.binarySearch(it) >= 0 }.also {
-                                totalItems = it.size
-                            }
-                        }
-                    }
-                }
-
-                Mode.DOWNLOAD -> {
-                    val downloads =
-                        DownloadManager.getInstance(this@MainActivity).downloadFolderMap.keys.toList()
-
-                    when {
-                        query.isEmpty() -> downloads.reversed().also {
-                            totalItems = it.size
-                        }
-
-                        else -> {
-                            val result = doSearch(query, SortMode.DATE_ADDED).sorted()
-                            downloads.reversed().filter { result.binarySearch(it) >= 0 }.also {
-                                totalItems = it.size
-                            }
-                        }
-                    }
-                }
-
-                Mode.FAVORITE -> {
-                    when {
-                        query.isEmpty() -> favorites.reversed().also {
-                            totalItems = it.size
-                        }
-
-                        else -> {
-                            val result = doSearch(query, SortMode.DATE_ADDED).sorted()
-                            favorites.reversed().filter { result.binarySearch(it) >= 0 }.also {
-                                totalItems = it.size
-                            }
-                        }
-                    }
-                }
-            }.toList()
-        }
-    }
-
-    private fun loadBlocks() {
-        val perPage = Preferences["per_page", "25"].toInt()
-
-        loadingJob = CoroutineScope(Dispatchers.IO).launch {
-            val galleryIDs = try {
-                galleryIDs!!.await().also {
-                    if (it.isEmpty())
-                        throw Exception("No result")
-                }
-            } catch (e: Exception) {
-                if (e !is CancellationException)
-                    FirebaseCrashlytics.getInstance().recordException(e)
-
-                withContext(Dispatchers.Main) {
-                    binding.contents.noresult.visibility = View.VISIBLE
-                    binding.contents.progressbar.hide()
-                }
-
-                return@launch
-            }
-
-            launch(Dispatchers.Main) {
-                binding.contents.view.setCurrentPage(
-                    currentPage + 1,
-                    galleryIDs.size > (currentPage + 1) * perPage
-                )
-            }
-
-            galleryIDs.slice(
-                currentPage * perPage until min(
-                    currentPage * perPage + perPage,
-                    galleryIDs.size
-                )
-            ).chunked(5).let { chunks ->
-                for (chunk in chunks)
-                    chunk.map { galleryID ->
-                        async {
-                            Cache.getInstance(this@MainActivity, galleryID).getGalleryBlock()?.let {
-                                galleryID
-                            }
-                        }
-                    }.forEach {
-                        it.await()?.also {
-                            withContext(Dispatchers.Main) {
-                                binding.contents.progressbar.hide()
-
-                                galleries.add(it)
-                                binding.contents.recyclerview.adapter!!.notifyItemInserted(galleries.size - 1)
-                            }
-                        }
-                    }
-            }
-        }
-    }
-}

app/src/main/java/xyz/quaver/pupil/ui/MainComposeActivity.kt

@@ -1,44 +0,0 @@
-package xyz.quaver.pupil.ui
-
-import android.os.Bundle
-import androidx.activity.compose.setContent
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.activity.viewModels
-import androidx.compose.runtime.getValue
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.google.accompanist.adaptive.calculateDisplayFeatures
-import xyz.quaver.pupil.ui.compose.MainApp
-import xyz.quaver.pupil.ui.theme.AppTheme
-import xyz.quaver.pupil.ui.viewmodel.MainViewModel
-import xyz.quaver.pupil.util.requestNotificationPermission
-import xyz.quaver.pupil.util.showNotificationPermissionExplanationDialog
-
-class MainComposeActivity : BaseComponentActivity() {
-    private val requestNotificationPermissionLauncher =
-        registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
-            if (!isGranted) {
-                showNotificationPermissionExplanationDialog(this)
-            }
-        }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        requestNotificationPermission(this, requestNotificationPermissionLauncher, false)
-
-        val viewModel: MainViewModel by viewModels()
-
-        setContent {
-            val displayFeatures = calculateDisplayFeatures(this)
-
-            val uiState by viewModel.searchState.collectAsStateWithLifecycle()
-
-            AppTheme {
-                MainApp(
-                    uiState = uiState,
-                    displayFeatures = displayFeatures
-                )
-            }
-        }
-    }
-}

app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt

@@ -1,619 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.ui
-
-import android.Manifest
-import android.content.ComponentName
-import android.content.Intent
-import android.content.ServiceConnection
-import android.content.pm.PackageManager
-import android.graphics.drawable.Animatable
-import android.graphics.drawable.Drawable
-import android.os.Build
-import android.os.Bundle
-import android.os.IBinder
-import android.view.*
-import android.view.animation.Animation
-import android.view.animation.AnticipateInterpolator
-import android.view.animation.OvershootInterpolator
-import android.view.animation.TranslateAnimation
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AlertDialog
-import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.PagerSnapHelper
-import androidx.recyclerview.widget.RecyclerView
-import androidx.vectordrawable.graphics.drawable.Animatable2Compat
-import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
-import com.google.android.material.snackbar.Snackbar
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import com.google.mlkit.vision.face.Face
-import com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.adapters.ReaderAdapter
-import xyz.quaver.pupil.databinding.NumberpickerDialogBinding
-import xyz.quaver.pupil.databinding.ReaderActivityBinding
-import xyz.quaver.pupil.favorites
-import xyz.quaver.pupil.services.DownloadService
-import xyz.quaver.pupil.util.Preferences
-import xyz.quaver.pupil.util.camera
-import xyz.quaver.pupil.util.checkNotificationEnabled
-import xyz.quaver.pupil.util.closeCamera
-import xyz.quaver.pupil.util.downloader.Cache
-import xyz.quaver.pupil.util.downloader.DownloadManager
-import xyz.quaver.pupil.util.requestNotificationPermission
-import xyz.quaver.pupil.util.showNotificationPermissionExplanationDialog
-import xyz.quaver.pupil.util.startCamera
-
-class ReaderActivity : BaseActivity() {
-
-    private var galleryID = 0
-    private var currentPage = 0
-
-    private var isScroll = true
-    private var isFullscreen = false
-    set(value) {
-        field = value
-
-        (binding.recyclerview.adapter as ReaderAdapter).isFullScreen = value
-    }
-
-    private lateinit var cache: Cache
-    var downloader: DownloadService? = null
-    private val conn = object: ServiceConnection {
-        override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
-            downloader = (service as DownloadService.Binder).service.also {
-                it.priority = 0
-
-                if (!it.progress.containsKey(galleryID))
-                    DownloadService.download(this@ReaderActivity, galleryID, true)
-            }
-        }
-
-        override fun onServiceDisconnected(name: ComponentName?) {
-            downloader = null
-        }
-    }
-
-    private val snapHelper = PagerSnapHelper()
-    private var menu: Menu? = null
-
-    private val requestPermissionLauncher = registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
-        if (isGranted)
-            toggleCamera()
-        else
-            AlertDialog.Builder(this)
-                .setTitle(R.string.error)
-                .setMessage(R.string.camera_denied)
-                .setPositiveButton(android.R.string.ok) { _, _ ->}
-                .show()
-    }
-
-    enum class Eye {
-        LEFT,
-        RIGHT
-    }
-
-    private var cameraEnabled = false
-    private var eyeType: Eye? = null
-    private var eyeTime: Long = 0L
-
-    private lateinit var binding: ReaderActivityBinding
-
-    private val requestNotificationPermssionLauncher = registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
-        if (!isGranted) {
-            showNotificationPermissionExplanationDialog(this)
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ReaderActivityBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        title = getString(R.string.reader_loading)
-        supportActionBar?.setDisplayHomeAsUpEnabled(false)
-
-        handleIntent(intent)
-        cache = Cache.getInstance(this, galleryID)
-        FirebaseCrashlytics.getInstance().setCustomKey("GalleryID", galleryID)
-
-        if (galleryID == 0) {
-            onBackPressed()
-            return
-        }
-
-        initDownloadListener()
-        initView()
-    }
-
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent)
-        handleIntent(intent)
-    }
-
-    private fun handleIntent(intent: Intent) {
-        if (intent.action == Intent.ACTION_VIEW) {
-            val uri = intent.data
-            val lastPathSegment = uri?.lastPathSegment
-            if (uri != null && lastPathSegment != null) {
-                galleryID = if (uri.host?.endsWith("hasha.in") == true) {
-                    lastPathSegment?.toInt() ?: 0
-                } else when (uri.host) {
-                    "hitomi.la" ->
-                        Regex("([0-9]+).html").find(lastPathSegment)?.groupValues?.get(1)?.toIntOrNull() ?: 0
-                    "e-hentai.org" -> uri.pathSegments[1].toInt()
-                    else -> 0
-                }
-            }
-        } else {
-            galleryID = intent.getIntExtra("galleryID", 0)
-        }
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.reader, menu)
-
-        with(menu.findItem(R.id.reader_menu_favorite)) {
-            if (favorites.contains(galleryID))
-                (icon as Animatable).start()
-        }
-
-        this.menu = menu
-        return true
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when(item.itemId) {
-            R.id.reader_menu_page_indicator -> {
-                // TODO: Switch to DialogFragment
-                val binding = NumberpickerDialogBinding.inflate(layoutInflater, binding.root, false)
-
-                with(binding.numberPicker) {
-                    minValue = 1
-                    maxValue = cache.metadata.galleryInfo?.files?.size ?: 0
-                    value = currentPage
-                }
-                val dialog = AlertDialog.Builder(this).apply {
-                    setView(binding.root)
-                }.create()
-                binding.okButton.setOnClickListener {
-                    (this@ReaderActivity.binding.recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(binding.numberPicker.value-1, 0)
-                    dialog.dismiss()
-                }
-
-                dialog.show()
-            }
-            R.id.reader_menu_favorite -> {
-                val id = galleryID
-                val favorite = menu?.findItem(R.id.reader_menu_favorite) ?: return true
-
-                if (favorites.contains(id)) {
-                    favorites.remove(id)
-                    favorite.icon = AnimatedVectorDrawableCompat.create(this, R.drawable.avd_star)
-                } else {
-                    favorites.add(id)
-                    (favorite.icon as Animatable).start()
-                }
-            }
-        }
-
-        return true
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        bindService(Intent(this, DownloadService::class.java), conn, BIND_AUTO_CREATE)
-
-        if (cameraEnabled)
-            startCamera(this, cameraCallback)
-    }
-
-    override fun onPause() {
-        super.onPause()
-        closeCamera()
-
-        if (downloader != null)
-            unbindService(conn)
-
-        downloader?.priority = galleryID
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-
-        update = false
-
-        if (!DownloadManager.getInstance(this).isDownloading(galleryID))
-            DownloadService.cancel(this, galleryID)
-    }
-
-    override fun onBackPressed() {
-        if (isScroll and !isFullscreen)
-            super.onBackPressed()
-
-        if (isFullscreen) {
-            isFullscreen = false
-            fullscreen(false)
-        }
-
-        if (!isScroll) {
-            isScroll = true
-            scrollMode(true)
-        }
-    }
-
-    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
-        //currentPage is 1-based
-        return when(keyCode) {
-            KeyEvent.KEYCODE_VOLUME_UP -> {
-                (binding.recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage-2, 0)
-
-                true
-            }
-            KeyEvent.KEYCODE_VOLUME_DOWN -> {
-                (binding.recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPositionWithOffset(currentPage, 0)
-
-                true
-            }
-            else -> super.onKeyDown(keyCode, event)
-        }
-    }
-
-    private var update = true
-    private fun initDownloadListener() {
-        CoroutineScope(Dispatchers.Main).launch {
-            while (update) {
-                delay(1000)
-
-                val downloader = downloader ?: continue
-
-                if (!downloader.progress.containsKey(galleryID))  //loading
-                    continue
-
-                if (downloader.progress[galleryID]?.isEmpty() == true) {      //Gallery not found
-                    update = false
-                    Snackbar
-                        .make(binding.root, R.string.reader_failed_to_find_gallery, Snackbar.LENGTH_INDEFINITE)
-                        .show()
-
-                    return@launch
-                }
-
-                binding.downloadProgressbar.max = binding.recyclerview.adapter?.itemCount ?: 0
-                binding.downloadProgressbar.progress =
-                    downloader.progress[galleryID]?.count { it.isInfinite() } ?: 0
-
-                if (title == getString(R.string.reader_loading)) {
-                    val galleryInfo = cache.metadata.galleryInfo
-
-                    if (galleryInfo != null) {
-                        with(binding.recyclerview.adapter as ReaderAdapter) {
-                            this.galleryInfo = galleryInfo
-                            notifyDataSetChanged()
-                        }
-
-                        title = galleryInfo.title
-                        menu?.findItem(R.id.reader_menu_page_indicator)?.title =
-                            "$currentPage/${galleryInfo.files.size}"
-
-                        menu?.findItem(R.id.reader_type)?.icon = ContextCompat.getDrawable(this@ReaderActivity, R.drawable.hitomi)
-                    }
-                }
-
-                if (downloader.isCompleted(galleryID)) {   //Download finished
-                    binding.downloadProgressbar.visibility = View.GONE
-
-                    animateDownloadFAB(false)
-                }
-            }
-        }
-    }
-
-    private fun initView() {
-        with(binding.recyclerview) {
-            adapter = ReaderAdapter(this@ReaderActivity, galleryID).apply {
-                onItemClickListener = {
-                    if (isScroll) {
-                        isScroll = false
-                        isFullscreen = true
-
-                        scrollMode(false)
-                        fullscreen(true)
-                    } else {
-                        (binding.recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage, 0) //Moves to next page because currentPage is 1-based indexing
-                    }
-                }
-            }
-
-            addOnScrollListener(object: RecyclerView.OnScrollListener() {
-                override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                    super.onScrolled(recyclerView, dx, dy)
-
-                    if (dy < 0)
-                        binding.fab.showMenuButton(true)
-                    else if (dy > 0)
-                        binding.fab.hideMenuButton(true)
-
-                    val layoutManager = recyclerView.layoutManager as LinearLayoutManager
-
-                    if (layoutManager.findFirstVisibleItemPosition() == -1)
-                        return
-                    currentPage = layoutManager.findFirstVisibleItemPosition()+1
-                    menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${recyclerView.adapter!!.itemCount}"
-                }
-            })
-        }
-
-        with(binding.downloadFab) {
-            animateDownloadFAB(DownloadManager.getInstance(this@ReaderActivity).getDownloadFolder(galleryID) != null) //If download in progress, animate button
-
-            setOnClickListener {
-                requestNotificationPermission(
-                    this@ReaderActivity,
-                    requestNotificationPermssionLauncher
-                ) {
-                    val downloadManager = DownloadManager.getInstance(this@ReaderActivity)
-
-                    if (downloadManager.isDownloading(galleryID)) {
-                        downloadManager.deleteDownloadFolder(galleryID)
-                        animateDownloadFAB(false)
-                    } else {
-                        downloadManager.addDownloadFolder(galleryID)
-                        DownloadService.download(context, galleryID, true)
-                        animateDownloadFAB(true)
-                    }
-                }
-            }
-        }
-
-        with(binding.retryFab) {
-            setImageResource(R.drawable.refresh)
-            setOnClickListener {
-                DownloadService.download(context, galleryID)
-            }
-        }
-
-        with(binding.autoFab) {
-            setImageResource(R.drawable.eye_white)
-            setOnClickListener {
-                when {
-                    ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED -> {
-                        toggleCamera()
-                    }
-                    Build.VERSION.SDK_INT >= 23 && shouldShowRequestPermissionRationale(Manifest.permission.CAMERA) -> {
-                        AlertDialog.Builder(this@ReaderActivity)
-                            .setTitle(R.string.warning)
-                            .setMessage(R.string.camera_denied)
-                            .setPositiveButton(android.R.string.ok) { _, _ ->}
-                            .show()
-                    }
-                    else ->
-                        requestPermissionLauncher.launch(Manifest.permission.CAMERA)
-                }
-            }
-        }
-
-        with(binding.fullscreenFab) {
-            setImageResource(R.drawable.ic_fullscreen)
-            setOnClickListener {
-                isFullscreen = true
-                fullscreen(isFullscreen)
-
-                binding.fab.close(true)
-            }
-        }
-    }
-
-    private fun fullscreen(isFullscreen: Boolean) {
-        with(window.attributes) {
-            if (isFullscreen) {
-                flags = flags or WindowManager.LayoutParams.FLAG_FULLSCREEN
-                supportActionBar?.hide()
-                binding.fab.visibility = View.INVISIBLE
-                binding.scroller.let {
-                    it.handleWidth = resources.getDimensionPixelSize(R.dimen.thumb_height)
-                    it.handleHeight = resources.getDimensionPixelSize(R.dimen.thumb_width)
-                    it.handleDrawable = ContextCompat.getDrawable(this@ReaderActivity, R.drawable.thumb_horizontal)
-                    it.fastScrollDirection = RecyclerViewFastScroller.FastScrollDirection.HORIZONTAL
-                }
-            } else {
-                flags = flags and WindowManager.LayoutParams.FLAG_FULLSCREEN.inv()
-                supportActionBar?.show()
-                binding.fab.visibility = View.VISIBLE
-                binding.scroller.let {
-                    it.handleWidth = resources.getDimensionPixelSize(R.dimen.thumb_width)
-                    it.handleHeight = resources.getDimensionPixelSize(R.dimen.thumb_height)
-                    it.handleDrawable = ContextCompat.getDrawable(this@ReaderActivity, R.drawable.thumb)
-                    it.fastScrollDirection = RecyclerViewFastScroller.FastScrollDirection.VERTICAL
-                }
-            }
-
-            window.attributes = this
-        }
-
-        binding.recyclerview.adapter = binding.recyclerview.adapter   // Force to redraw
-    }
-
-    private fun scrollMode(isScroll: Boolean) {
-        if (isScroll) {
-            snapHelper.attachToRecyclerView(null)
-            binding.recyclerview.layoutManager = LinearLayoutManager(this)
-        } else {
-            snapHelper.attachToRecyclerView(binding.recyclerview)
-            binding.recyclerview.layoutManager = object: LinearLayoutManager(this, HORIZONTAL, Preferences["rtl", false]) {
-                override fun calculateExtraLayoutSpace(state: RecyclerView.State, extraLayoutSpace: IntArray) {
-                    extraLayoutSpace.fill(600)
-                }
-            }
-        }
-
-        (binding.recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage-1, 0)
-    }
-
-    private fun animateDownloadFAB(animate: Boolean) {
-        with(binding.downloadFab) {
-            if (animate) {
-                val icon = AnimatedVectorDrawableCompat.create(context, R.drawable.ic_downloading)
-
-                icon?.registerAnimationCallback(object : Animatable2Compat.AnimationCallback() {
-                    override fun onAnimationEnd(drawable: Drawable?) {
-                        if (downloader?.isCompleted(galleryID) == true) // If download is finished, stop animating
-                            post {
-                                setImageResource(R.drawable.ic_download)
-                                labelText = getString(R.string.reader_fab_download_cancel)
-                            }
-                        else                                                            // Or continue animate
-                            post {
-                                icon.start()
-                                labelText = getString(R.string.reader_fab_download_cancel)
-                            }
-                    }
-                })
-
-                setImageDrawable(icon)
-                icon?.start()
-            } else {
-                setImageResource(R.drawable.ic_download)
-                labelText = getString(R.string.reader_fab_download)
-            }
-        }
-    }
-
-    val cameraCallback: (List<Face>) -> Unit = callback@{ faces ->
-        binding.eyeCard.dot.let {
-            it.visibility = View.VISIBLE
-            CoroutineScope(Dispatchers.Main).launch {
-                delay(50)
-                it.visibility = View.INVISIBLE
-            }
-        }
-
-        if (faces.size != 1)
-            ContextCompat.getDrawable(this, R.drawable.eye_off).let {
-                with(binding.eyeCard) {
-                    leftEye.setImageDrawable(it)
-                    rightEye.setImageDrawable(it)
-                }
-
-                return@callback
-            }
-
-        val (left, right) = Pair(
-            faces[0].rightEyeOpenProbability?.let { it > 0.4 } == true,
-            faces[0].leftEyeOpenProbability?.let { it > 0.4 } == true
-        )
-
-        with(binding.eyeCard) {
-            leftEye.setImageDrawable(
-                ContextCompat.getDrawable(
-                    leftEye.context,
-                    if (left) R.drawable.eye else R.drawable.eye_closed
-                )
-            )
-            rightEye.setImageDrawable(
-                ContextCompat.getDrawable(
-                    rightEye.context,
-                    if (right) R.drawable.eye else R.drawable.eye_closed
-                )
-            )
-        }
-
-        when {
-            // Both closed / opened
-            !left.xor(right) -> {
-                eyeType = null
-                eyeTime = 0L
-            }
-            !left -> {
-                if (eyeType != Eye.LEFT) {
-                    eyeType = Eye.LEFT
-                    eyeTime = System.currentTimeMillis()
-                }
-            }
-            !right -> {
-                if (eyeType != Eye.RIGHT) {
-                    eyeType = Eye.RIGHT
-                    eyeTime = System.currentTimeMillis()
-                }
-            }
-        }
-
-        if (eyeType != null && System.currentTimeMillis() - eyeTime > 100) {
-            (binding.recyclerview.layoutManager as LinearLayoutManager).let {
-                it.scrollToPositionWithOffset(when(eyeType!!) {
-                    Eye.RIGHT -> {
-                        if (it.reverseLayout) currentPage - 2 else currentPage
-                    }
-                    Eye.LEFT -> {
-                        if (it.reverseLayout) currentPage else currentPage - 2
-                    }
-                }, 0)
-            }
-
-            eyeTime = System.currentTimeMillis() + 500
-        }
-    }
-
-    private fun toggleCamera() {
-        val eyes = binding.eyeCard.root
-        when (camera) {
-            null -> {
-                binding.autoFab.labelText = getString(R.string.reader_fab_auto_cancel)
-                binding.autoFab.setImageResource(R.drawable.eye_off_white)
-                eyes.apply {
-                    visibility = View.VISIBLE
-                    TranslateAnimation(0F, 0F, -100F, 0F).apply {
-                        duration = 500
-                        fillAfter = false
-                        interpolator = OvershootInterpolator()
-                    }.let { startAnimation(it) }
-                }
-                startCamera(this, cameraCallback)
-                cameraEnabled = true
-            }
-            else -> {
-                binding.autoFab.labelText = getString(R.string.reader_fab_auto)
-                binding.autoFab.setImageResource(R.drawable.eye_white)
-                eyes.apply {
-                    TranslateAnimation(0F, 0F, 0F, -100F).apply {
-                        duration = 500
-                        fillAfter = false
-                        interpolator = AnticipateInterpolator()
-                        setAnimationListener(object: Animation.AnimationListener {
-                            override fun onAnimationStart(p0: Animation?) {}
-                            override fun onAnimationRepeat(p0: Animation?) {}
-
-                            override fun onAnimationEnd(p0: Animation?) {
-                                eyes.visibility = View.GONE
-                            }
-                        })
-                    }.let { startAnimation(it) }
-                }
-                closeCamera()
-                cameraEnabled = false
-            }
-        }
-    }
-}

app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt

@@ -1,45 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.ui
-
-import android.os.Bundle
-import android.view.MenuItem
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.ui.fragment.SettingsFragment
-
-class SettingsActivity : BaseActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.settings_activity)
-        supportFragmentManager
-            .beginTransaction()
-            .replace(R.id.settings, SettingsFragment())
-            .commit()
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            android.R.id.home -> onBackPressed()
-        }
-
-        return true
-    }
-}

app/src/main/java/xyz/quaver/pupil/ui/TransferActivity.kt

@@ -1,382 +0,0 @@
-package xyz.quaver.pupil.ui
-
-import android.Manifest
-import android.annotation.SuppressLint
-import android.content.BroadcastReceiver
-import android.content.ComponentName
-import android.content.Intent
-import android.content.IntentFilter
-import android.content.ServiceConnection
-import android.content.pm.ActivityInfo
-import android.content.pm.PackageManager
-import android.net.wifi.WpsInfo
-import android.net.wifi.p2p.WifiP2pConfig
-import android.net.wifi.p2p.WifiP2pDevice
-import android.net.wifi.p2p.WifiP2pDeviceList
-import android.net.wifi.p2p.WifiP2pInfo
-import android.net.wifi.p2p.WifiP2pManager
-import android.os.Build.VERSION
-import android.os.Build.VERSION_CODES
-import android.os.Bundle
-import android.os.IBinder
-import android.util.Log
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.activity.viewModels
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
-import androidx.fragment.app.commit
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.flowWithLifecycle
-import androidx.lifecycle.lifecycleScope
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.channels.consumeEach
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.launch
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.receiver.WifiDirectBroadcastReceiver
-import xyz.quaver.pupil.services.TransferClientService
-import xyz.quaver.pupil.services.TransferPacket
-import xyz.quaver.pupil.services.TransferServerService
-import xyz.quaver.pupil.ui.fragment.TransferConnectedFragment
-import xyz.quaver.pupil.ui.fragment.TransferDirectionFragment
-import xyz.quaver.pupil.ui.fragment.TransferPermissionFragment
-import xyz.quaver.pupil.ui.fragment.TransferSelectDataFragment
-import xyz.quaver.pupil.ui.fragment.TransferTargetFragment
-import xyz.quaver.pupil.ui.fragment.TransferWaitForConnectionFragment
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
-import kotlin.coroutines.suspendCoroutine
-
-class TransferActivity : AppCompatActivity(R.layout.transfer_activity) {
-
-    private val viewModel: TransferViewModel by viewModels()
-
-    private val intentFilter = IntentFilter().apply {
-        addAction(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION)
-        addAction(WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION)
-        addAction(WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION)
-        addAction(WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION)
-    }
-
-    private lateinit var manager: WifiP2pManager
-    private lateinit var channel: WifiP2pManager.Channel
-
-    private var receiver: BroadcastReceiver? = null
-
-    private val requestPermissionLauncher = registerForActivityResult(
-        ActivityResultContracts.RequestPermission()
-    ) { granted ->
-        if (granted) {
-            viewModel.setStep(TransferStep.TARGET)
-        } else {
-            viewModel.setStep(TransferStep.PERMISSION)
-        }
-    }
-
-    private var clientServiceBinder: TransferClientService.Binder? = null
-
-    private val clientServiceConnection = object : ServiceConnection {
-        override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
-            clientServiceBinder = service as TransferClientService.Binder
-        }
-
-        override fun onServiceDisconnected(name: ComponentName?) {
-            clientServiceBinder = null
-        }
-    }
-
-    private fun checkPermission(force: Boolean = false): Boolean {
-        val permissionRequired = if (VERSION.SDK_INT < VERSION_CODES.TIRAMISU) {
-            Manifest.permission.ACCESS_FINE_LOCATION
-        } else {
-            Manifest.permission.NEARBY_WIFI_DEVICES
-        }
-
-        val permissionGranted =
-            ActivityCompat.checkSelfPermission(this, permissionRequired) == PackageManager.PERMISSION_GRANTED
-
-        val shouldShowRationale =
-            ActivityCompat.shouldShowRequestPermissionRationale(this, permissionRequired)
-
-        if (!permissionGranted) {
-            if (shouldShowRationale && force) {
-                viewModel.setStep(TransferStep.PERMISSION)
-            } else {
-                requestPermissionLauncher.launch(permissionRequired)
-            }
-            return false
-        }
-
-        return true
-    }
-
-    private fun handleServerResponse(response: TransferPacket?) {
-        when (response) {
-            is TransferPacket.ListResponse -> {
-                Log.d("PUPILD", "Received list response $response")
-            }
-            else -> {
-                Log.d("PUPILD", "Received invalid response $response")
-            }
-        }
-    }
-
-    private suspend fun WifiP2pManager.disconnect() {
-        suspendCoroutine { continuation ->
-            removeGroup(channel, object : WifiP2pManager.ActionListener {
-                override fun onSuccess() {
-                    continuation.resume(Unit)
-                }
-
-                override fun onFailure(reason: Int) {
-                    continuation.resume(Unit)
-                }
-            })
-        }
-
-        suspendCoroutine { continuation ->
-            cancelConnect(channel, object: WifiP2pManager.ActionListener {
-                override fun onSuccess() {
-                    continuation.resume(Unit)
-                }
-
-                override fun onFailure(reason: Int) {
-                    continuation.resume(Unit)
-                }
-            })
-        }
-    }
-
-    @SuppressLint("SourceLockedOrientationActivity")
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        supportActionBar?.hide()
-        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-
-        manager = getSystemService(WIFI_P2P_SERVICE) as WifiP2pManager
-        channel = manager.initialize(this, mainLooper, null)
-
-        viewModel.peerToConnect.observe(this) { peer ->
-            if (peer == null) { return@observe }
-            if (!checkPermission()) { return@observe }
-
-            val config = WifiP2pConfig().apply {
-                deviceAddress = peer.deviceAddress
-                wps.setup = WpsInfo.PBC
-            }
-
-            manager.connect(channel, config, object: WifiP2pManager.ActionListener {
-                override fun onSuccess() { }
-
-                override fun onFailure(reason: Int) {
-                    viewModel.connect(null)
-                }
-            })
-        }
-        lifecycleScope.launch {
-            viewModel.messageQueue.consumeEach {
-                clientServiceBinder?.sendPacket(it)?.getOrNull()?.let(::handleServerResponse)
-            }
-        }
-
-        lifecycleScope.launch {
-            viewModel.step.flowWithLifecycle(lifecycle, Lifecycle.State.STARTED).collectLatest step@{ step ->
-                when (step) {
-                    TransferStep.TARGET,
-                    TransferStep.TARGET_FORCE -> {
-                        if (!checkPermission(step == TransferStep.TARGET_FORCE)) {
-                            return@step
-                        }
-
-                        manager.discoverPeers(channel, object: WifiP2pManager.ActionListener {
-                            override fun onSuccess() { }
-
-                            override fun onFailure(reason: Int) {
-                            }
-                        })
-
-                        supportFragmentManager.commit(true) {
-                            replace(R.id.fragment_container_view, TransferTargetFragment())
-                        }
-
-                        val hostAddress = viewModel.connectionInfo.filterNotNull().first {
-                            it.groupFormed
-                        }.groupOwnerAddress.hostAddress
-
-                        val intent = Intent(this@TransferActivity, TransferClientService::class.java).also {
-                            it.putExtra("address", hostAddress)
-                        }
-                        ContextCompat.startForegroundService(this@TransferActivity, intent)
-                        bindService(intent, clientServiceConnection, BIND_AUTO_CREATE)
-
-                        viewModel.setStep(TransferStep.SELECT_DATA)
-                    }
-                    TransferStep.DIRECTION -> {
-                        manager.disconnect()
-                        supportFragmentManager.commit(true) {
-                            replace(R.id.fragment_container_view, TransferDirectionFragment())
-                        }
-                    }
-                    TransferStep.PERMISSION -> {
-                        supportFragmentManager.commit(true) {
-                            replace(R.id.fragment_container_view, TransferPermissionFragment())
-                        }
-                    }
-                    TransferStep.WAIT_FOR_CONNECTION -> {
-                        Log.d("PUPILD", "wait for connection")
-                        if (!checkPermission()) { return@step }
-
-                        runCatching {
-                            suspendCoroutine { continuation ->
-                                manager.createGroup(channel, object: WifiP2pManager.ActionListener {
-                                    override fun onSuccess() {
-                                        continuation.resume(Unit)
-                                    }
-
-                                    override fun onFailure(reason: Int) {
-                                        continuation.resumeWithException(Exception("Failed to create group $reason"))
-                                    }
-                                })
-                            }
-
-                            supportFragmentManager.commit(true) {
-                                replace(R.id.fragment_container_view, TransferWaitForConnectionFragment())
-                            }
-
-                            val address = viewModel.connectionInfo.filterNotNull().first {
-                                it.groupFormed && it.isGroupOwner
-                            }.groupOwnerAddress.hostAddress
-
-                            val intent = Intent(this@TransferActivity, TransferServerService::class.java).also {
-                                it.putExtra("address", address)
-                            }
-                            ContextCompat.startForegroundService(this@TransferActivity, intent)
-                            val binder: TransferServerService.Binder = suspendCoroutine { continuation ->
-                                bindService(intent, object: ServiceConnection {
-                                    override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
-                                        continuation.resume(service as TransferServerService.Binder)
-                                    }
-
-                                    override fun onServiceDisconnected(name: ComponentName?) { }
-                                }, BIND_AUTO_CREATE)
-                            }
-                            binder.channel.receive()
-
-                            viewModel.setStep(TransferStep.CONNECTED)
-                        }.onFailure {
-                            Log.e("PUPILD", "Failed to create group", it)
-                        }
-
-                        supportFragmentManager.commit(true) {
-                            replace(R.id.fragment_container_view, TransferWaitForConnectionFragment())
-                        }
-                    }
-                    TransferStep.CONNECTED -> {
-                        supportFragmentManager.commit(true) {
-                            replace(R.id.fragment_container_view, TransferConnectedFragment())
-                        }
-                    }
-                    TransferStep.SELECT_DATA -> {
-                        supportFragmentManager.commit(true) {
-                            replace(R.id.fragment_container_view, TransferSelectDataFragment())
-                        }
-                    }
-                }
-            }
-        }
-
-    }
-
-    override fun onResume() {
-        super.onResume()
-        bindService(Intent(this, TransferClientService::class.java), clientServiceConnection, BIND_AUTO_CREATE)
-        WifiDirectBroadcastReceiver(manager, channel, viewModel).also {
-            receiver = it
-            registerReceiver(it, intentFilter)
-        }
-    }
-
-    override fun onPause() {
-        super.onPause()
-        unbindService(clientServiceConnection)
-        receiver?.let { unregisterReceiver(it) }
-        receiver = null
-    }
-}
-
-enum class TransferStep {
-    TARGET, TARGET_FORCE, DIRECTION, PERMISSION, WAIT_FOR_CONNECTION, CONNECTED, SELECT_DATA
-}
-
-enum class ErrorType {
-}
-
-class TransferViewModel : ViewModel() {
-    private val _step: MutableStateFlow<TransferStep> = MutableStateFlow(TransferStep.DIRECTION)
-    val step: StateFlow<TransferStep> = _step
-
-    private val _error = MutableLiveData<ErrorType?>(null)
-    val error: LiveData<ErrorType?> = _error
-
-    private val _wifiP2pEnabled: MutableLiveData<Boolean> = MutableLiveData(false)
-    val wifiP2pEnabled: LiveData<Boolean> = _wifiP2pEnabled
-
-    private val _thisDevice: MutableLiveData<WifiP2pDevice?> = MutableLiveData(null)
-    val thisDevice: LiveData<WifiP2pDevice?> = _thisDevice
-
-    private val _peers: MutableLiveData<WifiP2pDeviceList?> = MutableLiveData(null)
-    val peers: LiveData<WifiP2pDeviceList?> = _peers
-
-    private val _connectionInfo: MutableStateFlow<WifiP2pInfo?> = MutableStateFlow(null)
-    val connectionInfo: StateFlow<WifiP2pInfo?> = _connectionInfo
-
-    private val _peerToConnect: MutableLiveData<WifiP2pDevice?> = MutableLiveData(null)
-    val peerToConnect: LiveData<WifiP2pDevice?> = _peerToConnect
-
-    val messageQueue: Channel<TransferPacket> = Channel()
-
-    fun setStep(step: TransferStep) {
-        Log.d("PUPILD", "Set step: $step")
-        _step.value = step
-    }
-
-    fun setWifiP2pEnabled(enabled: Boolean) {
-        _wifiP2pEnabled.value = enabled
-    }
-
-    fun setThisDevice(device: WifiP2pDevice?) {
-        _thisDevice.value = device
-    }
-
-    fun setPeers(peers: WifiP2pDeviceList?) {
-        _peers.value = peers
-    }
-
-    fun setConnectionInfo(info: WifiP2pInfo?) {
-        _connectionInfo.value = info
-    }
-
-    fun setError(error: ErrorType?) {
-        _error.value = error
-    }
-
-    fun connect(device: WifiP2pDevice?) {
-        _peerToConnect.value = device
-    }
-
-    fun ping() {
-        messageQueue.trySend(TransferPacket.Ping)
-    }
-
-    fun list() {
-        messageQueue.trySend(TransferPacket.ListRequest)
-    }
-}

app/src/main/java/xyz/quaver/pupil/ui/compose/MainApp.kt

@@ -1,20 +0,0 @@
-package xyz.quaver.pupil.ui.compose
-
-import androidx.compose.material3.Text
-import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
-import androidx.compose.runtime.Composable
-import androidx.navigation.NavController
-import androidx.navigation.compose.rememberNavController
-import androidx.window.core.layout.WindowSizeClass
-import androidx.window.layout.DisplayFeature
-import xyz.quaver.pupil.ui.viewmodel.SearchState
-
-@Composable
-fun MainApp(
-    uiState: SearchState,
-    displayFeatures: List<DisplayFeature>,
-    navController: NavController = rememberNavController(),
-    windowSizeClass: WindowSizeClass = currentWindowAdaptiveInfo().windowSizeClass,
-) {
-    Text("Hello, World!")
-}

app/src/main/java/xyz/quaver/pupil/ui/dialog/DefaultQueryDialog.kt

@@ -1,171 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.ui.dialog
-
-import android.app.Dialog
-import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
-import android.widget.ArrayAdapter
-import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.DialogFragment
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.databinding.DefaultQueryDialogBinding
-import xyz.quaver.pupil.types.Tags
-import xyz.quaver.pupil.util.Preferences
-
-class DefaultQueryDialog : DialogFragment() {
-
-    private val languages: Map<String, String> by lazy {
-        requireContext().resources.getStringArray(R.array.languages).map {
-            it.split("|").let { split ->
-                Pair(split[0], split[1])
-            }
-        }.toMap()
-    }
-    private val reverseLanguages: Map<String, String> by lazy {
-        languages.entries.associate { (k, v) -> v to k }
-    }
-
-    private val excludeBL = "-male:yaoi"
-    private val excludeGuro = listOf("-female:guro", "-male:guro")
-    private val excludeLoli = listOf("-female:loli", "-male:shota")
-
-    var onPositiveButtonClickListener : ((Tags) -> (Unit))? = null
-
-    private var _binding: DefaultQueryDialogBinding? = null
-    private val binding get() = _binding!!
-
-    private fun initView() {
-        val tags = Tags.parse(
-            Preferences["default_query"]
-        )
-
-        with(binding.languageSelector) {
-            adapter =
-                ArrayAdapter(
-                    context,
-                    android.R.layout.simple_spinner_dropdown_item,
-                    arrayListOf(
-                        context.getString(R.string.default_query_dialog_language_selector_none)
-                    ).apply {
-                        addAll(languages.values)
-                    }
-                )
-            if (tags.any { it.area == "language" && !it.isNegative }) {
-                val tag = languages[tags.first { it.area == "language" }.tag]
-                if (tag != null) {
-                    setSelection(
-                        @Suppress("UNCHECKED_CAST")
-                        (adapter as ArrayAdapter<String>).getPosition(tag)
-                    )
-                    tags.removeByArea("language", false)
-                }
-            }
-        }
-
-        with(binding.BLCheckbox) {
-            isChecked = tags.contains(excludeBL)
-            if (tags.contains(excludeBL))
-                tags.remove(excludeBL)
-        }
-
-        with(binding.guroCheckbox) {
-            isChecked = excludeGuro.all { tags.contains(it) }
-            if (excludeGuro.all { tags.contains(it) })
-                excludeGuro.forEach {
-                    tags.remove(it)
-                }
-        }
-
-        with(binding.loliCheckbox) {
-            isChecked = excludeLoli.all { tags.contains(it) }
-            if (excludeLoli.all { tags.contains(it) })
-                excludeLoli.forEach {
-                    tags.remove(it)
-                }
-        }
-
-        with(binding.edittext) {
-            setText(tags.toString(), android.widget.TextView.BufferType.EDITABLE)
-            addTextChangedListener(object : TextWatcher {
-                override fun beforeTextChanged(
-                    s: CharSequence?,
-                    start: Int,
-                    count: Int,
-                    after: Int
-                ) {
-                }
-
-                override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-
-                override fun afterTextChanged(s: Editable?) {
-                    s ?: return
-
-                    if (s.any { it.isUpperCase() })
-                        s.replace(
-                            0,
-                            s.length,
-                            s.toString().lowercase()
-                        )
-                }
-            })
-        }
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        _binding = DefaultQueryDialogBinding.inflate(layoutInflater)
-
-        initView()
-
-        return AlertDialog.Builder(requireContext()).apply {
-            setTitle(R.string.default_query_dialog_title)
-            setView(binding.root)
-            setPositiveButton(android.R.string.ok) { _, _ ->
-                val newTags = Tags.parse(binding.edittext.text.toString())
-
-                with(binding.languageSelector) {
-                    if (selectedItemPosition != 0)
-                        newTags.add("language:${reverseLanguages[selectedItem]}")
-                }
-
-                if (binding.BLCheckbox.isChecked)
-                    newTags.add(excludeBL)
-
-                if (binding.guroCheckbox.isChecked)
-                    excludeGuro.forEach { tag ->
-                        newTags.add(tag)
-                    }
-
-                if (binding.loliCheckbox.isChecked)
-                    excludeLoli.forEach { tag ->
-                        newTags.add(tag)
-                    }
-
-                onPositiveButtonClickListener?.invoke(newTags)
-            }
-        }.create()
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        _binding = null
-    }
-
-}

app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadFolderNameDialogFragment.kt

@@ -1,85 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.ui.dialog
-
-import android.app.Dialog
-import android.os.Bundle
-import android.view.ViewGroup
-import androidx.core.widget.addTextChangedListener
-import androidx.fragment.app.DialogFragment
-import com.google.android.material.snackbar.Snackbar
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.databinding.DownloadFolderNameDialogBinding
-import xyz.quaver.pupil.util.Preferences
-import xyz.quaver.pupil.util.downloader.Cache
-import xyz.quaver.pupil.util.formatDownloadFolder
-import xyz.quaver.pupil.util.formatDownloadFolderTest
-import xyz.quaver.pupil.util.formatMap
-
-class DownloadFolderNameDialogFragment : DialogFragment() {
-
-    private var _binding: DownloadFolderNameDialogBinding? = null
-    private val binding get() = _binding!!
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        _binding = DownloadFolderNameDialogBinding.inflate(layoutInflater)
-
-        initView()
-
-        return Dialog(requireContext()).apply {
-            setContentView(binding.root)
-            window?.attributes?.width = ViewGroup.LayoutParams.MATCH_PARENT
-        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        _binding = null
-    }
-
-    private fun initView() {
-        val galleryID = Cache.instances.let { if (it.size == 0) 1199708 else it.keys.elementAt((0 until it.size).random()) }
-        CoroutineScope(Dispatchers.IO).launch {
-            val galleryBlock = Cache.getInstance(requireContext(), galleryID).getGalleryBlock()
-
-            binding.message.text = getString(R.string.settings_download_folder_name_message, formatMap.keys.toString(), galleryBlock?.formatDownloadFolder() ?: "")
-            binding.edittext.addTextChangedListener {
-                binding.message.text = requireContext().getString(R.string.settings_download_folder_name_message, formatMap.keys.toString(), galleryBlock?.formatDownloadFolderTest(it.toString()) ?: "")
-            }
-        }
-
-        binding.edittext.setText(Preferences["download_folder_name", "[-id-] -title-"])
-        binding.okButton.setOnClickListener {
-            val newValue = binding.edittext.text.toString()
-
-            if ((newValue as? String)?.contains("/") != false) {
-                Snackbar.make(binding.root, R.string.settings_invalid_download_folder_name, Snackbar.LENGTH_SHORT).show()
-                return@setOnClickListener
-            }
-
-            Preferences["download_folder_name"] = binding.edittext.text.toString()
-
-            dismiss()
-        }
-    }
-
-}

app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadLocationDialogFragment.kt

@@ -1,156 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.ui.dialog
-
-import android.app.Activity
-import android.app.Dialog
-import android.content.Intent
-import android.os.Bundle
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AlertDialog
-import androidx.core.content.ContextCompat
-import androidx.core.net.toUri
-import androidx.fragment.app.DialogFragment
-import com.google.android.material.snackbar.Snackbar
-import xyz.quaver.io.FileX
-import xyz.quaver.io.util.toFile
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.databinding.DownloadLocationDialogBinding
-import xyz.quaver.pupil.databinding.DownloadLocationItemBinding
-import xyz.quaver.pupil.util.Preferences
-import xyz.quaver.pupil.util.byteToString
-import xyz.quaver.pupil.util.downloader.DownloadManager
-import java.io.File
-
-class DownloadLocationDialogFragment : DialogFragment() {
-
-    private var _binding: DownloadLocationDialogBinding? = null
-    private val binding get() = _binding!!
-
-    private val entries = mutableMapOf<File?, DownloadLocationItemBinding>()
-
-    private val requestDownloadFolderLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == Activity.RESULT_OK) {
-            val context = context ?: return@registerForActivityResult
-            val dialog = dialog ?: return@registerForActivityResult
-
-            it.data?.data?.also { uri ->
-                val takeFlags: Int = Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-
-                context.contentResolver.takePersistableUriPermission(uri, takeFlags)
-
-                if (kotlin.runCatching { FileX(context, uri).canWrite() }.getOrDefault(false)) {
-                    entries[null]?.locationAvailable?.text = uri.toFile(context)?.canonicalPath
-                    Preferences["download_folder"] = uri.toString()
-                } else {
-                    Snackbar.make(
-                        dialog.window!!.decorView.rootView,
-                        R.string.settings_download_folder_not_writable,
-                        Snackbar.LENGTH_LONG
-                    ).show()
-
-                    val downloadFolder = DownloadManager.getInstance(context).downloadFolder.canonicalPath
-                    val key = entries.keys.firstOrNull { it?.canonicalPath == downloadFolder }
-                    entries[key]!!.button.isChecked = true
-                    if (key == null) entries[key]!!.locationAvailable.text = downloadFolder
-                }
-            }
-        } else {
-            val downloadFolder = DownloadManager.getInstance(context ?: return@registerForActivityResult).downloadFolder.canonicalPath
-            val key = entries.keys.firstOrNull { it?.canonicalPath == downloadFolder }
-            if (key == null)
-                entries[key]!!.locationAvailable.text = downloadFolder
-            else {
-                entries[null]!!.button.isChecked = false
-                entries[key]!!.button.isChecked = true
-            }
-        }
-    }
-
-    private fun initView() {
-        val externalFilesDirs = ContextCompat.getExternalFilesDirs(requireContext(), null)
-
-        externalFilesDirs.forEachIndexed { index, dir ->
-            dir ?: return@forEachIndexed
-
-            DownloadLocationItemBinding.inflate(layoutInflater, binding.root, true).apply {
-                locationType.text = requireContext().getString(when (index) {
-                    0 -> R.string.settings_download_folder_internal
-                    else -> R.string.settings_download_folder_removable
-                })
-                locationAvailable.text = requireContext().getString(
-                    R.string.settings_download_folder_available,
-                    byteToString(dir.freeSpace)
-                )
-                root.setOnClickListener {
-                    entries.values.forEach { entry ->
-                        entry.button.isChecked = false
-                    }
-                    button.performClick()
-                    Preferences["download_folder"] = dir.toUri().toString()
-                }
-                entries[dir] = this
-            }
-        }
-
-        DownloadLocationItemBinding.inflate(layoutInflater, binding.root, true).apply {
-            locationType.text = requireContext().getString(R.string.settings_download_folder_custom)
-            root.setOnClickListener {
-                entries.values.forEach { entry ->
-                    entry.button.isChecked = false
-                }
-                button.performClick()
-
-                val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
-                    putExtra("android.content.extra.SHOW_ADVANCED", true)
-                }
-
-                requestDownloadFolderLauncher.launch(intent)
-            }
-            entries[null] = this
-        }
-
-        val downloadFolder = DownloadManager.getInstance(requireContext()).downloadFolder.canonicalPath
-        val key = entries.keys.firstOrNull { it?.canonicalPath == downloadFolder }
-        entries[key]!!.button.isChecked = true
-        if (key == null) entries[key]!!.locationAvailable.text = downloadFolder
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        _binding = DownloadLocationDialogBinding.inflate(layoutInflater)
-
-        initView()
-
-        return AlertDialog.Builder(requireContext()).apply {
-            setTitle(R.string.settings_download_folder)
-            setView(binding.root)
-            setPositiveButton(requireContext().getText(android.R.string.ok)) { _, _ ->
-                if (Preferences["download_folder", ""].isEmpty())
-                    Preferences["download_folder"] = context.getExternalFilesDir(null)?.toUri()?.toString() ?: ""
-            }
-
-            isCancelable = false
-        }.create()
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        _binding = null
-    }
-}

app/src/main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt

@@ -1,255 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.ui.dialog
-
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import android.view.View
-import android.view.ViewGroup
-import android.widget.LinearLayout.LayoutParams
-import androidx.appcompat.app.AlertDialog
-import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import androidx.viewpager2.widget.ViewPager2
-import com.google.android.material.snackbar.Snackbar
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import xyz.quaver.pupil.hitomi.Gallery
-import xyz.quaver.pupil.hitomi.getGallery
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.adapters.GalleryBlockAdapter
-import xyz.quaver.pupil.adapters.ThumbnailPageAdapter
-import xyz.quaver.pupil.databinding.*
-import xyz.quaver.pupil.favoriteTags
-import xyz.quaver.pupil.types.Tag
-import xyz.quaver.pupil.ui.ReaderActivity
-import xyz.quaver.pupil.ui.view.TagChip
-import xyz.quaver.pupil.util.ItemClickSupport
-import xyz.quaver.pupil.util.downloader.Cache
-import xyz.quaver.pupil.util.wordCapitalize
-import java.util.*
-import kotlin.collections.ArrayList
-
-class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(context) {
-
-    val onChipClickedHandler = ArrayList<((Tag) -> (Unit))>()
-
-    private lateinit var binding: GalleryDialogBinding
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = GalleryDialogBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        window?.attributes.apply {
-            this ?: return@apply
-
-            width = LayoutParams.MATCH_PARENT
-            height = LayoutParams.MATCH_PARENT
-        }
-
-        with(binding.fab) {
-            setImageDrawable(ContextCompat.getDrawable(context, R.drawable.arrow_right))
-            setOnClickListener {
-                context.startActivity(Intent(context, ReaderActivity::class.java).apply {
-                    putExtra("galleryID", galleryID)
-                })
-            }
-        }
-
-        CoroutineScope(Dispatchers.IO).launch {
-            try {
-                val gallery = getGallery(galleryID)
-
-                launch (Dispatchers.Main) {
-                    binding.progressbar.visibility = View.GONE
-                    binding.title.text = gallery.title
-                    binding.artist.text = gallery.artists.joinToString(", ") { it.wordCapitalize() }
-
-                    with(binding.type) {
-                        text = gallery.type.wordCapitalize()
-                        setOnClickListener {
-                            gallery.type.let {
-                                when (it) {
-                                    "artist CG" -> "artistcg"
-                                    "game CG" -> "gamecg"
-                                    else -> it
-                                }
-                            }.let {
-                                onChipClickedHandler.forEach { handler ->
-                                    handler.invoke(Tag("type", it))
-                                }
-                            }
-                        }
-                    }
-
-                    binding.cover.showImage(Uri.parse(gallery.cover))
-
-                    addDetails(gallery)
-                    addThumbnails(gallery)
-                    addRelated(gallery)
-                }
-            } catch (e: Exception) {
-                Snackbar.make(binding.root, R.string.unable_to_connect, Snackbar.LENGTH_INDEFINITE).apply {
-                    if (Locale.getDefault().language == "ko")
-                        setAction(context.getText(R.string.https_text)) {
-                            context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.https))))
-                        }
-                }.show()
-            }
-        }
-    }
-
-    private fun addDetails(gallery: Gallery) {
-        GalleryDialogDetailsBinding.inflate(layoutInflater, binding.contents, true).apply {
-            type.setText(R.string.gallery_details)
-
-            listOf(
-                R.string.gallery_artists,
-                R.string.gallery_groups,
-                R.string.gallery_language,
-                R.string.gallery_series,
-                R.string.gallery_characters,
-                R.string.gallery_tags
-            ).zip(
-                listOf(
-                    gallery.artists.map { Tag("artist", it) },
-                    gallery.groups.map { Tag("group", it) },
-                    listOf(gallery.language).map { Tag("language", it) },
-                    gallery.series.map { Tag("series", it) },
-                    gallery.characters.map { Tag("character", it) },
-                    gallery.tags.sortedBy {
-                        val tag = Tag.parse(it)
-
-                        if (favoriteTags.contains(tag))
-                            -1
-                        else
-                            when(Tag.parse(it).area) {
-                                "female" -> 0
-                                "male" -> 1
-                                else -> 2
-                            }
-                    }.map {
-                        Tag.parse(it).let { tag ->
-                            when {
-                                tag.area != null -> tag
-                                else -> Tag("tag", it)
-                            }
-                        }
-                    }
-                )
-            ).filter {
-                    (_, content) -> content.isNotEmpty()
-            }.forEach { (title, content) ->
-                GalleryDialogTagsBinding.inflate(layoutInflater, contents, true).apply {
-                    type.setText(title)
-
-                    content.forEach { tag ->
-                        tags.addView(
-                            TagChip(context, tag).apply {
-                                setOnClickListener {
-                                    onChipClickedHandler.forEach { handler ->
-                                        handler.invoke(tag)
-                                    }
-                                }
-                            }
-                        )
-                    }
-                }
-            }
-        }
-    }
-
-    private fun addThumbnails(gallery: Gallery) {
-        GalleryDialogDetailsBinding.inflate(layoutInflater, binding.contents, true).apply {
-            type.setText(R.string.gallery_thumbnails)
-
-            val pager = ViewPager2(context).apply {
-                adapter = ThumbnailPageAdapter(gallery.thumbnails)
-                layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
-            }
-
-            contents.addView(
-                pager,
-                LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
-            )
-
-            // TODO: Change to direct allocation
-            GalleryDialogDotindicatorBinding.inflate(layoutInflater, contents, true).apply {
-                dotindicator.setViewPager2(pager)
-            }
-        }
-    }
-
-    private fun addRelated(gallery: Gallery) {
-        val galleries = mutableListOf<Int>()
-
-        val adapter = GalleryBlockAdapter(galleries).apply {
-            onChipClickedHandler.add { tag ->
-                this@GalleryDialog.onChipClickedHandler.forEach { handler ->
-                    handler.invoke(tag)
-                }
-            }
-        }
-
-        GalleryDialogDetailsBinding.inflate(layoutInflater, binding.contents, true).apply {
-            type.setText(R.string.gallery_related)
-
-            contents.addView(RecyclerView(context).apply {
-                layoutManager = LinearLayoutManager(context)
-                this.adapter = adapter
-
-                ItemClickSupport.addTo(this).apply {
-                    onItemClickListener = { _, position, _ ->
-                        context.startActivity(Intent(context, ReaderActivity::class.java).apply {
-                            putExtra("galleryID", galleries[position])
-                        })
-                    }
-                    onItemLongClickListener = { _, position, _ ->
-                        GalleryDialog(context, galleries[position]).apply {
-                            onChipClickedHandler.add { tag ->
-                                this@GalleryDialog.onChipClickedHandler.forEach { it.invoke(tag) }
-                            }
-                        }.show()
-
-                        true
-                    }
-                }
-            })
-
-            CoroutineScope(Dispatchers.IO).launch {
-                gallery.related.forEach { galleryID ->
-                    Cache.getInstance(context, galleryID).getGalleryBlock()?.let {
-                        galleries.add(galleryID)
-                    }
-                }
-
-                withContext(Dispatchers.Main) {
-                    adapter.notifyDataSetChanged()
-                }
-            }
-        }
-    }
-
-}

app/src/main/java/xyz/quaver/pupil/ui/dialog/ProxyDialogFragment.kt

@@ -1,133 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.ui.dialog
-
-import android.app.Dialog
-import android.content.Context
-import android.os.Bundle
-import android.view.View
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.DialogFragment
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.client
-import xyz.quaver.pupil.clientBuilder
-import xyz.quaver.pupil.clientHolder
-import xyz.quaver.pupil.databinding.ProxyDialogBinding
-import xyz.quaver.pupil.util.Preferences
-import xyz.quaver.pupil.util.ProxyInfo
-import xyz.quaver.pupil.util.getProxyInfo
-import xyz.quaver.pupil.util.proxyInfo
-import java.net.Proxy
-
-class ProxyDialogFragment : DialogFragment() {
-
-    private var _binding: ProxyDialogBinding? = null
-    private val binding get() = _binding!!
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        _binding = ProxyDialogBinding.inflate(layoutInflater)
-
-        initView()
-
-        return AlertDialog.Builder(requireContext()).apply {
-            setView(binding.root)
-        }.create()
-    }
-
-    private fun initView() {
-        val proxyInfo = getProxyInfo()
-
-        val enabler = { enable: Boolean ->
-            binding.addr.isEnabled = enable
-            binding.port.isEnabled = enable
-            binding.username.isEnabled = enable
-            binding.password.isEnabled = enable
-
-            if (!enable) {
-                binding.addr.text = null
-                binding.port.text = null
-                binding.username.text = null
-                binding.password.text = null
-            }
-        }
-
-        with(binding.typeSelector) {
-            adapter = ArrayAdapter(
-                context,
-                android.R.layout.simple_spinner_dropdown_item,
-                context.resources.getStringArray(R.array.proxy_type)
-            )
-
-            setSelection(proxyInfo.type.ordinal)
-
-            onItemSelectedListener = object: AdapterView.OnItemSelectedListener {
-                override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                    enabler.invoke(position != 0)
-                }
-
-                override fun onNothingSelected(parent: AdapterView<*>?) {}
-            }
-        }
-
-        binding.addr.setText(proxyInfo.host)
-        binding.port.setText(proxyInfo.port?.toString())
-        binding.username.setText(proxyInfo.username)
-        binding.password.setText(proxyInfo.password)
-
-        enabler.invoke(proxyInfo.type != Proxy.Type.DIRECT)
-
-        binding.cancelButton.setOnClickListener {
-            dismiss()
-        }
-
-        binding.okButton.setOnClickListener {
-            val type = Proxy.Type.values()[binding.typeSelector.selectedItemPosition]
-            val addr = binding.addr.text?.toString()
-            val port = binding.port.text?.toString()?.toIntOrNull()
-            val username = binding.username.text?.toString()
-            val password = binding.password.text?.toString()
-
-            if (type != Proxy.Type.DIRECT) {
-                if (addr == null || addr.isEmpty())
-                    binding.addr.error = requireContext().getText(R.string.proxy_dialog_error)
-                if (port == null)
-                    binding.port.error = requireContext().getText(R.string.proxy_dialog_error)
-
-                if (addr == null || addr.isEmpty() || port == null)
-                    return@setOnClickListener
-            }
-
-            ProxyInfo(type, addr, port, username, password).let {
-                Preferences["proxy"] = Json.encodeToString(it)
-
-                clientBuilder
-                    .proxyInfo(it)
-                clientHolder = null
-                client
-            }
-
-            dismiss()
-        }
-    }
-
-}

app/src/main/java/xyz/quaver/pupil/ui/fragment/LockSettingsFragment.kt

@@ -1,146 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.ui.fragment
-
-import android.content.Intent
-import android.os.Bundle
-import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
-import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.SwitchPreferenceCompat
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.ui.LockActivity
-import xyz.quaver.pupil.util.Lock
-import xyz.quaver.pupil.util.LockManager
-import xyz.quaver.pupil.util.Preferences
-
-class LockSettingsFragment : PreferenceFragmentCompat() {
-
-    override fun onResume() {
-        super.onResume()
-
-        val lockManager = LockManager(requireContext())
-
-        findPreference<Preference>("lock_pattern")?.summary =
-            if (lockManager.contains(Lock.Type.PATTERN))
-                getString(R.string.settings_lock_enabled)
-            else
-                ""
-
-        findPreference<Preference>("lock_pin")?.summary =
-            if (lockManager.contains(Lock.Type.PIN))
-                getString(R.string.settings_lock_enabled)
-            else
-                ""
-
-        if (lockManager.isEmpty()) {
-            (findPreference<Preference>("lock_fingerprint") as SwitchPreferenceCompat).isChecked = false
-
-            Preferences["lock_fingerprint"] = false
-        }
-    }
-
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.lock_preferences, rootKey)
-
-        with(findPreference<Preference>("lock_pattern")) {
-            this!!
-
-            if (LockManager(requireContext()).contains(Lock.Type.PATTERN))
-                summary = getString(R.string.settings_lock_enabled)
-
-            onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                val lockManager = LockManager(requireContext())
-
-                if (lockManager.contains(Lock.Type.PATTERN)) {
-                    AlertDialog.Builder(requireContext()).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_lock_remove_message)
-
-                        setPositiveButton(android.R.string.ok) { _, _ ->
-                            lockManager.remove(Lock.Type.PATTERN)
-                            onResume()
-                        }
-                        setNegativeButton(android.R.string.cancel) { _, _ -> }
-                    }.show()
-                } else {
-                    val intent = Intent(requireContext(), LockActivity::class.java).apply {
-                        putExtra("mode", "add_lock")
-                        putExtra("type", "pattern")
-                    }
-
-                    startActivity(intent)
-                }
-
-                true
-            }
-        }
-
-        with(findPreference<Preference>("lock_pin")) {
-            this!!
-
-            if (LockManager(requireContext()).contains(Lock.Type.PIN))
-                summary = getString(R.string.settings_lock_enabled)
-
-            onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                val lockManager = LockManager(requireContext())
-
-                if (lockManager.contains(Lock.Type.PIN)) {
-                    AlertDialog.Builder(requireContext()).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_lock_remove_message)
-
-                        setPositiveButton(android.R.string.ok) { _, _ ->
-                            lockManager.remove(Lock.Type.PIN)
-                            onResume()
-                        }
-                        setNegativeButton(android.R.string.cancel) { _, _ -> }
-                    }.show()
-                } else {
-                    val intent = Intent(requireContext(), LockActivity::class.java).apply {
-                        putExtra("mode", "add_lock")
-                        putExtra("type", "pin")
-                    }
-
-                    startActivity(intent)
-                }
-
-                true
-            }
-        }
-
-        with(findPreference<Preference>("lock_fingerprint")) {
-            this!!
-
-            setOnPreferenceChangeListener { _, newValue ->
-                this as SwitchPreferenceCompat
-
-                if (newValue == true && LockManager(requireContext()).isEmpty()) {
-                    isChecked = false
-
-                    Toast.makeText(requireContext(), R.string.settings_lock_fingerprint_without_lock, Toast.LENGTH_SHORT).show()
-                } else
-                    isChecked = newValue as Boolean
-
-                false
-            }
-        }
-    }
-}

app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageFavoritesFragment.kt

@@ -1,140 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.ui.fragment
-
-import android.app.Activity
-import android.content.Intent
-import android.content.res.Resources
-import android.graphics.PorterDuff
-import android.graphics.PorterDuffColorFilter
-import android.os.Bundle
-import android.util.Log
-import android.widget.EditText
-import android.widget.TextView
-import android.widget.Toast
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AlertDialog
-import androidx.core.content.ContextCompat
-import androidx.core.content.FileProvider
-import androidx.core.graphics.drawable.DrawableCompat
-import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
-import androidx.swiperefreshlayout.widget.CircularProgressDrawable
-import com.google.android.material.snackbar.Snackbar
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.launch
-import kotlinx.datetime.LocalDate
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.buildJsonObject
-import kotlinx.serialization.json.decodeFromJsonElement
-import okhttp3.*
-import xyz.quaver.io.FileX
-import xyz.quaver.io.util.readText
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.client
-import xyz.quaver.pupil.favoriteTags
-import xyz.quaver.pupil.favorites
-import xyz.quaver.pupil.types.Tag
-import xyz.quaver.pupil.util.get
-import xyz.quaver.pupil.util.restore
-import java.io.File
-import java.io.IOException
-import kotlin.math.roundToInt
-
-class ManageFavoritesFragment : PreferenceFragmentCompat() {
-
-    private val requestBackupFileLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-        if (result.resultCode != Activity.RESULT_OK) {
-            return@registerForActivityResult
-        }
-
-        val uri = result.data?.data ?: return@registerForActivityResult
-        val context = context ?: return@registerForActivityResult
-        val view = view ?: return@registerForActivityResult
-
-        val backupData = runCatching {
-            FileX(context, uri).readText()?.let { Json.parseToJsonElement(it) }
-        }.getOrNull() ?: run{
-            Snackbar.make(view, context.getString(R.string.error), Toast.LENGTH_LONG).show()
-            return@registerForActivityResult
-        }
-
-        val newFavorites = backupData["favorites"]?.let { Json.decodeFromJsonElement<List<Int>>(it) }.orEmpty()
-        val newFavoriteTags = backupData["favorite_tags"]?.let { Json.decodeFromJsonElement<List<Tag>>(it) }.orEmpty()
-
-        favorites.addAll(newFavorites)
-        favoriteTags.addAll(newFavoriteTags)
-
-        Snackbar.make(view, context.getString(R.string.settings_restore_success, newFavorites.size + newFavoriteTags.size), Snackbar.LENGTH_LONG).show()
-    }
-
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.manage_favorites_preferences, rootKey)
-
-        initPreferences()
-    }
-
-    private fun initPreferences() {
-        val context = context ?: return
-
-        findPreference<Preference>("backup")?.setOnPreferenceClickListener {
-            val favorites = runCatching {
-                Json.parseToJsonElement(File(ContextCompat.getDataDir(context), "favorites.json").readText())
-            }.getOrNull()
-            val favoriteTags = kotlin.runCatching {
-                Json.parseToJsonElement(File(ContextCompat.getDataDir(context), "favorites_tags.json").readText())
-            }.getOrNull()
-
-            val favoriteJson = buildJsonObject {
-                favorites?.let {
-                    put("favorites", it)
-                }
-                favoriteTags?.let {
-                    put("favorite_tags", it)
-                }
-            }
-
-            val backupFile = File(context.filesDir, "pupil-backup.json").also {
-                it.writeText(favoriteJson.toString())
-            }
-
-            Intent(Intent.ACTION_SEND).apply {
-                val uri = FileProvider.getUriForFile(context, "${context.packageName}.provider", backupFile)
-                setDataAndType(uri, "application/json")
-                addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                putExtra(Intent.EXTRA_STREAM, uri)
-            }.let {
-                context.startActivity(Intent.createChooser(it, getString(R.string.settings_backup_share)))
-            }
-
-            true
-        }
-        findPreference<Preference>("restore")?.setOnPreferenceClickListener {
-            val intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
-                addCategory(Intent.CATEGORY_OPENABLE)
-                type = "*/*"
-            }
-
-            requestBackupFileLauncher.launch(intent)
-
-            true
-        }
-    }
-
-}

app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageStorageFragment.kt

@@ -1,263 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.ui.fragment
-
-import android.graphics.ColorFilter
-import android.graphics.PorterDuff
-import android.graphics.PorterDuffColorFilter
-import android.os.Bundle
-import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
-import androidx.core.content.ContextCompat
-import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
-import androidx.swiperefreshlayout.widget.CircularProgressDrawable
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-import xyz.quaver.io.FileX
-import xyz.quaver.io.SAFileX
-import xyz.quaver.io.util.deleteRecursively
-import xyz.quaver.io.util.getChild
-import xyz.quaver.io.util.readText
-import xyz.quaver.io.util.writeText
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.histories
-import xyz.quaver.pupil.hitomi.json
-import xyz.quaver.pupil.util.byteToString
-import xyz.quaver.pupil.util.downloader.Cache
-import xyz.quaver.pupil.util.downloader.DownloadManager
-import xyz.quaver.pupil.util.downloader.Metadata
-import java.io.File
-import kotlin.math.roundToInt
-
-class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenceClickListener {
-
-    private var job: Job? = null
-
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.manage_storage_preferences, rootKey)
-
-        initPreferences()
-    }
-
-    override fun onPreferenceClick(preference: Preference): Boolean {
-        val context = context ?: return false
-
-        with(preference) {
-            when (key) {
-                "delete_cache" -> {
-                    val dir = File(context.cacheDir, "imageCache")
-
-                    AlertDialog.Builder(context).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_clear_cache_alert_message)
-                        setPositiveButton(android.R.string.ok) { _, _ ->
-                            if (dir.exists())
-                                dir.deleteRecursively()
-
-                            Cache.instances.clear()
-
-                            summary = context.getString(R.string.settings_storage_usage, byteToString(0))
-                            CoroutineScope(Dispatchers.IO).launch {
-                                var size = 0L
-
-                                dir.walk().forEach {
-                                    size += it.length()
-
-                                    launch(Dispatchers.Main) {
-                                        summary = context.getString(R.string.settings_storage_usage, byteToString(size))
-                                    }
-                                }
-                            }
-                        }
-                        setNegativeButton(android.R.string.cancel) { _, _ -> }
-                    }.show()
-                }
-                "recover_downloads" -> {
-                    val density = context.resources.displayMetrics.density
-                    this.icon = object: CircularProgressDrawable(context) {
-                        override fun getIntrinsicHeight() = (24*density).roundToInt()
-                        override fun getIntrinsicWidth() = (24*density).roundToInt()
-                    }.apply {
-                        setStyle(CircularProgressDrawable.DEFAULT)
-                        colorFilter = PorterDuffColorFilter(ContextCompat.getColor(context, R.color.colorAccent), PorterDuff.Mode.SRC_IN)
-                        start()
-                    }
-
-                    val downloadManager = DownloadManager.getInstance(context)
-
-                    val downloadFolderMap = downloadManager.downloadFolderMap
-
-                    downloadFolderMap.clear()
-
-                    downloadManager.downloadFolder.listFiles { file -> file.isDirectory }?.forEach { folder ->
-                        val metadataFile = FileX(context, folder, ".metadata")
-
-                        if (!metadataFile.exists()) return@forEach
-
-                        val metadata = metadataFile.readText()?.let {
-                            runCatching {
-                                json.decodeFromString<Metadata>(it)
-                            }.getOrNull()
-                        } ?: return@forEach
-
-                        val galleryID = metadata.galleryBlock?.id ?: metadata.galleryInfo?.id?.toIntOrNull() ?: return@forEach
-
-                        downloadFolderMap[galleryID] = folder.name
-                    }
-
-                    downloadManager.downloadFolderMap.putAll(downloadFolderMap)
-                    val downloads = FileX(context, downloadManager.downloadFolder, ".download")
-
-                    if (!downloads.exists()) downloads.createNewFile()
-                    downloads.writeText(Json.encodeToString(downloadFolderMap))
-
-                    this.icon = null
-                    Toast.makeText(context, android.R.string.ok, Toast.LENGTH_SHORT).show()
-                }
-                "delete_downloads" -> {
-                    val dir = DownloadManager.getInstance(context).downloadFolder
-
-                    AlertDialog.Builder(context).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_clear_downloads_alert_message)
-                        setPositiveButton(android.R.string.ok) { _, _ ->
-                            CoroutineScope(Dispatchers.IO).launch {
-                                job?.cancel()
-                                launch(Dispatchers.Main) {
-                                    summary = context.getString(R.string.settings_storage_usage_loading)
-                                }
-
-                                if (dir.exists())
-                                    dir.listFiles()?.forEach {
-                                        when (it) {
-                                            is FileX -> it.deleteRecursively()
-                                            else -> it.deleteRecursively()
-                                        }
-                                    }
-
-                                job = launch {
-                                    var size = 0L
-
-                                    launch(Dispatchers.Main) {
-                                        summary = context.getString(R.string.settings_storage_usage, byteToString(size))
-                                    }
-                                    dir.walk().forEach {
-                                        size += it.length()
-
-                                        launch(Dispatchers.Main) {
-                                            summary = context.getString(R.string.settings_storage_usage, byteToString(size))
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        setNegativeButton(android.R.string.cancel) { _, _ -> }
-                    }.show()
-                }
-                "clear_history" -> {
-                    AlertDialog.Builder(context).apply {
-                        setTitle(R.string.warning)
-                        setMessage(R.string.settings_clear_history_alert_message)
-                        setPositiveButton(android.R.string.ok) { _, _ ->
-                            histories.clear()
-                            summary = context.getString(R.string.settings_clear_history_summary, histories.size)
-                        }
-                        setNegativeButton(android.R.string.cancel) { _, _ -> }
-                    }.show()
-                }
-                else -> return false
-            }
-        }
-
-        return true
-    }
-
-    private fun initPreferences() {
-        val context = context ?: return
-
-        with(findPreference<Preference>("delete_cache")) {
-            this ?: return@with
-
-            val dir = File(context.cacheDir, "imageCache")
-
-            summary = context.getString(R.string.settings_storage_usage, byteToString(0))
-            CoroutineScope(Dispatchers.IO).launch {
-                var size = 0L
-
-                dir.walk().forEach {
-                    size += it.length()
-
-                    launch(Dispatchers.Main) {
-                        summary = context.getString(R.string.settings_storage_usage, byteToString(size))
-                    }
-                }
-            }
-
-            onPreferenceClickListener = this@ManageStorageFragment
-        }
-
-        with(findPreference<Preference>("delete_downloads")) {
-            this ?: return@with
-
-            val dir = DownloadManager.getInstance(context).downloadFolder
-
-            summary = context.getString(R.string.settings_storage_usage, byteToString(0))
-            job?.cancel()
-            job = CoroutineScope(Dispatchers.IO).launch {
-                var size = 0L
-
-                dir.walk().forEach {
-                    launch(Dispatchers.Main) {
-                        summary = context.getString(R.string.settings_storage_usage, byteToString(size))
-                    }
-
-                    size += it.length()
-                }
-            }
-
-            onPreferenceClickListener = this@ManageStorageFragment
-        }
-
-        with(findPreference<Preference>("clear_history")) {
-            this ?: return@with
-
-            summary = context.getString(R.string.settings_clear_history_summary, histories.size)
-
-            onPreferenceClickListener = this@ManageStorageFragment
-        }
-
-        with(findPreference<Preference>("recover_downloads")) {
-            this ?: return@with
-
-            onPreferenceClickListener = this@ManageStorageFragment
-        }
-    }
-
-    override fun onDestroy() {
-        job?.cancel()
-        super.onDestroy()
-    }
-
-}

app/src/main/java/xyz/quaver/pupil/ui/fragment/PINLockFragment.kt

@@ -1,57 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.ui.fragment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import com.andrognito.pinlockview.PinLockListener
-import xyz.quaver.pupil.databinding.PinLockFragmentBinding
-
-class PINLockFragment : Fragment() {
-
-    private var _binding: PinLockFragmentBinding? = null
-    val binding get() = _binding!!
-
-    var onPINEntered: ((String) -> Unit)? = null
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        _binding = PinLockFragmentBinding.inflate(inflater, container, false)
-
-        binding.pinLockView.attachIndicatorDots(binding.indicatorDots)
-        binding.pinLockView.setPinLockListener(object: PinLockListener {
-            override fun onComplete(p0: String?) {
-                onPINEntered?.invoke(p0 ?: "")
-            }
-
-            override fun onEmpty() {}
-            override fun onPinChange(p0: Int, p1: String?) {}
-        })
-
-        return binding.root
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        _binding = null
-    }
-
-}

app/src/main/java/xyz/quaver/pupil/ui/fragment/PatternLockFragment.kt

@@ -1,61 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.ui.fragment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import com.andrognito.patternlockview.PatternLockView
-import com.andrognito.patternlockview.listener.PatternLockViewListener
-import com.andrognito.patternlockview.utils.PatternLockUtils
-import xyz.quaver.pupil.databinding.PatternLockFragmentBinding
-
-class PatternLockFragment : Fragment() {
-
-    private var _binding: PatternLockFragmentBinding? = null
-    val binding get() = _binding!!
-
-    var onPatternDrawn: ((String) -> Unit)? = null
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = PatternLockFragmentBinding.inflate(inflater, container, false)
-        binding.patternLockView.addPatternLockListener(object: PatternLockViewListener {
-            override fun onComplete(pattern: MutableList<PatternLockView.Dot>?) {
-                val password = PatternLockUtils.patternToMD5(binding.patternLockView, pattern)
-                onPatternDrawn?.invoke(password)
-            }
-
-            override fun onCleared() {}
-            override fun onProgress(progressPattern: MutableList<PatternLockView.Dot>?) {}
-            override fun onStarted() {}
-        })
-        return binding.root
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        _binding = null
-    }
-
-}

app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt

@@ -1,318 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.ui.fragment
-
-import android.app.Activity
-import android.content.*
-import android.os.Bundle
-import android.util.Log
-import android.widget.Toast
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.preference.*
-import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import com.google.firebase.crashlytics.internal.model.CrashlyticsReport
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import okhttp3.Dispatcher
-import xyz.quaver.io.FileX
-import xyz.quaver.io.util.getChild
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.client
-import xyz.quaver.pupil.clientBuilder
-import xyz.quaver.pupil.clientHolder
-import xyz.quaver.pupil.types.SendLogException
-import xyz.quaver.pupil.ui.LockActivity
-import xyz.quaver.pupil.ui.SettingsActivity
-import xyz.quaver.pupil.ui.TransferActivity
-import xyz.quaver.pupil.ui.dialog.*
-import xyz.quaver.pupil.util.*
-import xyz.quaver.pupil.util.downloader.DownloadManager
-import java.util.*
-import java.util.concurrent.Executors
-
-class SettingsFragment :
-    PreferenceFragmentCompat(),
-    Preference.OnPreferenceClickListener,
-    Preference.OnPreferenceChangeListener,
-    SharedPreferences.OnSharedPreferenceChangeListener {
-
-    private val lockLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == Activity.RESULT_OK) {
-            parentFragmentManager
-                .beginTransaction()
-                .replace(R.id.settings, LockSettingsFragment())
-                .addToBackStack("Lock")
-                .commitAllowingStateLoss()
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        val lockManager = LockManager(requireContext())
-
-        findPreference<Preference>("app_lock")?.summary = if (lockManager.locks.isNullOrEmpty()) {
-            getString(R.string.settings_lock_none)
-        } else {
-            lockManager.locks?.joinToString(", ") {
-                when(it.type) {
-                    Lock.Type.PATTERN -> getString(R.string.settings_lock_pattern)
-                    Lock.Type.PIN -> getString(R.string.settings_lock_pin)
-                    Lock.Type.PASSWORD -> getString(R.string.settings_lock_password)
-                }
-            }
-        }
-    }
-
-    override fun onPreferenceClick(preference: Preference): Boolean {
-        with (preference) {
-            when (key) {
-                "app_version" -> {
-                    checkUpdate(activity as SettingsActivity, true)
-                }
-                "download_folder" -> {
-                    DownloadLocationDialogFragment().show(parentFragmentManager, "Download Location Dialog")
-                }
-                "default_query" -> {
-                    DefaultQueryDialog().apply {
-                        onPositiveButtonClickListener = { newTags ->
-                            Preferences["default_query"] = newTags.toString()
-                            summary = newTags.toString()
-                        }
-                    }.show(parentFragmentManager, "Default Query Dialog")
-                }
-                "app_lock" -> {
-                    val intent = Intent(requireContext(), LockActivity::class.java).apply {
-                        putExtra("force", true)
-                    }
-                    lockLauncher.launch(intent)
-                }
-                "proxy" -> {
-                    ProxyDialogFragment().show(parentFragmentManager, "Proxy Dialog")
-                }
-                "user_id" -> {
-                    FirebaseCrashlytics.getInstance().recordException(SendLogException())
-                    (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(
-                        ClipData.newPlainText("user_id", Preferences.get<String>("user_id"))
-                    )
-                    Toast.makeText(context, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
-                }
-                "transfer_data" -> {
-                    activity?.startActivity(Intent(activity, TransferActivity::class.java))
-                }
-                else -> return false
-            }
-        }
-
-        return true
-    }
-
-    override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
-        with (preference) {
-            when (key) {
-                "tag_translation" -> {
-                    updateTranslations()
-                }
-                "nomedia" -> {
-                    val create = (newValue as? Boolean) ?: return false
-
-                    return kotlin.runCatching {
-                        val nomedia = DownloadManager.getInstance(context).downloadFolder.getChild(".nomedia")
-
-                        if (create)
-                            nomedia.createNewFile()
-                        else
-                            nomedia.delete()
-                    }.getOrDefault(false)
-                }
-                "dark_mode" -> {
-                    AppCompatDelegate.setDefaultNightMode(when (newValue as Boolean) {
-                        true -> AppCompatDelegate.MODE_NIGHT_YES
-                        false -> AppCompatDelegate.MODE_NIGHT_NO
-                    })
-                }
-                else -> return false
-            }
-        }
-
-        return true
-    }
-
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
-        key ?: return
-
-        with(findPreference<Preference>(key)) {
-            this ?: return
-
-            when (key) {
-                "proxy" -> {
-                    summary = context.let { getProxyInfo().type.name }
-                }
-                "download_folder" -> {
-                    summary = FileX(context, Preferences.get<String>("download_folder")).canonicalPath
-                }
-                "download_folder_name" -> {
-                    summary = Preferences["download_folder_name", "[-id-] -title-"]
-                }
-                "max_concurrent_download" -> {
-                    val newValue = Preferences.get<String>(key).toIntOrNull() ?: 0
-
-                    if (newValue == 0)
-                        clientBuilder.dispatcher(Dispatcher())
-                    else
-                        clientBuilder.dispatcher((Dispatcher(Executors.newFixedThreadPool(newValue))))
-
-                    clientHolder = null
-                    client
-                }
-                else -> return
-            }
-        }
-    }
-
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.root_preferences, rootKey)
-
-        Preferences.registerOnSharedPreferenceChangeListener(this)
-
-        initPreferences()
-    }
-
-    override fun onDestroy() {
-        Preferences.unregisterOnSharedPreferenceChangeListener(this)
-        super.onDestroy()
-    }
-
-    private fun initPreferences() {
-        for (i in 0 until preferenceScreen.preferenceCount) {
-
-            preferenceScreen.getPreference(i).run {
-                if (this is PreferenceCategory)
-                    (0 until preferenceCount).map { getPreference(it) }
-                else
-                    listOf(this)
-            }.forEach { preference ->
-                with (preference) with@{
-
-                    when (key) {
-                        "app_version" -> {
-                            val manager = requireContext().packageManager
-                            val info = manager.getPackageInfo(requireContext().packageName, 0)
-                            summary = requireContext().getString(R.string.settings_app_version_description, info.versionName)
-
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "download_folder_name" -> {
-                            summary = Preferences["download_folder_name", "[-id-] -title-"]
-
-                            setOnPreferenceClickListener {
-                                DownloadFolderNameDialogFragment().show(requireActivity().supportFragmentManager, "Download Location Dialog")
-
-                                true
-                            }
-                        }
-                        "download_folder" -> {
-                            summary = FileX(context, Preferences.get<String>("download_folder")).canonicalPath
-
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "nomedia" -> {
-                            (this as SwitchPreferenceCompat).isChecked = kotlin.runCatching {
-                                DownloadManager.getInstance(context).downloadFolder.getChild(".nomedia").exists()
-                            }.getOrDefault(false)
-
-                            onPreferenceChangeListener = this@SettingsFragment
-                        }
-                        "default_query" -> {
-                            summary = Preferences.get<String>("default_query")
-
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "app_lock" -> {
-                            val lockManager = LockManager(requireContext())
-                            summary =
-                                if (lockManager.locks.isNullOrEmpty()) {
-                                    getString(R.string.settings_lock_none)
-                                } else {
-                                    lockManager.locks?.joinToString(", ") {
-                                        when (it.type) {
-                                            Lock.Type.PATTERN -> getString(R.string.settings_lock_pattern)
-                                            Lock.Type.PIN -> getString(R.string.settings_lock_pin)
-                                            Lock.Type.PASSWORD -> getString(R.string.settings_lock_password)
-                                        }
-                                    }
-                                }
-
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "proxy" -> {
-                            summary = getProxyInfo().type.name
-
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "tag_translation" -> {
-                            this as ListPreference
-
-                            isEnabled = false
-
-                            CoroutineScope(Dispatchers.IO).launch {
-                                kotlin.runCatching {
-                                    val languages = getAvailableLanguages().distinct().toTypedArray()
-
-                                    entries = languages.map { Locale(it).let { loc -> loc.getDisplayLanguage(loc) } }.toTypedArray()
-                                    entryValues = languages
-
-                                    launch(Dispatchers.Main) {
-                                        isEnabled = true
-                                    }
-                                }
-                            }
-
-                            onPreferenceChangeListener = this@SettingsFragment
-
-                        }
-                        "dark_mode" -> {
-                            onPreferenceChangeListener = this@SettingsFragment
-                        }
-                        "old_import_galleries" -> {
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "user_id" -> {
-                            summary = Preferences.get<String>("user_id")
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                        "oss" -> {
-                            setOnPreferenceClickListener {
-                                context.startActivity(Intent(context, OssLicensesMenuActivity::class.java))
-                                true
-                            }
-                        }
-                        "transfer_data" -> {
-                            onPreferenceClickListener = this@SettingsFragment
-                        }
-                    }
-
-                }
-            }
-        }
-    }
-}

app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferConnectedFragment.kt

@@ -1,10 +0,0 @@
-package xyz.quaver.pupil.ui.fragment
-
-import androidx.fragment.app.Fragment
-import xyz.quaver.pupil.R
-
-class TransferConnectedFragment: Fragment(R.layout.transfer_connected_fragment) {
-
-
-
-}

app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferDirectionFragment.kt

@@ -1,44 +0,0 @@
-package xyz.quaver.pupil.ui.fragment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.databinding.TransferDirectionFragmentBinding
-import xyz.quaver.pupil.ui.TransferStep
-import xyz.quaver.pupil.ui.TransferViewModel
-
-class TransferDirectionFragment : Fragment(R.layout.transfer_direction_fragment) {
-
-    private var _binding: TransferDirectionFragmentBinding? = null
-    private val binding get() = _binding!!
-
-    private val viewModel: TransferViewModel by activityViewModels()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = TransferDirectionFragmentBinding.inflate(inflater, container, false)
-
-        binding.inButton.setOnClickListener {
-            viewModel.setStep(TransferStep.TARGET)
-        }
-
-        binding.outButton.setOnClickListener {
-            viewModel.setStep(TransferStep.WAIT_FOR_CONNECTION)
-        }
-
-        return binding.root
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-}

app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferPermissionFragment.kt

@@ -1,38 +0,0 @@
-package xyz.quaver.pupil.ui.fragment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import xyz.quaver.pupil.databinding.TransferPermissionFragmentBinding
-import xyz.quaver.pupil.ui.TransferStep
-import xyz.quaver.pupil.ui.TransferViewModel
-
-class TransferPermissionFragment: Fragment() {
-
-    private var _binding: TransferPermissionFragmentBinding? = null
-    private val binding get() = _binding!!
-
-    private val viewModel: TransferViewModel by activityViewModels()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = TransferPermissionFragmentBinding.inflate(inflater, container, false)
-
-        binding.permissionsButton.setOnClickListener {
-            viewModel.setStep(TransferStep.TARGET_FORCE)
-        }
-
-        return binding.root
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}

app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferSelectDataFragment.kt

@@ -1,37 +0,0 @@
-package xyz.quaver.pupil.ui.fragment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import xyz.quaver.pupil.databinding.TransferSelectDataFragmentBinding
-import xyz.quaver.pupil.ui.TransferViewModel
-
-class TransferSelectDataFragment: Fragment() {
-
-    private var _binding: TransferSelectDataFragmentBinding? = null
-    private val binding get() = _binding!!
-
-    private val viewModel: TransferViewModel by activityViewModels()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        _binding = TransferSelectDataFragmentBinding.inflate(inflater, container, false)
-
-        binding.checkAll.setOnCheckedChangeListener {  _, isChecked ->
-            viewModel.list()
-        }
-
-        return binding.root
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}

app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferTargetFragment.kt

@@ -1,69 +0,0 @@
-package xyz.quaver.pupil.ui.fragment
-
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ArrayAdapter
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.adapters.TransferPeersAdapter
-import xyz.quaver.pupil.databinding.TransferTargetFragmentBinding
-import xyz.quaver.pupil.ui.TransferStep
-import xyz.quaver.pupil.ui.TransferViewModel
-
-class TransferTargetFragment : Fragment() {
-
-    private var _binding: TransferTargetFragmentBinding? = null
-    private val binding get() = _binding!!
-
-    private val viewModel: TransferViewModel by activityViewModels()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = TransferTargetFragmentBinding.inflate(inflater, container, false)
-
-        viewModel.thisDevice.observe(viewLifecycleOwner) { device ->
-            if (device == null) {
-                return@observe
-            }
-
-            if (device.status == 3) {
-                binding.ripple.startRippleAnimation()
-                binding.retryButton.visibility = View.INVISIBLE
-            } else {
-                binding.ripple.stopRippleAnimation()
-                binding.retryButton.visibility = View.VISIBLE
-            }
-        }
-
-        viewModel.peers.observe(viewLifecycleOwner) { peers ->
-            if (peers == null) {
-                return@observe
-            }
-
-            binding.deviceList.adapter = TransferPeersAdapter(peers.deviceList) {
-                viewModel.connect(it)
-            }
-        }
-
-        binding.ripple.startRippleAnimation()
-
-        binding.retryButton.setOnClickListener {
-            viewModel.setStep(TransferStep.TARGET)
-        }
-
-        return binding.root
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-}

app/src/main/java/xyz/quaver/pupil/ui/fragment/TransferWaitForConnectionFragment.kt

@@ -1,32 +0,0 @@
-package xyz.quaver.pupil.ui.fragment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import xyz.quaver.pupil.databinding.TransferWaitForConnectionFragmentBinding
-
-class TransferWaitForConnectionFragment : Fragment() {
-
-    private var _binding: TransferWaitForConnectionFragmentBinding? = null
-    private val binding get() = _binding!!
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        _binding = TransferWaitForConnectionFragmentBinding.inflate(layoutInflater)
-
-        binding.ripple.startRippleAnimation()
-
-        return binding.root
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-}

app/src/main/java/xyz/quaver/pupil/ui/theme/Color.kt

@@ -1,149 +0,0 @@
-package xyz.quaver.pupil.ui.theme
-
-import androidx.compose.ui.graphics.Color
-
-val md_theme_light_primary = Color(0xFF006688)
-val md_theme_light_onPrimary = Color(0xFFFFFFFF)
-val md_theme_light_primaryContainer = Color(0xFFC2E8FF)
-val md_theme_light_onPrimaryContainer = Color(0xFF001E2B)
-val md_theme_light_secondary = Color(0xFF4E616D)
-val md_theme_light_onSecondary = Color(0xFFFFFFFF)
-val md_theme_light_secondaryContainer = Color(0xFFD1E5F3)
-val md_theme_light_onSecondaryContainer = Color(0xFF091E28)
-val md_theme_light_tertiary = Color(0xFF5F5A7D)
-val md_theme_light_onTertiary = Color(0xFFFFFFFF)
-val md_theme_light_tertiaryContainer = Color(0xFFE5DEFF)
-val md_theme_light_onTertiaryContainer = Color(0xFF1C1736)
-val md_theme_light_error = Color(0xFFBA1A1A)
-val md_theme_light_errorContainer = Color(0xFFFFDAD6)
-val md_theme_light_onError = Color(0xFFFFFFFF)
-val md_theme_light_onErrorContainer = Color(0xFF410002)
-val md_theme_light_background = Color(0xFFFBFCFE)
-val md_theme_light_onBackground = Color(0xFF191C1E)
-val md_theme_light_surface = Color(0xFFFBFCFE)
-val md_theme_light_onSurface = Color(0xFF191C1E)
-val md_theme_light_surfaceVariant = Color(0xFFDCE3E9)
-val md_theme_light_onSurfaceVariant = Color(0xFF40484D)
-val md_theme_light_outline = Color(0xFF71787D)
-val md_theme_light_inverseOnSurface = Color(0xFFF0F1F3)
-val md_theme_light_inverseSurface = Color(0xFF2E3133)
-val md_theme_light_inversePrimary = Color(0xFF75D1FF)
-val md_theme_light_shadow = Color(0xFF000000)
-val md_theme_light_surfaceTint = Color(0xFF006688)
-val md_theme_light_outlineVariant = Color(0xFFC0C7CD)
-val md_theme_light_scrim = Color(0xFF000000)
-
-val md_theme_dark_primary = Color(0xFF75D1FF)
-val md_theme_dark_onPrimary = Color(0xFF003548)
-val md_theme_dark_primaryContainer = Color(0xFF004D67)
-val md_theme_dark_onPrimaryContainer = Color(0xFFC2E8FF)
-val md_theme_dark_secondary = Color(0xFFB5C9D7)
-val md_theme_dark_onSecondary = Color(0xFF20333D)
-val md_theme_dark_secondaryContainer = Color(0xFF364954)
-val md_theme_dark_onSecondaryContainer = Color(0xFFD1E5F3)
-val md_theme_dark_tertiary = Color(0xFFC9C2EA)
-val md_theme_dark_onTertiary = Color(0xFF312C4C)
-val md_theme_dark_tertiaryContainer = Color(0xFF474364)
-val md_theme_dark_onTertiaryContainer = Color(0xFFE5DEFF)
-val md_theme_dark_error = Color(0xFFFFB4AB)
-val md_theme_dark_errorContainer = Color(0xFF93000A)
-val md_theme_dark_onError = Color(0xFF690005)
-val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6)
-val md_theme_dark_background = Color(0xFF191C1E)
-val md_theme_dark_onBackground = Color(0xFFE1E2E5)
-val md_theme_dark_surface = Color(0xFF191C1E)
-val md_theme_dark_onSurface = Color(0xFFE1E2E5)
-val md_theme_dark_surfaceVariant = Color(0xFF40484D)
-val md_theme_dark_onSurfaceVariant = Color(0xFFC0C7CD)
-val md_theme_dark_outline = Color(0xFF8A9297)
-val md_theme_dark_inverseOnSurface = Color(0xFF191C1E)
-val md_theme_dark_inverseSurface = Color(0xFFE1E2E5)
-val md_theme_dark_inversePrimary = Color(0xFF006688)
-val md_theme_dark_shadow = Color(0xFF000000)
-val md_theme_dark_surfaceTint = Color(0xFF75D1FF)
-val md_theme_dark_outlineVariant = Color(0xFF40484D)
-val md_theme_dark_scrim = Color(0xFF000000)
-
-
-val seed = Color(0xFF4FC3F7)
-
-val Gray50 = Color(0xFFF9FAFB)
-val Gray100 = Color(0xFFF3F4F6)
-val Gray200 = Color(0xFFE5E7EB)
-val Gray300 = Color(0xFFD1D5DB)
-val Gray400 = Color(0xFF9CA3AF)
-val Gray500 = Color(0xFF6B7280)
-val Gray600 = Color(0xFF4B5563)
-val Gray700 = Color(0xFF374151)
-val Gray800 = Color(0xFF1F2937)
-val Gray900 = Color(0xFF111827)
-val Red50 = Color(0xFFFEF2F2)
-val Red100 = Color(0xFFFEE2E2)
-val Red200 = Color(0xFFFECACA)
-val Red300 = Color(0xFFFCA5A5)
-val Red400 = Color(0xFFF87171)
-val Red500 = Color(0xFFEF4444)
-val Red600 = Color(0xFFDC2626)
-val Red700 = Color(0xFFB91C1C)
-val Red800 = Color(0xFF991B1B)
-val Red900 = Color(0xFF7F1D1D)
-val Yellow50 = Color(0xFFFFFBEB)
-val Yellow100 = Color(0xFFFEF3C7)
-val Yellow200 = Color(0xFFFDE68A)
-val Yellow300 = Color(0xFFFCD34D)
-val Yellow400 = Color(0xFFFBBF24)
-val Yellow500 = Color(0xFFF59E0B)
-val Yellow600 = Color(0xFFD97706)
-val Yellow700 = Color(0xFFB45309)
-val Yellow800 = Color(0xFF92400E)
-val Yellow900 = Color(0xFF78350F)
-val Green50 = Color(0xFFECFDF5)
-val Green100 = Color(0xFFD1FAE5)
-val Green200 = Color(0xFFA7F3D0)
-val Green300 = Color(0xFF6EE7B7)
-val Green400 = Color(0xFF34D399)
-val Green500 = Color(0xFF10B981)
-val Green600 = Color(0xFF059669)
-val Green700 = Color(0xFF047857)
-val Green800 = Color(0xFF065F46)
-val Green900 = Color(0xFF064E3B)
-val Blue50 = Color(0xFFEFF6FF)
-val Blue100 = Color(0xFFDBEAFE)
-val Blue200 = Color(0xFFBFDBFE)
-val Blue300 = Color(0xFF93C5FD)
-val Blue400 = Color(0xFF60A5FA)
-val Blue500 = Color(0xFF3B82F6)
-val Blue600 = Color(0xFF2563EB)
-val Blue700 = Color(0xFF1D4ED8)
-val Blue800 = Color(0xFF1E40AF)
-val Blue900 = Color(0xFF1E3A8A)
-val Indigo50 = Color(0xFFEEF2FF)
-val Indigo100 = Color(0xFFE0E7FF)
-val Indigo200 = Color(0xFFC7D2FE)
-val Indigo300 = Color(0xFFA5B4FC)
-val Indigo400 = Color(0xFF818CF8)
-val Indigo500 = Color(0xFF6366F1)
-val Indigo600 = Color(0xFF4F46E5)
-val Indigo700 = Color(0xFF4338CA)
-val Indigo800 = Color(0xFF3730A3)
-val Indigo900 = Color(0xFF312E81)
-val Purple50 = Color(0xFFF5F3FF)
-val Purple100 = Color(0xFFEDE9FE)
-val Purple200 = Color(0xFFDDD6FE)
-val Purple300 = Color(0xFFC4B5FD)
-val Purple400 = Color(0xFFA78BFA)
-val Purple500 = Color(0xFF8B5CF6)
-val Purple600 = Color(0xFF7C3AED)
-val Purple700 = Color(0xFF6D28D9)
-val Purple800 = Color(0xFF5B21B6)
-val Purple900 = Color(0xFF4C1D95)
-val Pink50 = Color(0xFFFDF2F8)
-val Pink100 = Color(0xFFFCE7F3)
-val Pink200 = Color(0xFFFBCFE8)
-val Pink300 = Color(0xFFF9A8D4)
-val Pink400 = Color(0xFFF472B6)
-val Pink500 = Color(0xFFEC4899)
-val Pink600 = Color(0xFFDB2777)
-val Pink700 = Color(0xFFBE185D)
-val Pink800 = Color(0xFF9D174D)
-val Pink900 = Color(0xFF831843)

app/src/main/java/xyz/quaver/pupil/ui/theme/Theme.kt

@@ -1,97 +0,0 @@
-package xyz.quaver.pupil.ui.theme
-
-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.ui.platform.LocalContext
-
-
-private val LightColors = lightColorScheme(
-    primary = md_theme_light_primary,
-    onPrimary = md_theme_light_onPrimary,
-    primaryContainer = md_theme_light_primaryContainer,
-    onPrimaryContainer = md_theme_light_onPrimaryContainer,
-    secondary = md_theme_light_secondary,
-    onSecondary = md_theme_light_onSecondary,
-    secondaryContainer = md_theme_light_secondaryContainer,
-    onSecondaryContainer = md_theme_light_onSecondaryContainer,
-    tertiary = md_theme_light_tertiary,
-    onTertiary = md_theme_light_onTertiary,
-    tertiaryContainer = md_theme_light_tertiaryContainer,
-    onTertiaryContainer = md_theme_light_onTertiaryContainer,
-    error = md_theme_light_error,
-    errorContainer = md_theme_light_errorContainer,
-    onError = md_theme_light_onError,
-    onErrorContainer = md_theme_light_onErrorContainer,
-    background = md_theme_light_background,
-    onBackground = md_theme_light_onBackground,
-    surface = md_theme_light_surface,
-    onSurface = md_theme_light_onSurface,
-    surfaceVariant = md_theme_light_surfaceVariant,
-    onSurfaceVariant = md_theme_light_onSurfaceVariant,
-    outline = md_theme_light_outline,
-    inverseOnSurface = md_theme_light_inverseOnSurface,
-    inverseSurface = md_theme_light_inverseSurface,
-    inversePrimary = md_theme_light_inversePrimary,
-    surfaceTint = md_theme_light_surfaceTint,
-    outlineVariant = md_theme_light_outlineVariant,
-    scrim = md_theme_light_scrim,
-)
-
-
-private val DarkColors = darkColorScheme(
-    primary = md_theme_dark_primary,
-    onPrimary = md_theme_dark_onPrimary,
-    primaryContainer = md_theme_dark_primaryContainer,
-    onPrimaryContainer = md_theme_dark_onPrimaryContainer,
-    secondary = md_theme_dark_secondary,
-    onSecondary = md_theme_dark_onSecondary,
-    secondaryContainer = md_theme_dark_secondaryContainer,
-    onSecondaryContainer = md_theme_dark_onSecondaryContainer,
-    tertiary = md_theme_dark_tertiary,
-    onTertiary = md_theme_dark_onTertiary,
-    tertiaryContainer = md_theme_dark_tertiaryContainer,
-    onTertiaryContainer = md_theme_dark_onTertiaryContainer,
-    error = md_theme_dark_error,
-    errorContainer = md_theme_dark_errorContainer,
-    onError = md_theme_dark_onError,
-    onErrorContainer = md_theme_dark_onErrorContainer,
-    background = md_theme_dark_background,
-    onBackground = md_theme_dark_onBackground,
-    surface = md_theme_dark_surface,
-    onSurface = md_theme_dark_onSurface,
-    surfaceVariant = md_theme_dark_surfaceVariant,
-    onSurfaceVariant = md_theme_dark_onSurfaceVariant,
-    outline = md_theme_dark_outline,
-    inverseOnSurface = md_theme_dark_inverseOnSurface,
-    inverseSurface = md_theme_dark_inverseSurface,
-    inversePrimary = md_theme_dark_inversePrimary,
-    surfaceTint = md_theme_dark_surfaceTint,
-    outlineVariant = md_theme_dark_outlineVariant,
-    scrim = md_theme_dark_scrim,
-)
-
-@Composable
-fun AppTheme(
-    darkTheme: Boolean = isSystemInDarkTheme(),
-    content: @Composable() () -> Unit,
-) {
-    val dynamicColor = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
-
-    val colors = when {
-        dynamicColor && darkTheme -> dynamicDarkColorScheme(LocalContext.current)
-        dynamicColor && !darkTheme -> dynamicLightColorScheme(LocalContext.current)
-        darkTheme -> DarkColors
-        else -> LightColors
-    }
-
-    MaterialTheme(
-        colorScheme = colors,
-        content = content
-    )
-}

app/src/main/java/xyz/quaver/pupil/ui/view/FloatingSearchView.kt

@@ -1,216 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.ui.view
-
-import android.content.Context
-import android.graphics.PorterDuff
-import android.graphics.PorterDuffColorFilter
-import android.graphics.drawable.Animatable
-import android.text.Editable
-import android.text.TextWatcher
-import android.util.AttributeSet
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.inputmethod.EditorInfo
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.core.content.ContextCompat
-import androidx.core.content.res.ResourcesCompat
-import androidx.swiperefreshlayout.widget.CircularProgressDrawable
-import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
-import xyz.quaver.floatingsearchview.FloatingSearchView
-import xyz.quaver.floatingsearchview.suggestions.model.SearchSuggestion
-import xyz.quaver.floatingsearchview.util.view.SearchInputView
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.favoriteTags
-import xyz.quaver.pupil.types.*
-import java.util.*
-
-class FloatingSearchView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
-    FloatingSearchView(context, attrs),
-    FloatingSearchView.OnSearchListener,
-    TextWatcher
-{
-    private val searchInputView = findViewById<SearchInputView>(R.id.search_bar_text)
-
-    var onHistoryDeleteClickedListener: ((String) -> Unit)? = null
-    var onFavoriteHistorySwitchClickListener: (() -> Unit)? = null
-
-    init {
-        searchInputView.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI or searchInputView.imeOptions
-
-        searchInputView.addTextChangedListener(this)
-        onSearchListener = this
-        onBindSuggestionCallback = { binding, item, itemPosition ->
-            onBindSuggestion(binding.root, binding.leftIcon, binding.body, item, itemPosition)
-        }
-    }
-
-    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-
-    }
-
-    override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-
-    }
-
-    override fun afterTextChanged(s: Editable?) {
-        s ?: return
-
-        if (s.any { it.isUpperCase() })
-            s.replace(0, s.length, s.toString().lowercase())
-    }
-
-    override fun onSuggestionClicked(searchSuggestion: SearchSuggestion?) {
-        when (searchSuggestion) {
-            is TagSuggestion -> {
-                val tag = "${searchSuggestion.n}:${searchSuggestion.s.replace(Regex("\\s"), "_")}"
-                with(searchInputView.text!!) {
-                    delete(if (lastIndexOf(' ') == -1) 0 else lastIndexOf(' ') + 1, length)
-
-                    if (!this.contains(tag))
-                        append("$tag ")
-                }
-            }
-            is Suggestion -> {
-                with(searchInputView.text!!) {
-                    clear()
-                    append(searchSuggestion.body)
-                }
-            }
-            is FavoriteHistorySwitch -> onFavoriteHistorySwitchClickListener?.invoke()
-        }
-    }
-
-    override fun onSearchAction(currentQuery: String?) {}
-
-    fun onBindSuggestion(
-        suggestionView: View?,
-        leftIcon: ImageView?,
-        textView: TextView?,
-        item: SearchSuggestion?,
-        itemPosition: Int
-    ) {
-      when(item) {
-            is TagSuggestion -> {
-                val tag = "${item.n}:${item.s}"
-
-                leftIcon?.setImageDrawable(
-                    ResourcesCompat.getDrawable(
-                        resources,
-                        when(item.n) {
-                            "female" -> R.drawable.gender_female
-                            "male" -> R.drawable.gender_male
-                            "language" -> R.drawable.translate
-                            "group" -> R.drawable.account_group
-                            "character" -> R.drawable.account_star
-                            "series" -> R.drawable.book_open
-                            "artist" -> R.drawable.brush
-                            else -> R.drawable.tag
-                        },
-                        context.theme)
-                )
-
-                with(suggestionView?.findViewById<ImageView>(R.id.right_icon)) {
-                    this ?: return@with
-
-                    if (favoriteTags.contains(Tag.parse(tag)))
-                        setImageResource(R.drawable.ic_star_filled)
-                    else
-                        setImageResource(R.drawable.ic_star_empty)
-
-                    visibility = View.VISIBLE
-                    rotation = 0f
-
-                    isEnabled = true
-                    isClickable = true
-
-                    setOnClickListener {
-                        val tag = Tag.parse(tag)
-
-                        if (favoriteTags.contains(tag)) {
-                            setImageResource(R.drawable.ic_star_empty)
-                            favoriteTags.remove(tag)
-                        }
-                        else {
-                            setImageDrawable(
-                                AnimatedVectorDrawableCompat.create(context,
-                                    R.drawable.avd_star
-                                ))
-                            (drawable as Animatable).start()
-
-                            favoriteTags.add(tag)
-                        }
-                    }
-                }
-
-                if (item.t > 0) {
-                    (suggestionView as? LinearLayout)?.let {
-                        val count = it.findViewById<TextView>(R.id.count)
-                        if (count == null)
-                            it.addView(
-                                LayoutInflater.from(context).inflate(R.layout.suggestion_count, suggestionView, false)
-                                    .apply {
-                                        this as TextView
-
-                                        text = item.t.toString()
-                                    }, 2
-                            )
-                        else
-                            count.text = item.t.toString()
-                    }
-                }
-            }
-            is FavoriteHistorySwitch -> {
-                leftIcon?.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.swap_horizontal, context.theme))
-            }
-            is Suggestion -> {
-                leftIcon?.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.history, context.theme))
-
-                with(suggestionView?.findViewById<ImageView>(R.id.right_icon)) {
-                    this ?: return@with
-
-                    setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.delete, context.theme))
-
-                    visibility = View.VISIBLE
-                    rotation = 0f
-
-                    isEnabled = true
-                    isClickable = true
-
-                    setOnClickListener {
-                        onHistoryDeleteClickedListener?.invoke(item.body)
-                    }
-                }
-            }
-            is LoadingSuggestion -> {
-                leftIcon?.setImageDrawable(CircularProgressDrawable(context).also {
-                    it.setStyle(CircularProgressDrawable.DEFAULT)
-                    it.colorFilter = PorterDuffColorFilter(ContextCompat.getColor(context, R.color.colorAccent), PorterDuff.Mode.SRC_IN)
-                    it.start()
-                })
-            }
-            is NoResultSuggestion -> {
-                leftIcon?.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.close, context.theme))
-            }
-        }
-    }
-}

app/src/main/java/xyz/quaver/pupil/ui/view/MainView.java

@@ -1,462 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.ui.view;
-
-import android.animation.ValueAnimator;
-import android.content.Context;
-import android.content.res.Configuration;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.os.Vibrator;
-import android.util.AttributeSet;
-import android.util.DisplayMetrics;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.animation.DecelerateInterpolator;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatDelegate;
-import androidx.appcompat.content.res.AppCompatResources;
-import androidx.core.content.ContextCompat;
-import androidx.core.view.NestedScrollingChild;
-import androidx.core.view.NestedScrollingChildHelper;
-import androidx.core.view.NestedScrollingParent;
-import androidx.core.view.NestedScrollingParentHelper;
-import androidx.core.view.ViewCompat;
-import androidx.core.widget.TextViewCompat;
-
-import xyz.quaver.pupil.R;
-
-@SuppressWarnings("NullableProblems")
-public class MainView extends ViewGroup implements NestedScrollingChild, NestedScrollingParent {
-
-    private static final int PAGE_TURN_LAYOUT_SIZE = 48;
-    private static final int PAGE_TURN_ANIM_DURATION = 500;
-    private static final int PREV_OFFSET = 64;
-    private static final int RIPPLE_GIVE = 4;
-
-    private final float adjustedPageTurnLayoutSize;
-    private final float adjustedPrevOffset;
-    private final float adjustedRippleGive;
-    
-    final private NestedScrollingParentHelper mNestedScrollingParentHelper;
-    final private NestedScrollingChildHelper mNestedScrollingChildHelper;
-
-    final private Vibrator mVibrator;
-
-    private View mTarget;
-
-    private TextView mPrev;
-    private TextView mNext;
-
-    private final Paint mRipplePaint = new Paint();
-    private final Rect mRippleBound = new Rect();
-
-    private int mRippleSize = 0;
-    private final int mRippleTargetSize;
-    private final ValueAnimator mRippleAnimator = new ValueAnimator();
-
-    private int mCurrentOverScroll = 0;
-
-    private int mCurrentPage = 1;
-    private boolean mShowPrev;
-    private boolean mShowNext;
-
-    private OnPageTurnListener mOnPageTurnListener;
-
-    public MainView(@NonNull Context context) {
-        this(context, null);
-    }
-
-    public MainView(@NonNull Context context, AttributeSet attr) {
-        this(context, attr, 0);
-    }
-
-    public MainView(@NonNull Context context, AttributeSet attr, int defStyle) {
-        super(context, attr, defStyle);
-
-        setWillNotDraw(false);
-
-        DisplayMetrics metrics = getResources().getDisplayMetrics();
-
-        adjustedPageTurnLayoutSize = PAGE_TURN_LAYOUT_SIZE * metrics.density;
-        adjustedPrevOffset = PREV_OFFSET * metrics.density;
-        adjustedRippleGive = RIPPLE_GIVE * metrics.density;
-
-        mRippleTargetSize = metrics.widthPixels;
-
-        mNestedScrollingParentHelper = new NestedScrollingParentHelper(this);
-        mNestedScrollingChildHelper = new NestedScrollingChildHelper(this);
-
-        mVibrator = (Vibrator) getContext().getSystemService(Context.VIBRATOR_SERVICE);
-
-        mRippleAnimator.addUpdateListener(animation -> {
-            mRippleSize = (int) animation.getAnimatedValue();
-            invalidate();
-        });
-        mRippleAnimator.setDuration(PAGE_TURN_ANIM_DURATION);
-
-        initPageTurnView();
-    }
-
-    public void setCurrentPage(int currentPage, boolean showNext) {
-        mCurrentPage = currentPage;
-
-        mShowPrev = currentPage > 1;
-        mShowNext = showNext;
-
-        mPrev.setText(getContext().getString(R.string.main_move_to_page, mCurrentPage-1));
-        mNext.setText(getContext().getString(R.string.main_move_to_page, mCurrentPage+1));
-    }
-
-    public void setOnPageTurnListener(OnPageTurnListener listener) {
-        mOnPageTurnListener = listener;
-    }
-
-    private void initPageTurnView() {
-        TextView prev = new TextView(getContext());
-        TextView next = new TextView(getContext());
-
-        prev.setGravity(Gravity.CENTER_VERTICAL);
-        next.setGravity(Gravity.CENTER_VERTICAL);
-
-        prev.setCompoundDrawablesWithIntrinsicBounds(R.drawable.navigate_prev, 0, 0, 0);
-        next.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.navigate_next, 0);
-
-        TextViewCompat.setCompoundDrawableTintList(prev, AppCompatResources.getColorStateList(getContext(), R.color.colorAccent));
-        TextViewCompat.setCompoundDrawableTintList(next, AppCompatResources.getColorStateList(getContext(), R.color.colorAccent));
-
-        prev.setVisibility(View.INVISIBLE);
-        next.setVisibility(View.INVISIBLE);
-
-        mPrev = prev;
-        mNext = next;
-
-        addView(mPrev);
-        addView(mNext);
-
-        setCurrentPage(1, false);
-    }
-
-    private void ensureTarget() {
-        if (mTarget == null) {
-            for (int i = 0; i < getChildCount(); i++) {
-                View child = getChildAt(i);
-
-                if (!child.equals(mNext) && !child.equals(mPrev)) {
-                    mTarget = child;
-                    break;
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int l, int t, int r, int b) {
-        final int width = getMeasuredWidth();
-        final int height = getMeasuredHeight();
-
-        if (getChildCount() == 0)
-            return;
-        if (mTarget == null)
-            ensureTarget();
-        if (mTarget == null)
-            return;
-
-        mTarget.layout(
-            getPaddingLeft(),
-            getPaddingTop(),
-            width - getPaddingRight(),
-            height - getPaddingBottom()
-        );
-
-        final int prevWidth = mPrev.getMeasuredWidth();
-        mPrev.layout(
-            width / 2 - prevWidth / 2,
-            getPaddingTop() + (int) adjustedPrevOffset,
-            width / 2 + prevWidth / 2,
-            getPaddingTop() + (int) adjustedPrevOffset + mPrev.getMeasuredHeight()
-        );
-
-        final int nextWidth = mNext.getMeasuredWidth();
-        mNext.layout(
-            width / 2 - nextWidth / 2,
-            height - getPaddingBottom() - mNext.getMeasuredHeight(),
-            width / 2 + nextWidth / 2,
-            height - getPaddingBottom()
-        );
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        if (mTarget == null)
-            ensureTarget();
-        if (mTarget == null)
-            return;
-
-        mTarget.measure(
-            MeasureSpec.makeMeasureSpec(getMeasuredWidth() - getPaddingLeft() - getPaddingRight(), MeasureSpec.EXACTLY),
-            MeasureSpec.makeMeasureSpec(getMeasuredHeight() - getPaddingTop() - getPaddingBottom(), MeasureSpec.EXACTLY)
-        );
-
-        mPrev.measure(
-            MeasureSpec.makeMeasureSpec(getMeasuredWidth(), MeasureSpec.AT_MOST),
-            MeasureSpec.makeMeasureSpec((int) adjustedPageTurnLayoutSize, MeasureSpec.EXACTLY)
-        );
-
-        mNext.measure(
-            MeasureSpec.makeMeasureSpec(getMeasuredWidth(), MeasureSpec.AT_MOST),
-            MeasureSpec.makeMeasureSpec((int) adjustedPageTurnLayoutSize, MeasureSpec.EXACTLY)
-        );
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-
-        if (mCurrentOverScroll == 0)
-            return;
-
-        if (mCurrentOverScroll > 0) {
-            mRippleBound.set(
-                getPaddingLeft(),
-                (int) (getPaddingTop() - adjustedRippleGive),
-                getMeasuredWidth() - getPaddingRight(),
-                (int) (getPaddingTop() + adjustedPrevOffset + mPrev.getMeasuredHeight() + adjustedRippleGive)
-            );
-        }
-
-        if (mCurrentOverScroll < 0) {
-            final int height = getMeasuredHeight();
-            mRippleBound.set(
-                getPaddingLeft(),
-                (int) (height - getPaddingBottom() - mNext.getMeasuredHeight() - adjustedRippleGive),
-                getMeasuredWidth() - getPaddingRight(),
-                height - getPaddingBottom()
-            );
-        }
-
-        mRipplePaint.reset();
-        mRipplePaint.setStyle(Paint.Style.FILL);
-
-        int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
-
-        switch (currentNightMode) {
-            case Configuration.UI_MODE_NIGHT_YES:
-                mRipplePaint.setColor(ContextCompat.getColor(getContext(), R.color.material_light_blue_700));
-                break;
-            case Configuration.UI_MODE_NIGHT_NO:
-                mRipplePaint.setColor(ContextCompat.getColor(getContext(), R.color.material_light_blue_300));
-                break;
-        }
-
-        canvas.drawCircle(
-            (mRippleBound.left + mRippleBound.right) / 2F,
-            mCurrentOverScroll > 0 ? mRippleBound.bottom : mRippleBound.top,
-            mRippleSize,
-            mRipplePaint
-        );
-    }
-
-    private void onOverscroll(int overscroll) {
-        if (mTarget == null)
-            ensureTarget();
-        if (mTarget == null)
-            return;
-
-        mCurrentOverScroll = overscroll;
-
-        if (overscroll > 0) {
-            mPrev.setVisibility(View.VISIBLE);
-            mNext.setVisibility(View.INVISIBLE);
-        } else if (overscroll < 0) {
-            mPrev.setVisibility(View.INVISIBLE);
-            mNext.setVisibility(View.VISIBLE);
-        } else {
-            mPrev.setVisibility(View.INVISIBLE);
-            mNext.setVisibility(View.INVISIBLE);
-        }
-
-        if (Math.abs(overscroll) >= adjustedPageTurnLayoutSize) {
-            if (!mRippleAnimator.isStarted() && mRippleSize != mRippleTargetSize) {
-                mVibrator.vibrate(10);
-
-                mRippleAnimator.setIntValues(mRippleSize, mRippleTargetSize);
-                mRippleAnimator.start();
-            }
-        } else {
-            if (!mRippleAnimator.isStarted() && mRippleSize != 0) {
-                mRippleAnimator.setIntValues(mRippleSize, 0);
-                mRippleAnimator.start();
-            }
-        }
-
-        float clippedOverScrollTop = (overscroll > 0 ? 1 : -1) * Math.min(Math.abs(overscroll), adjustedPageTurnLayoutSize);
-        mTarget.setTranslationY(clippedOverScrollTop);
-    }
-
-    private void onOverscrollEnd(int overscroll) {
-        if (mTarget == null)
-            ensureTarget();
-        if (mTarget == null)
-            return;
-
-        mRippleAnimator.cancel();
-        mRippleAnimator.setIntValues(mRippleSize, 0);
-        mRippleAnimator.start();
-
-        mPrev.setVisibility(View.INVISIBLE);
-        mNext.setVisibility(View.INVISIBLE);
-
-        ViewCompat.animate(mTarget)
-            .setDuration(PAGE_TURN_ANIM_DURATION)
-            .setInterpolator(new DecelerateInterpolator())
-            .translationY(0);
-
-        if (Math.abs(overscroll) > adjustedPageTurnLayoutSize && mOnPageTurnListener != null) {
-            if (overscroll > 0)
-                mOnPageTurnListener.onPrev(mCurrentPage-1);
-            if (overscroll < 0)
-                mOnPageTurnListener.onNext(mCurrentPage+1);
-        }
-    }
-
-    // NestedScrollingParent
-
-    private int mTotalUnconsumed = 0;
-
-    @Override
-    public boolean onStartNestedScroll(View child, View target, int nestedScrollAxes) {
-        return isEnabled() && (nestedScrollAxes & ViewCompat.SCROLL_AXIS_VERTICAL) != 0;
-    }
-
-    @Override
-    public void onNestedScrollAccepted(View child, View target, int axes) {
-        mNestedScrollingParentHelper.onNestedScrollAccepted(child, target, axes);
-        startNestedScroll(axes & ViewCompat.SCROLL_AXIS_VERTICAL);
-
-        mTotalUnconsumed = 0;
-    }
-
-    @Override
-    public void onNestedPreScroll(View target, int dx, int dy, int[] consumed) {
-        if (mTotalUnconsumed != 0 && dy > 0 == mTotalUnconsumed > 0) {
-            if (Math.abs(dy) > Math.abs(mTotalUnconsumed)) {
-                consumed[1] = dy - mTotalUnconsumed;
-                mTotalUnconsumed = 0;
-            } else {
-                mTotalUnconsumed -= dy;
-                consumed[1] = dy;
-            }
-
-            onOverscroll(mTotalUnconsumed);
-        }
-
-        final int[] parentConsumed = new int[2];
-        if (dispatchNestedPreScroll(dx - consumed[0], dy - consumed[1], parentConsumed, null)) {
-            consumed[0] += parentConsumed[0];
-            consumed[1] += parentConsumed[1];
-        }
-    }
-
-    @Override
-    public void onNestedScroll(View target, int dxConsumed, int dyConsumed, int dxUnconsumed, int dyUnconsumed) {
-        final int[] mParentOffsetInWindow = new int[2];
-        dispatchNestedScroll(dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, mParentOffsetInWindow);
-
-        final int dy = dyUnconsumed + mParentOffsetInWindow[1];
-
-        if (mTotalUnconsumed == 0 && ((dy < 0 && !mShowPrev) || (dy > 0 && !mShowNext)))
-            return;
-
-        if (dy != 0) {
-            mTotalUnconsumed -= dy;
-            onOverscroll(mTotalUnconsumed);
-        }
-    }
-
-    @Override
-    public void onStopNestedScroll(View child) {
-        mNestedScrollingParentHelper.onStopNestedScroll(child);
-
-        if (Math.abs(mTotalUnconsumed) > 0) {
-            onOverscrollEnd(mTotalUnconsumed);
-            mTotalUnconsumed = 0;
-        }
-
-        stopNestedScroll();
-    }
-
-    // NestedScrollingChild
-
-    @Override
-    public void setNestedScrollingEnabled(boolean enabled) {
-        mNestedScrollingChildHelper.setNestedScrollingEnabled(enabled);
-    }
-
-    @Override
-    public boolean isNestedScrollingEnabled() {
-        return mNestedScrollingChildHelper.isNestedScrollingEnabled();
-    }
-
-    @Override
-    public boolean startNestedScroll(int axes) {
-        return mNestedScrollingChildHelper.startNestedScroll(axes);
-    }
-
-    @Override
-    public void stopNestedScroll() {
-        mNestedScrollingChildHelper.stopNestedScroll();
-    }
-
-    @Override
-    public boolean hasNestedScrollingParent() {
-        return mNestedScrollingChildHelper.hasNestedScrollingParent();
-    }
-
-    @Override
-    public boolean dispatchNestedScroll(int dxConsumed, int dyConsumed, int dxUnconsumed, int dyUnconsumed, @Nullable int[] offsetInWindow) {
-        return mNestedScrollingChildHelper.dispatchNestedScroll(dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, offsetInWindow);
-    }
-
-    @Override
-    public boolean dispatchNestedPreScroll(int dx, int dy, @Nullable int[] consumed, @Nullable int[] offsetInWindow) {
-        return mNestedScrollingChildHelper.dispatchNestedPreScroll(dx, dy, consumed, offsetInWindow);
-    }
-
-    @Override
-    public boolean dispatchNestedFling(float velocityX, float velocityY, boolean consumed) {
-        return mNestedScrollingChildHelper.dispatchNestedFling(velocityX, velocityY, consumed);
-    }
-
-    @Override
-    public boolean dispatchNestedPreFling(float velocityX, float velocityY) {
-        return mNestedScrollingChildHelper.dispatchNestedPreFling(velocityX, velocityY);
-    }
-
-    public interface OnPageTurnListener {
-        void onPrev(int page);
-        void onNext(int page);
-    }
-}

app/src/main/java/xyz/quaver/pupil/ui/view/ProgressCard.kt

@@ -1,72 +0,0 @@
-package xyz.quaver.pupil.ui.view
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.cardview.widget.CardView
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.drawable.DrawableCompat
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.databinding.ProgressCardViewBinding
-
-class ProgressCard @JvmOverloads constructor(context: Context, attr: AttributeSet? = null, defStyle: Int = R.attr.cardViewStyle) : CardView(context, attr, defStyle) {
-
-    enum class Type {
-        LOADING,
-        CACHE,
-        DOWNLOAD
-    }
-
-    var type: Type = Type.LOADING
-        set(value) {
-            field = value
-
-            when (field) {
-                Type.LOADING -> R.color.colorAccent
-                Type.CACHE -> R.color.material_blue_700
-                Type.DOWNLOAD -> R.color.material_green_a700
-            }.let {
-                val color = ContextCompat.getColor(context, it)
-                DrawableCompat.setTint(binding.progressbar.progressDrawable, color)
-            }
-        }
-
-    var progress: Int
-        get() = binding.progressbar.progress
-        set(value) {
-            binding.progressbar.progress = value
-        }
-    var max: Int
-        get() = binding.progressbar.max
-        set(value) {
-            binding.progressbar.max = value
-
-            binding.progressbar.visibility =
-                if (value == 0)
-                    GONE
-                else
-                    VISIBLE
-        }
-
-    val binding = ProgressCardViewBinding.inflate(LayoutInflater.from(context), this)
-
-    init {
-        binding.content.setOnClickListener {
-            performClick()
-        }
-
-        binding.content.setOnLongClickListener {
-            performLongClick()
-        }
-    }
-
-    override fun addView(child: View?, index: Int, params: ViewGroup.LayoutParams?) {
-        if (childCount == 0)
-            super.addView(child, index, params)
-        else
-            binding.content.addView(child, index, params)
-    }
-
-}

app/src/main/java/xyz/quaver/pupil/ui/view/TagChip.kt

@@ -1,100 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.ui.view
-
-import android.annotation.SuppressLint
-import android.content.Context
-import androidx.core.content.ContextCompat
-import com.google.android.material.chip.Chip
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.favoriteTags
-import xyz.quaver.pupil.types.Tag
-import xyz.quaver.pupil.util.translations
-import xyz.quaver.pupil.util.wordCapitalize
-
-@SuppressLint("ViewConstructor")
-class TagChip(context: Context, _tag: Tag) : Chip(context) {
-
-    val tag: Tag =
-        _tag.let {
-            when {
-                it.area != null -> it
-                else -> Tag("tag", _tag.tag)
-            }
-        }
-
-    private val languages = context.resources.getStringArray(R.array.languages).map {
-        it.split("|").let { split ->
-            Pair(split[0], split[1])
-        }
-    }.toMap()
-
-    init {
-        when(tag.area) {
-            "male" -> {
-                setChipBackgroundColorResource(R.color.material_blue_700)
-                setTextColor(ContextCompat.getColor(context, android.R.color.white))
-                setCloseIconTintResource(android.R.color.white)
-                chipIcon = ContextCompat.getDrawable(context, R.drawable.gender_male_white)
-            }
-            "female" -> {
-                setChipBackgroundColorResource(R.color.material_pink_600)
-                setTextColor(ContextCompat.getColor(context, android.R.color.white))
-                setCloseIconTintResource(android.R.color.white)
-                chipIcon = ContextCompat.getDrawable(context, R.drawable.gender_female_white)
-            }
-        }
-
-        if (favoriteTags.contains(tag))
-            setChipBackgroundColorResource(R.color.material_orange_500)
-
-        isCloseIconVisible = true
-        closeIcon = ContextCompat.getDrawable(context,
-            if (favoriteTags.contains(tag))
-                R.drawable.ic_star_filled
-            else
-                R.drawable.ic_star_empty
-        )
-
-        setOnCloseIconClickListener {
-            if (favoriteTags.contains(tag)) {
-                favoriteTags.remove(tag)
-                closeIcon = ContextCompat.getDrawable(context, R.drawable.ic_star_empty)
-
-                when(tag.area) {
-                    "male" -> setChipBackgroundColorResource(R.color.material_blue_700)
-                    "female" -> setChipBackgroundColorResource(R.color.material_pink_600)
-                    else -> chipBackgroundColor = null
-                }
-            } else {
-                favoriteTags.add(tag)
-                closeIcon = ContextCompat.getDrawable(context, R.drawable.ic_star_filled)
-                setChipBackgroundColorResource(R.color.material_orange_500)
-            }
-        }
-
-        text = when (tag.area) {
-            "language" -> languages[tag.tag]
-            else -> (translations[tag.tag] ?: tag.tag).wordCapitalize()
-        }
-
-        setEnsureMinTouchTargetSize(false)
-    }
-
-}

app/src/main/java/xyz/quaver/pupil/ui/view/TagChipGroup.kt

@@ -1,100 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.ui.view
-
-import android.content.Context
-import android.content.res.TypedArray
-import android.util.AttributeSet
-import android.util.Log
-import com.google.android.material.chip.Chip
-import com.google.android.material.chip.ChipGroup
-import kotlinx.coroutines.*
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.types.Tag
-import xyz.quaver.pupil.types.Tags
-
-class TagChipGroup @JvmOverloads constructor(context: Context, attr: AttributeSet? = null, attrStyle: Int = R.attr.chipGroupStyle, val tags: Tags = Tags()) : ChipGroup(context, attr, attrStyle), MutableSet<Tag> by tags {
-
-    object Defaults {
-        const val maxChipSize = 10
-    }
-
-    var maxChipSize: Int = Defaults.maxChipSize
-        set(value) {
-            field = value
-
-            refresh()
-        }
-
-    private val moreView = Chip(context).apply {
-        text = "…"
-
-        setEnsureMinTouchTargetSize(false)
-
-        setOnClickListener {
-            removeView(this)
-
-            for (i in maxChipSize until tags.size) {
-                val tag = tags.elementAt(i)
-
-                addView(TagChip(context, tag).apply {
-                    setOnClickListener {
-                        onClickListener?.invoke(tag)
-                    }
-                })
-            }
-        }
-    }
-
-    var onClickListener: ((Tag) -> Unit)? = null
-
-    private fun applyAttributes(attr: TypedArray) {
-        maxChipSize = attr.getInt(R.styleable.TagChipGroup_maxTag, Defaults.maxChipSize)
-    }
-
-    private var refreshJob: Job? = null
-    fun refresh() {
-        refreshJob?.cancel()
-        this.removeAllViews()
-
-        refreshJob = CoroutineScope(Dispatchers.Main).launch {
-            tags.take(maxChipSize).map {
-                CoroutineScope(Dispatchers.Default).async {
-                    TagChip(context, it).apply {
-                        setOnClickListener {
-                            onClickListener?.invoke(this.tag)
-                        }
-                    }
-                }
-            }.forEach {
-                addView(it.await())
-            }
-
-            if (maxChipSize > 0 && tags.size > maxChipSize)
-                addView(moreView)
-        }
-    }
-
-    init {
-        applyAttributes(context.obtainStyledAttributes(attr, R.styleable.TagChipGroup))
-
-        refresh()
-    }
-
-}

app/src/main/java/xyz/quaver/pupil/ui/viewmodel/MainViewModel.kt

@@ -1,12 +0,0 @@
-package xyz.quaver.pupil.ui.viewmodel
-
-import androidx.lifecycle.ViewModel
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-
-class MainViewModel : ViewModel() {
-    private val _uiState = MutableStateFlow(SearchState())
-    val searchState: StateFlow<SearchState> = _uiState
-}
-
-data class SearchState(val stub: String = "")

app/src/main/java/xyz/quaver/pupil/util/ItemClickSupport.kt

@@ -1,69 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.util
-
-import android.view.View
-import androidx.recyclerview.widget.RecyclerView
-import xyz.quaver.pupil.R
-
-class ItemClickSupport(private val recyclerView: RecyclerView) {
-
-    var onItemClickListener: ((RecyclerView, Int, View) -> Unit)? = null
-    var onItemLongClickListener: ((RecyclerView, Int, View) -> Boolean)? = null
-
-    init {
-        recyclerView.apply {
-            setTag(R.id.item_click_support, this)
-            addOnChildAttachStateChangeListener(object: RecyclerView.OnChildAttachStateChangeListener {
-                override fun onChildViewAttachedToWindow(view: View) {
-                    onItemClickListener?.let { listener ->
-                        view.setOnClickListener {
-                            recyclerView.getChildViewHolder(view).let { holder ->
-                                listener.invoke(recyclerView, holder.adapterPosition, view)
-                            }
-                        }
-                    }
-                    onItemLongClickListener?.let { listener ->
-                        view.setOnLongClickListener {
-                            recyclerView.getChildViewHolder(view).let { holder ->
-                                listener.invoke(recyclerView, holder.adapterPosition, view)
-                            }
-                        }
-                    }
-                }
-
-                override fun onChildViewDetachedFromWindow(view: View) {
-                    // Do Nothing
-                }
-            })
-        }
-    }
-
-    fun detach() {
-        recyclerView.apply {
-            clearOnChildAttachStateChangeListeners()
-            setTag(R.id.item_click_support, null)
-        }
-    }
-
-    companion object {
-        fun addTo(view: RecyclerView) = view.let { removeFrom(it); ItemClickSupport(it) }
-        fun removeFrom(view: RecyclerView) = (view.tag as? ItemClickSupport)?.detach()
-    }
-}

app/src/main/java/xyz/quaver/pupil/util/Preferences.kt

@@ -1,48 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.util
-
-import android.content.SharedPreferences
-import kotlin.reflect.KClass
-
-lateinit var preferences: SharedPreferences
-
-object Preferences: SharedPreferences by preferences {
-
-    val defMap = mapOf(
-        String::class to "",
-        Int::class to -1,
-        Long::class to -1L,
-        Boolean::class to false,
-        Set::class to emptySet<Any>()
-    )
-
-    operator fun set(key: String, value: String) = edit().putString(key, value).apply()
-    operator fun set(key: String, value: Int) = edit().putInt(key, value).apply()
-    operator fun set(key: String, value: Long) = edit().putLong(key, value).apply()
-    operator fun set(key: String, value: Boolean) = edit().putBoolean(key, value).apply()
-    operator fun set(key: String, value: Set<String>) = edit().putStringSet(key, value).apply()
-
-    @Suppress("UNCHECKED_CAST")
-    inline operator fun <reified T: Any> get(key: String, defaultVal: T = defMap[T::class] as T): T = (all[key] as? T) ?: defaultVal
-
-    fun remove(key: String) {
-        edit().remove(key).apply()
-    }
-}

app/src/main/java/xyz/quaver/pupil/util/SavedSet.kt

@@ -1,93 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.util
-
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.builtins.ListSerializer
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.serializer
-import java.io.File
-
-class SavedSet <T: Any> (private val file: File, private val any: T, private val set: MutableSet<T> = mutableSetOf()) : MutableSet<T> by set {
-
-    @Suppress("UNCHECKED_CAST")
-    @OptIn(ExperimentalSerializationApi::class)
-    val serializer: KSerializer<List<T>>
-        get() = ListSerializer(serializer(any::class.java) as KSerializer<T>)
-
-    init {
-        if (!file.exists()) {
-            file.parentFile?.mkdirs()
-            save()
-        }
-        load()
-    }
-
-    @Synchronized
-    fun load() {
-        set.clear()
-        kotlin.runCatching {
-            Json.decodeFromString(serializer, file.readText())
-        }.onSuccess {
-            set.addAll(it)
-        }.onFailure {
-            FirebaseCrashlytics.getInstance().recordException(it)
-        }
-    }
-
-    @Synchronized
-    @OptIn(ExperimentalSerializationApi::class)
-    fun save() {
-        file.writeText(Json.encodeToString(serializer, set.toList()))
-    }
-
-    @Synchronized
-    override fun add(element: T): Boolean {
-        set.remove(element)
-
-        return set.add(element).also {
-            save()
-        }
-    }
-
-    @Synchronized
-    override fun addAll(elements: Collection<T>): Boolean {
-        set.removeAll(elements)
-
-        return set.addAll(elements).also {
-            save()
-        }
-    }
-
-    @Synchronized
-    override fun remove(element: T): Boolean {
-        return set.remove(element).also {
-            save()
-        }
-    }
-
-    @Synchronized
-    override fun clear() {
-        set.clear()
-        save()
-    }
-
-}

app/src/main/java/xyz/quaver/pupil/util/camera.kt

@@ -1,119 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-@file:Suppress("DEPRECATION", "Recycle")
-
-package xyz.quaver.pupil.util
-
-import android.content.Context
-import android.content.pm.PackageManager
-import android.graphics.ImageFormat
-import android.graphics.SurfaceTexture
-import android.hardware.Camera
-import android.view.Surface
-import android.view.WindowManager
-import com.google.android.gms.tasks.Task
-import com.google.mlkit.vision.common.InputImage
-import com.google.mlkit.vision.face.Face
-import com.google.mlkit.vision.face.FaceDetection
-import com.google.mlkit.vision.face.FaceDetectorOptions
-
-/** Check if this device has a camera */
-private fun Context.checkCameraHardware() =
-    this.packageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA)
-
-private fun openFrontCamera() : Pair<Camera?, Int> {
-    var camera: Camera? = null
-    var cameraID: Int = -1
-
-    val cameraInfo = Camera.CameraInfo()
-
-    for (i in 0 until Camera.getNumberOfCameras()) {
-        Camera.getCameraInfo(i, cameraInfo)
-        if (cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_FRONT)
-            runCatching { Camera.open(i) }.getOrNull()?.let { camera = it; cameraID = i }
-
-        if (camera != null) break
-    }
-
-    return Pair(camera, cameraID)
-}
-
-val orientations = mapOf(
-    Surface.ROTATION_0 to 0,
-    Surface.ROTATION_90 to 90,
-    Surface.ROTATION_180 to 180,
-    Surface.ROTATION_270 to 270,
-)
-
-private fun getRotation(context: Context, cameraID: Int): Int {
-    val cameraRotation = Camera.CameraInfo().also { Camera.getCameraInfo(cameraID, it) }.orientation
-    val rotation = orientations[(context.getSystemService(Context.WINDOW_SERVICE) as WindowManager).defaultDisplay.rotation] ?: error("")
-
-    return (cameraRotation + rotation) % 360
-}
-
-var camera: Camera? = null
-var surfaceTexture: SurfaceTexture? = null
-private val detector = FaceDetection.getClient(
-    FaceDetectorOptions.Builder()
-        .setClassificationMode(FaceDetectorOptions.CLASSIFICATION_MODE_ALL)
-        .build()
-)
-private var process: Task<List<Face>>? = null
-
-fun startCamera(context: Context, callback: (List<Face>) -> Unit) {
-    if (camera != null) closeCamera()
-
-    val cameraID = openFrontCamera().let { (cam, cameraID) ->
-        cam ?: return
-        camera = cam
-        cameraID
-    }
-
-    with (camera!!) {
-        parameters = parameters.apply {
-            setPreviewSize(640, 480)
-            previewFormat = ImageFormat.NV21
-        }
-
-        setPreviewTexture(surfaceTexture ?: SurfaceTexture(0).also {
-            surfaceTexture = it
-        })
-        startPreview()
-        setPreviewCallback { bytes, _ ->
-            if (process?.isComplete == false)
-                return@setPreviewCallback
-
-            val rotation = getRotation(context, cameraID)
-
-            val image = InputImage.fromByteArray(bytes, 640, 480, rotation, InputImage.IMAGE_FORMAT_NV21)
-            process = detector.process(image)
-                .addOnSuccessListener(callback)
-        }
-    }
-}
-
-fun closeCamera() {
-    camera?.setPreviewCallback(null)
-    camera?.stopPreview()
-    surfaceTexture?.release()
-    surfaceTexture = null
-    camera?.release()
-    camera = null
-}

app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt

@@ -1,297 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.util.downloader
-
-import android.content.Context
-import android.content.ContextWrapper
-import android.net.Uri
-import kotlinx.coroutines.*
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-import okhttp3.Request
-import xyz.quaver.io.FileX
-import xyz.quaver.io.util.*
-import xyz.quaver.pupil.client
-import xyz.quaver.pupil.hitomi.*
-import java.io.File
-import java.io.IOException
-import java.util.concurrent.ConcurrentHashMap
-
-@Serializable
-data class OldReader(
-    val code: String,
-    val galleryInfo: OldGalleryInfo
-)
-
-@Serializable
-data class OldGalleryInfo(
-    val language_localname: String? = null,
-    val language: String? = null,
-    val date: String? = null,
-    val files: List<OldGalleryFiles>,
-    val id: Int? = null,
-    val type: String? = null,
-    val title: String? = null
-)
-
-@Serializable
-data class OldGalleryFiles(
-    val width: Int,
-    val hash: String,
-    val haswebp: Int = 0,
-    val name: String,
-    val height: Int,
-    val hasavif: Int = 0,
-    val hasavifsmalltn: Int? = 0
-)
-
-@Serializable
-data class OldMetadata(
-    var galleryBlock: GalleryBlock? = null,
-    var reader: OldReader? = null,
-    var imageList: MutableList<String?>? = null
-) {
-    fun copy(): OldMetadata = OldMetadata(galleryBlock, reader, imageList?.let { MutableList(it.size) { i -> it[i] } })
-}
-
-@Serializable
-data class Metadata(
-    var galleryBlock: GalleryBlock? = null,
-    var galleryInfo: GalleryInfo? = null,
-    var imageList: MutableList<String?>? = null
-) {
-    constructor(old: OldMetadata) : this(
-        old.galleryBlock,
-        old.reader?.galleryInfo?.let { oldGalleryInfo ->
-            GalleryInfo(
-                oldGalleryInfo.id.toString(),
-                oldGalleryInfo.title ?: "",
-                null,
-                oldGalleryInfo.language,
-                oldGalleryInfo.type ?: "",
-                oldGalleryInfo.date ?: "",
-                files = oldGalleryInfo.files.map {
-                    GalleryFiles(
-                        it.width,
-                        it.hash,
-                        it.haswebp,
-                        it.name,
-                        it.height,
-                        it.hasavif,
-                        it.hasavifsmalltn
-                    )
-                }
-            )
-        },
-        old.imageList
-    )
-
-    fun copy(): Metadata = Metadata(galleryBlock, galleryInfo, imageList?.let { MutableList(it.size) { i -> it[i] } })
-}
-
-class Cache private constructor(context: Context, val galleryID: Int) : ContextWrapper(context) {
-    companion object {
-        val instances = ConcurrentHashMap<Int, Cache>()
-
-        fun getInstance(context: Context, galleryID: Int) =
-            instances[galleryID] ?: synchronized(this) {
-                instances[galleryID] ?: Cache(context, galleryID).also { instances.put(galleryID, it) }
-            }
-
-        @Synchronized
-        fun delete(context: Context, galleryID: Int) {
-            File(context.cacheDir, "imageCache/$galleryID").deleteRecursively()
-            instances.remove(galleryID)
-        }
-    }
-
-    init {
-        cacheFolder.mkdirs()
-    }
-
-    var metadata = kotlin.runCatching {
-        findFile(".metadata")?.readText()?.let { metadata ->
-            kotlin.runCatching {
-                Json.decodeFromString<Metadata>(metadata)
-            }.getOrElse {
-                Metadata(json.decodeFromString<OldMetadata>(metadata))
-            }
-        }
-    }.onFailure { it.printStackTrace() }.getOrNull() ?: Metadata()
-
-    val downloadFolder: FileX?
-        get() = DownloadManager.getInstance(this).getDownloadFolder(galleryID)
-
-    val cacheFolder: FileX
-        get() = FileX(this, cacheDir, "imageCache/$galleryID").also {
-            if (!it.exists())
-                it.mkdirs()
-        }
-
-    fun findFile(fileName: String): FileX? =
-         downloadFolder?.let { downloadFolder -> downloadFolder.getChild(fileName).let {
-            if (it.exists()) it else null
-        } } ?: cacheFolder.getChild(fileName).let {
-            if (it.exists()) it else null
-        }
-
-    @Suppress("BlockingMethodInNonBlockingContext")
-    fun setMetadata(change: (Metadata) -> Unit) {
-        change.invoke(metadata)
-
-        val file = cacheFolder.getChild(".metadata")
-
-        kotlin.runCatching {
-            if (!file.exists()) {
-                file.createNewFile()
-            }
-            file.writeText(Json.encodeToString(metadata))
-        }
-    }
-
-    suspend fun getGalleryBlock(): GalleryBlock? {
-        return metadata.galleryBlock
-            ?: withContext(Dispatchers.IO) {
-                try {
-                    getGalleryBlock(galleryID).also {
-                        setMetadata { metadata -> metadata.galleryBlock = it }
-                    }
-                } catch (e: Exception) { return@withContext null }
-            }
-    }
-
-    @Suppress("BlockingMethodInNonBlockingContext")
-    suspend fun getThumbnail(): Uri =
-        findFile(".thumbnail")?.uri
-            ?: getGalleryBlock()?.thumbnails?.firstOrNull()?.let { withContext(Dispatchers.IO) {
-                kotlin.runCatching {
-                    val request = Request.Builder()
-                        .url(it)
-                        .header("Referer", "https://hitomi.la/")
-                        .build()
-
-                    client.newCall(request).execute().also { if (it.code() != 200) throw IOException() }.body()?.use { it.bytes() }
-                }.getOrNull()?.let { thumbnail -> kotlin.runCatching {
-                    cacheFolder.getChild(".thumbnail").also {
-                        if (!it.exists())
-                            it.createNewFile()
-
-                        it.writeBytes(thumbnail)
-                    }
-                }.getOrNull()?.uri }
-            } } ?: Uri.EMPTY
-
-    suspend fun getGalleryInfo(): GalleryInfo? {
-
-        return metadata.galleryInfo
-            ?: withContext(Dispatchers.IO) {
-                try {
-                    getGalleryInfo(galleryID).also {
-                        setMetadata { metadata ->
-                            metadata.galleryInfo = it
-
-                            if (metadata.imageList == null)
-                                metadata.imageList = MutableList(it.files.size) { null }
-                        }
-                    }
-                } catch (e: Exception) {
-                    null
-                }
-            }
-    }
-
-    fun getImage(index: Int): FileX? =
-        metadata.imageList?.getOrNull(index)?.let { findFile(it) }
-
-    @Suppress("BlockingMethodInNonBlockingContext")
-    suspend fun putImage(index: Int, fileName: String, data: ByteArray) = coroutineScope {
-        val file = cacheFolder.getChild(fileName)
-
-        if (!file.exists())
-            file.createNewFile()
-
-        file.writeBytes(data)
-        setMetadata { metadata -> metadata.imageList!![index] = fileName }
-    }
-
-    private val lock = ConcurrentHashMap<Int, Mutex>()
-    @Suppress("BlockingMethodInNonBlockingContext")
-    fun moveToDownload() = CoroutineScope(Dispatchers.IO).launch {
-        val downloadFolder = downloadFolder ?: return@launch
-
-        if (lock[galleryID]?.isLocked == true)
-            return@launch
-
-        (lock[galleryID] ?: Mutex().also { lock[galleryID] = it }).withLock {
-            val cacheMetadata = cacheFolder.getChild(".metadata")
-            val downloadMetadata = downloadFolder.getChild(".metadata")
-
-            if (!cacheMetadata.exists())
-                return@launch
-
-            if (cacheMetadata.exists()) {
-                kotlin.runCatching {
-                    if (!downloadMetadata.exists())
-                        downloadMetadata.createNewFile()
-
-                    downloadMetadata.writeText(Json.encodeToString(metadata))
-                }
-            }
-
-            val cacheThumbnail = cacheFolder.getChild(".thumbnail")
-            val downloadThumbnail = downloadFolder.getChild(".thumbnail")
-
-            if (cacheThumbnail.exists()) {
-                kotlin.runCatching {
-                    if (!downloadThumbnail.exists())
-                        downloadThumbnail.createNewFile()
-
-                    downloadThumbnail.outputStream()?.use { target -> target.channel.truncate(0L); cacheThumbnail.inputStream()?.use { source ->
-                        source.copyTo(target)
-                    } }
-                    cacheThumbnail.delete()
-                }
-            }
-
-            metadata.imageList?.forEach { imageName ->
-                imageName ?: return@forEach
-                val target = downloadFolder.getChild(imageName)
-                val source = cacheFolder.getChild(imageName)
-
-                if (!source.exists())
-                    return@forEach
-
-                kotlin.runCatching {
-                    if (!target.exists())
-                        target.createNewFile()
-
-                    target.outputStream()?.use { target -> target.channel.truncate(0L); source.inputStream()?.use { source ->
-                        source.copyTo(target)
-                    } }
-                }
-            }
-
-            cacheFolder.deleteRecursively()
-        }
-    }
-}

app/src/main/java/xyz/quaver/pupil/util/downloader/DownloadManager.kt

@@ -1,127 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.util.downloader
-
-import android.content.Context
-import android.content.ContextWrapper
-import android.util.Log
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-import okhttp3.Call
-import xyz.quaver.io.FileX
-import xyz.quaver.io.util.deleteRecursively
-import xyz.quaver.io.util.getChild
-import xyz.quaver.io.util.readText
-import xyz.quaver.io.util.writeText
-import xyz.quaver.pupil.client
-import xyz.quaver.pupil.services.DownloadService
-import xyz.quaver.pupil.util.Preferences
-import xyz.quaver.pupil.util.formatDownloadFolder
-
-class DownloadManager private constructor(context: Context) : ContextWrapper(context) {
-
-    companion object {
-        @Volatile private var instance: DownloadManager? = null
-
-        fun getInstance(context: Context) =
-            instance ?: synchronized(this) {
-                instance ?: DownloadManager(context).also { instance = it }
-            }
-    }
-
-    val defaultDownloadFolder = FileX(this, getExternalFilesDir(null)!!)
-
-    val downloadFolder: FileX
-        get() = kotlin.runCatching {
-            FileX(this, Preferences.get<String>("download_folder"))
-        }.getOrElse {
-            Preferences["download_folder"] = defaultDownloadFolder.uri.toString()
-            defaultDownloadFolder
-        }
-
-    private var prevDownloadFolder: FileX? = null
-    private var downloadFolderMapInstance: MutableMap<Int, String>? = null
-    val downloadFolderMap: MutableMap<Int, String>
-        @Synchronized
-        get() {
-            if (prevDownloadFolder != downloadFolder) {
-                prevDownloadFolder = downloadFolder
-                downloadFolderMapInstance = run {
-                    val file = downloadFolder.getChild(".download")
-                    val data = if (file.exists())
-                        kotlin.runCatching {
-                            file.readText()?.let{ Json.decodeFromString<MutableMap<Int, String>>(it) }
-                        }.onFailure { file.delete() }.getOrNull()
-                    else
-                        null
-                    data ?: run {
-                        file.createNewFile()
-                        mutableMapOf()
-                    }
-                }
-            }
-
-            return downloadFolderMapInstance ?: mutableMapOf()
-        }
-
-
-    @Synchronized
-    fun isDownloading(galleryID: Int): Boolean {
-        val isThisGallery: (Call) -> Boolean = { !it.isCanceled && (it.request().tag() as? DownloadService.Tag)?.galleryID == galleryID }
-
-        return downloadFolderMap.containsKey(galleryID)
-                && client.dispatcher().let { it.queuedCalls().any(isThisGallery) || it.runningCalls().any(isThisGallery) }
-    }
-
-    @Synchronized
-    fun getDownloadFolder(galleryID: Int): FileX? =
-        downloadFolderMap[galleryID]?.let { downloadFolder.getChild(it) }
-
-    fun addDownloadFolder(galleryID: Int) = CoroutineScope(Dispatchers.IO).launch {
-        val name = Cache.getInstance(this@DownloadManager, galleryID).getGalleryBlock()
-            ?.formatDownloadFolder() ?: return@launch
-
-        val folder = downloadFolder.getChild(name)
-
-        downloadFolderMap[galleryID] = name
-
-        downloadFolder.getChild(".download").let { if (!it.exists()) it.createNewFile() }
-        downloadFolder.getChild(".download").writeText(Json.encodeToString(downloadFolderMap))
-
-        if (folder.exists()) return@launch
-        folder.mkdir()
-    }
-
-    @Synchronized
-    fun deleteDownloadFolder(galleryID: Int) {
-        downloadFolderMap[galleryID]?.let {
-            kotlin.runCatching {
-                downloadFolder.getChild(it).deleteRecursively()
-                downloadFolderMap.remove(galleryID)
-
-                downloadFolder.getChild(".download").let { if (!it.exists()) it.createNewFile() }
-                downloadFolder.getChild(".download").writeText(Json.encodeToString(downloadFolderMap))
-            }
-        }
-    }
-}

app/src/main/java/xyz/quaver/pupil/util/file.kt

@@ -1,67 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.util
-
-import android.content.Context
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import xyz.quaver.pupil.histories
-import xyz.quaver.pupil.util.downloader.Cache
-import xyz.quaver.pupil.util.downloader.DownloadManager
-import java.io.File
-
-val mutex = Mutex()
-fun cleanCache(context: Context) = CoroutineScope(Dispatchers.IO).launch {
-    if (mutex.isLocked) return@launch
-
-    mutex.withLock {
-        val cacheFolder = File(context.cacheDir, "imageCache")
-        val downloadManager = DownloadManager.getInstance(context)
-
-        val limit = (Preferences.get<String>("cache_limit").toLongOrNull() ?: 0L)*1024*1024*1024
-
-        if (limit == 0L) return@withLock
-
-        val cacheSize = {
-            var size = 0L
-
-            cacheFolder.walk().forEach {
-                size += it.length()
-            }
-
-            size
-        }
-
-        if (cacheSize.invoke() > limit)
-            while (cacheSize.invoke() > limit/2) {
-                val caches = cacheFolder.list() ?: return@withLock
-
-                synchronized(histories) {
-                    (histories.firstOrNull {
-                        caches.contains(it.toString()) && !downloadManager.isDownloading(it)
-                    } ?: return@withLock).let {
-                        Cache.delete(context, it)
-                    }
-                }
-            }
-    }
-}

app/src/main/java/xyz/quaver/pupil/util/lock.kt

@@ -1,124 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.util
-
-import android.content.Context
-import android.content.ContextWrapper
-import androidx.core.content.ContextCompat
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-import java.io.File
-import java.security.MessageDigest
-
-fun hash(password: String): String {
-    val bytes = password.toByteArray()
-    val md = MessageDigest.getInstance("SHA-256")
-
-    return md.digest(bytes).fold("") { str, it -> str + "%02x".format(it) }
-}
-
-// Ret1: SHA-256 Hash
-// Ret2: Hash salt
-fun hashWithSalt(password: String): Pair<String, String> {
-    val salt = (0 until 12).map { source.random() }.joinToString()
-
-    return Pair(hash(password+salt), salt)
-}
-
-const val source = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
-
-@Serializable
-data class Lock(val type: Type, val hash: String, val salt: String) {
-
-    enum class Type {
-        PATTERN,
-        PIN,
-        PASSWORD
-    }
-
-    companion object {
-        fun generate(type: Type, password: String): Lock {
-            val (hash, salt) = hashWithSalt(password)
-            return Lock(type, hash, salt)
-        }
-    }
-
-    fun match(password: String): Boolean {
-        return hash(password+salt) == hash
-    }
-}
-
-class LockManager(base: Context): ContextWrapper(base) {
-
-    var locks: ArrayList<Lock>? = null
-
-    init {
-        load()
-    }
-
-    private fun load() {
-        val lock = File(ContextCompat.getDataDir(this), "lock.json")
-
-        if (!lock.exists()) {
-            lock.createNewFile()
-            lock.writeText("[]")
-        }
-
-        locks = Json.decodeFromString(lock.readText())
-    }
-
-    private fun save() {
-        val lock = File(ContextCompat.getDataDir(this), "lock.json")
-
-        if (!lock.exists())
-            lock.createNewFile()
-
-        lock.writeText(Json.encodeToString(locks?.toList() ?: listOf()))
-    }
-
-    fun add(lock: Lock) {
-        remove(lock.type)
-        locks?.add(lock)
-        save()
-    }
-
-    fun remove(type: Lock.Type) {
-        locks?.removeAll { it.type == type }
-        save()
-    }
-
-    fun check(password: String): Boolean? {
-        return locks?.any {
-            it.match(password)
-        }
-    }
-
-    fun isEmpty(): Boolean {
-        return locks.isNullOrEmpty()
-    }
-
-    fun isNotEmpty(): Boolean = !isEmpty()
-
-    fun contains(type: Lock.Type): Boolean {
-        return locks?.any { it.type == type } ?: false
-    }
-
-}

app/src/main/java/xyz/quaver/pupil/util/misc.kt

@@ -1,205 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.util
-
-import android.Manifest
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.content.Context
-import android.content.pm.PackageManager
-import android.os.Build
-import androidx.activity.result.ActivityResultLauncher
-import androidx.appcompat.app.AlertDialog
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import kotlinx.serialization.json.JsonElement
-import kotlinx.serialization.json.contentOrNull
-import kotlinx.serialization.json.jsonArray
-import kotlinx.serialization.json.jsonObject
-import kotlinx.serialization.json.jsonPrimitive
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import xyz.quaver.pupil.R
-import xyz.quaver.pupil.hitomi.GalleryBlock
-import xyz.quaver.pupil.hitomi.GalleryInfo
-import xyz.quaver.pupil.hitomi.imageUrlFromImage
-import java.util.Locale
-
-@OptIn(ExperimentalStdlibApi::class)
-fun String.wordCapitalize(): String {
-    val result = ArrayList<String>()
-
-    @SuppressLint("DefaultLocale")
-    for (word in this.split(" "))
-        result.add(word.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.US) else it.toString() })
-
-    return result.joinToString(" ")
-}
-
-private val suffix = listOf(
-    "B",
-    "kB",
-    "MB",
-    "GB",
-    "TB" //really?
-)
-
-fun byteToString(byte: Long, precision: Int = 1): String {
-    var size = byte.toDouble()
-    var suffixIndex = 0
-
-    while (size >= 1024) {
-        size /= 1024
-        suffixIndex++
-    }
-
-    return "%.${precision}f ${suffix[suffixIndex]}".format(size)
-}
-
-/**
- * Convert android generated ID to requestCode
- * to prevent java.lang.IllegalArgumentException: Can only use lower 16 bits for requestCode
- *
- * https://stackoverflow.com/questions/38072322/generate-16-bit-unique-ids-in-android-for-startactivityforresult
- */
-fun Int.normalizeID() = this.and(0xFFFF)
-
-fun OkHttpClient.Builder.proxyInfo(proxyInfo: ProxyInfo) = this.apply {
-    proxy(proxyInfo.proxy())
-    proxyInfo.authenticator()?.let {
-        proxyAuthenticator(it)
-    }
-}
-
-val formatMap = mapOf<String, GalleryBlock.() -> (String)>(
-    "-id-" to { id.toString() },
-    "-title-" to { title },
-    "-artist-" to { if (artists.isNotEmpty()) artists.joinToString() else "N/A" },
-    "-group-" to { if (groups.isNotEmpty()) groups.joinToString() else "N/A" }
-    // TODO
-)
-
-/**
- * Formats download folder name with given Metadata
- */
-fun GalleryBlock.formatDownloadFolder(): String =
-    Preferences["download_folder_name", "[-id-] -title-"].let {
-        formatMap.entries.fold(it) { str, (k, v) ->
-            str.replace(k, v.invoke(this), true)
-        }
-    }.replace(Regex("""[*\\|"?><:/]"""), "").ellipsize(127)
-
-fun GalleryBlock.formatDownloadFolderTest(format: String): String =
-    format.let {
-        formatMap.entries.fold(it) { str, (k, v) ->
-            str.replace(k, v.invoke(this), true)
-        }
-    }.replace(Regex("""[*\\|"?><:/]"""), "").ellipsize(127)
-
-suspend fun GalleryInfo.getRequestBuilders(): List<Request.Builder> {
-    val galleryID = this.id.toIntOrNull() ?: 0
-    return this.files.map {
-        Request.Builder()
-            .url(
-                runCatching {
-                    imageUrlFromImage(galleryID, it, false)
-                }
-                    .onFailure {
-                        FirebaseCrashlytics.getInstance().recordException(it)
-                    }
-                    .getOrDefault("https://a/")
-            )
-            .header("Referer", "https://hitomi.la/")
-    }
-}
-
-fun byteCount(codePoint: Int): Int = when (codePoint) {
-    in 0..<0x80 -> 1
-    in 0x80..<0x800 -> 2
-    in 0x800..<0x10000 -> 3
-    in 0x10000..<0x110000 -> 4
-    else -> 0
-}
-
-fun String.ellipsize(n: Int): String = buildString {
-    var count = 0
-    var index = 0
-    val codePointLength = this@ellipsize.codePointCount(0, this@ellipsize.length)
-
-    while (index < codePointLength) {
-        val nextCodePoint = this@ellipsize.codePointAt(index)
-        val nextByte = byteCount(nextCodePoint)
-        if (count + nextByte > 124) {
-            append("…")
-            break
-        }
-        appendCodePoint(nextCodePoint)
-        count += nextByte
-        index++
-    }
-
-}
-
-operator fun JsonElement.get(index: Int) =
-    this.jsonArray[index]
-
-operator fun JsonElement.get(tag: String) =
-    this.jsonObject[tag]
-
-fun JsonElement.getOrNull(tag: String) = kotlin.runCatching {
-    this.jsonObject.getOrDefault(tag, null)
-}.getOrNull()
-
-val JsonElement.content
-    get() = this.jsonPrimitive.contentOrNull
-
-fun checkNotificationEnabled(context: Context) =
-    Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU ||
-            ContextCompat.checkSelfPermission(
-                context,
-                Manifest.permission.POST_NOTIFICATIONS
-            ) == PackageManager.PERMISSION_GRANTED
-
-fun showNotificationPermissionExplanationDialog(context: Context) {
-    AlertDialog.Builder(context)
-        .setTitle(R.string.warning)
-        .setMessage(R.string.notification_denied)
-        .setPositiveButton(android.R.string.ok) { _, _ -> }
-        .show()
-}
-
-fun requestNotificationPermission(
-    activity: Activity,
-    requestPermissionLauncher: ActivityResultLauncher<String>,
-    showRationale: Boolean = true,
-    ifGranted: () -> Unit = { },
-) {
-    when {
-        checkNotificationEnabled(activity) -> ifGranted()
-        showRationale && ActivityCompat.shouldShowRequestPermissionRationale(
-            activity,
-            Manifest.permission.POST_NOTIFICATIONS
-        ) ->
-            showNotificationPermissionExplanationDialog(activity)
-
-        else ->
-            requestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
-    }
-}

app/src/main/java/xyz/quaver/pupil/util/proxy.kt

@@ -1,58 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.util
-
-import android.content.Context
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-import okhttp3.Authenticator
-import okhttp3.Credentials
-import java.net.InetSocketAddress
-import java.net.Proxy
-
-@Serializable
-data class ProxyInfo(
-    val type: Proxy.Type,
-    val host: String? = null,
-    val port: Int? = null,
-    val username: String? = null,
-    val password: String? = null
-) {
-    fun proxy() : Proxy {
-        return if (host.isNullOrBlank() || port == null)
-            return Proxy.NO_PROXY
-        else
-            Proxy(type, InetSocketAddress.createUnresolved(host, port))
-    }
-
-    fun authenticator(): Authenticator? = if (username.isNullOrBlank() || password.isNullOrBlank()) null else
-            Authenticator { _, response ->
-                val credential = Credentials.basic(username, password)
-
-                response.request().newBuilder()
-                    .header("Proxy-Authorization", credential)
-                    .build()
-            }
-
-}
-
-fun getProxyInfo(): ProxyInfo =
-    Json.decodeFromString(Preferences["proxy", Json.encodeToString(ProxyInfo(Proxy.Type.DIRECT))])

app/src/main/java/xyz/quaver/pupil/util/translation.kt

@@ -1,68 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2020  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.util
-
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.jsonArray
-import kotlinx.serialization.json.jsonPrimitive
-import okhttp3.Request
-import xyz.quaver.pupil.client
-import java.io.IOException
-import java.util.*
-
-private val filesURL = "https://api.github.com/repos/tom5079/Pupil/git/trees/tags"
-private val contentURL = "https://raw.githubusercontent.com/tom5079/Pupil/tags/"
-
-var translations: Map<String, String> = run {
-    updateTranslations()
-    emptyMap()
-}
-    private set
-
-@Suppress("BlockingMethodInNonBlockingContext")
-fun updateTranslations() = CoroutineScope(Dispatchers.IO).launch {
-    translations = emptyMap()
-    kotlin.runCatching {
-        translations = Json.decodeFromString<Map<String, String>>(client.newCall(
-            Request.Builder()
-                .url(contentURL + "${Preferences["tag_translation", ""].let { if (it.isEmpty()) Locale.getDefault().language else it }}.json")
-                .build()
-        ).execute().also { if (it.code() != 200) return@launch }.body()?.use { it.string() } ?: return@launch).filterValues { it.isNotEmpty() }
-    }
-}
-
-fun getAvailableLanguages(): List<String> {
-    val languages = Locale.getISOLanguages()
-
-    val json = Json.parseToJsonElement(client.newCall(
-        Request.Builder()
-            .url(filesURL)
-            .build()
-    ).execute().also { if (it.code() != 200) throw IOException() }.body()?.use { it.string() } ?: return emptyList())
-
-    return listOf("en") + (json["tree"]?.jsonArray?.mapNotNull {
-        val name = it["path"]?.jsonPrimitive?.content?.takeWhile { c -> c != '.' }
-
-        languages.firstOrNull { code -> code.equals(name, ignoreCase = true) }
-    } ?: emptyList())
-}

app/src/main/java/xyz/quaver/pupil/util/update.kt

@@ -1,214 +0,0 @@
-/*
- *     Pupil, Hitomi.la viewer for Android
- *     Copyright (C) 2019  tom5079
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package xyz.quaver.pupil.util
-
-import android.app.DownloadManager
-import android.content.Context
-import android.net.Uri
-import android.webkit.URLUtil
-import androidx.appcompat.app.AlertDialog
-import androidx.preference.PreferenceManager
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.serialization.json.*
-import okhttp3.Call
-import okhttp3.Callback
-import okhttp3.Request
-import okhttp3.Response
-import ru.noties.markwon.Markwon
-import xyz.quaver.pupil.*
-import xyz.quaver.pupil.types.Tag
-import java.io.File
-import java.io.IOException
-import java.net.URL
-import java.util.*
-
-fun getReleases(url: String) : JsonArray {
-    return try {
-        URL(url).readText().let {
-            Json.parseToJsonElement(it).jsonArray
-        }
-    } catch (e: Exception) {
-        JsonArray(emptyList())
-    }
-}
-
-fun checkUpdate(url: String) : JsonObject? {
-    val releases = getReleases(url)
-
-    if (releases.isEmpty())
-        return null
-
-    return releases.firstOrNull {
-        Preferences["beta"] || it.jsonObject["prerelease"]?.jsonPrimitive?.booleanOrNull == false
-    }?.let {
-        if (it.jsonObject["tag_name"]?.jsonPrimitive?.contentOrNull == BuildConfig.VERSION_NAME)
-            null
-        else
-            it.jsonObject
-    }
-}
-
-fun getApkUrl(releases: JsonObject) : String? {
-    return releases["assets"]?.jsonArray?.firstOrNull {
-        Regex("Pupil-v.+\\.apk").matches(it.jsonObject["name"]?.jsonPrimitive?.contentOrNull ?: "")
-    }.let {
-        it?.jsonObject?.get("browser_download_url")?.jsonPrimitive?.contentOrNull
-    }
-}
-
-fun checkUpdate(context: Context, force: Boolean = false) {
-
-    val preferences = PreferenceManager.getDefaultSharedPreferences(context)
-    val ignoreUpdateUntil = preferences.getLong("ignore_update_until", 0)
-
-    if (!force && ignoreUpdateUntil > System.currentTimeMillis())
-        return
-
-    fun extractReleaseNote(update: JsonObject, locale: Locale) : String {
-        val markdown = update["body"]!!.jsonPrimitive.content
-
-        val target = when(locale.language) {
-            "ko" -> "한국어"
-            "ja" -> "日本語"
-            else -> "English"
-        }
-
-        val releaseNote = Regex("^# Release Note.+$")
-        val language = Regex("^## $target$")
-        val end = Regex("^#.+$")
-
-        var releaseNoteFlag = false
-        var languageFlag = false
-
-        val result = StringBuilder()
-
-        for(line in markdown.lines()) {
-            if (releaseNote.matches(line)) {
-                releaseNoteFlag = true
-                continue
-            }
-
-            if (releaseNoteFlag) {
-                if (language.matches(line)) {
-                    languageFlag = true
-                    continue
-                }
-            }
-
-            if (languageFlag) {
-                if (end.matches(line))
-                    break
-
-                result.append(line+"\n")
-            }
-        }
-
-        return context.getString(R.string.update_release_note, update["tag_name"]?.jsonPrimitive?.contentOrNull, result.toString())
-    }
-
-    CoroutineScope(Dispatchers.Default).launch {
-        val update =
-            checkUpdate(context.getString(R.string.release_url)) ?: return@launch
-
-        val url = getApkUrl(update) ?: return@launch
-
-        val dialog = AlertDialog.Builder(context).apply {
-            setTitle(R.string.update_title)
-            val msg = extractReleaseNote(update, Locale.getDefault())
-            setMessage(Markwon.create(context).toMarkdown(msg))
-            setPositiveButton(android.R.string.ok) { _, _ ->
-                if (!checkNotificationEnabled(context)) {
-                    showNotificationPermissionExplanationDialog(context)
-                    return@setPositiveButton
-                }
-
-                val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-
-                //Cancel any download queued before
-
-                val id: Long = Preferences["update_download_id"]
-
-                if (id != -1L)
-                    downloadManager.remove(id)
-
-                val target = File(context.getExternalFilesDir(null), "Pupil.apk").also {
-                    it.delete()
-                }
-
-                val request = DownloadManager.Request(Uri.parse(url))
-                    .setTitle(context.getText(R.string.update_notification_description))
-                    .setDestinationUri(Uri.fromFile(target))
-
-                downloadManager.enqueue(request).also {
-                    Preferences["update_download_id"] = it
-                }
-            }
-            setNegativeButton(if (force) android.R.string.cancel else R.string.ignore) { _, _ ->
-                if (!force)
-                    preferences.edit()
-                        .putLong("ignore_update_until", System.currentTimeMillis() + 86400000)
-                        .apply()
-            }
-        }
-
-        launch(Dispatchers.Main) {
-            dialog.show()
-        }
-    }
-}
-
-fun restore(url: String, onFailure: ((Throwable) -> Unit)? = null, onSuccess: ((Int) -> Unit)? = null) {
-    if (!URLUtil.isValidUrl(url)) {
-        onFailure?.invoke(IllegalArgumentException())
-        return
-    }
-
-    val request = Request.Builder()
-        .url(url)
-        .get()
-        .build()
-
-    client.newCall(request).enqueue(object: Callback {
-        override fun onFailure(call: Call, e: IOException) {
-            onFailure?.invoke(e)
-        }
-
-        override fun onResponse(call: Call, response: Response) {
-            kotlin.runCatching {
-                val data = Json.parseToJsonElement(response.also { if (it.code() != 200) throw IOException() }.body().use { it?.string() } ?: "[]")
-
-                when (data) {
-                    is JsonArray -> favorites.addAll(data.map { it.jsonPrimitive.int })
-                    is JsonObject -> {
-                        val newFavorites = data["favorites"]?.let { Json.decodeFromJsonElement<List<Int>>(it) }.orEmpty()
-                        val newFavoriteTags = data["favorite_tags"]?.let { Json.decodeFromJsonElement<List<Tag>>(it) }.orEmpty()
-
-                        favorites.addAll(newFavorites)
-                        favoriteTags.addAll(newFavoriteTags)
-
-                        onSuccess?.invoke(favorites.size + favoriteTags.size)
-                    }
-                    else -> error("data is neither JsonArray or JsonObject")
-                }
-            }.onFailure { onFailure?.invoke(it) }
-        }
-    })
-}

app/src/main/res/anim/shake.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~     Pupil, Hitomi.la viewer for Android
-  ~     Copyright (C) 2020  tom5079
-  ~
-  ~     This program is free software: you can redistribute it and/or modify
-  ~     it under the terms of the GNU General Public License as published by
-  ~     the Free Software Foundation, either version 3 of the License, or
-  ~     (at your option) any later version.
-  ~
-  ~     This program is distributed in the hope that it will be useful,
-  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~     GNU General Public License for more details.
-  ~
-  ~     You should have received a copy of the GNU General Public License
-  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="300"
-    android:fromXDelta="0"
-    android:interpolator="@anim/shake_cycle"
-    android:toXDelta="10" />

app/src/main/res/anim/shake_cycle.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~     Pupil, Hitomi.la viewer for Android
-  ~     Copyright (C) 2020  tom5079
-  ~
-  ~     This program is free software: you can redistribute it and/or modify
-  ~     it under the terms of the GNU General Public License as published by
-  ~     the Free Software Foundation, either version 3 of the License, or
-  ~     (at your option) any later version.
-  ~
-  ~     This program is distributed in the hope that it will be useful,
-  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~     GNU General Public License for more details.
-  ~
-  ~     You should have received a copy of the GNU General Public License
-  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<cycleInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:cycles="3" />

app/src/main/res/color/lock_fab.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~     Pupil, Hitomi.la viewer for Android
-  ~     Copyright (C) 2020  tom5079
-  ~
-  ~     This program is free software: you can redistribute it and/or modify
-  ~     it under the terms of the GNU General Public License as published by
-  ~     the Free Software Foundation, either version 3 of the License, or
-  ~     (at your option) any later version.
-  ~
-  ~     This program is distributed in the hope that it will be useful,
-  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~     GNU General Public License for more details.
-  ~
-  ~     You should have received a copy of the GNU General Public License
-  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" android:color="@android:color/darker_gray"/>
-    <item android:color="@color/colorPrimary"/>
-</selector>