user01/Pupil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
tom5079
2024-04-15 18:19:49 -07:00
parent 03b88c5b4b
commit b0e194898e
17 changed files with 632 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/res/drawable/check.xml Normal file
View File

@@ -0,0 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M9,12.75 L11.25,15 15,9.75M21,12a9,9 0,1 1,-18 0,9 9,0 0,1 18,0Z"
android:strokeLineJoin="round"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="@color/colorPrimaryDark"
android:strokeLineCap="round"/>
</vector>

13
app/src/main/res/drawable/download.xml Normal file
View File

@@ -0,0 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M3,16.5v2.25A2.25,2.25 0,0 0,5.25 21h13.5A2.25,2.25 0,0 0,21 18.75V16.5M16.5,12 L12,16.5m0,0L7.5,12m4.5,4.5V3"
android:strokeLineJoin="round"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="@color/material_blue_700"
android:strokeLineCap="round"/>
</vector>

13
app/src/main/res/drawable/heart.xml Normal file
View File

@@ -0,0 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M21,8.25c0,-2.485 -2.099,-4.5 -4.688,-4.5 -1.935,0 -3.597,1.126 -4.312,2.733 -0.715,-1.607 -2.377,-2.733 -4.313,-2.733C5.1,3.75 3,5.765 3,8.25c0,7.22 9,12 9,12s9,-4.78 9,-12Z"
android:strokeLineJoin="round"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="@color/material_pink_600"
android:strokeLineCap="round"/>
</vector>

9
app/src/main/res/drawable/history_rounded.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="@color/material_orange_500"
android:pathData="M477,840q-142,0 -243.5,-95.5T121,509q-1,-12 7.5,-21t21.5,-9q12,0 20.5,8.5T181,509q11,115 95,193t201,78q127,0 215,-89t88,-216q0,-124 -89,-209.5T477,180q-68,0 -127.5,31T246,293h75q13,0 21.5,8.5T351,323q0,13 -8.5,21.5T321,353L172,353q-13,0 -21.5,-8.5T142,323v-148q0,-13 8.5,-21.5T172,145q13,0 21.5,8.5T202,175v76q52,-61 123.5,-96T477,120q75,0 141,28t115.5,76.5Q783,273 811.5,338T840,478q0,75 -28.5,141t-78,115Q684,783 618,811.5T477,840ZM511,466 L626,579q9,9 9,21.5t-9,21.5q-9,9 -21,9t-21,-9L460,500q-5,-5 -7,-10.5t-2,-11.5v-171q0,-13 8.5,-21.5T481,277q13,0 21.5,8.5T511,307v159Z"/>
</vector>

28
app/src/main/res/layout/transfer_connected_fragment.xml Normal file
View File

@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginTop="48dp"
app:srcCompat="@drawable/check"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
<TextView
android:id="@+id/textView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="Device connected"
android:textAlignment="center"
android:textSize="28sp"
android:textStyle="bold"
app:layout_constraintTop_toBottomOf="@id/icon" />
</androidx.constraintlayout.widget.ConstraintLayout>

196
app/src/main/res/layout/transfer_select_data_fragment.xml Normal file
View File

@@ -0,0 +1,196 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginTop="48dp"
app:srcCompat="@drawable/check"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
<TextView
android:id="@+id/textView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="Choose data to transfer"
android:textAlignment="center"
android:textSize="28sp"
android:textStyle="bold"
app:layout_constraintTop_toBottomOf="@id/icon" />
<CheckBox
android:id="@+id/check_all"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/textView"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="32dp"
android:layout_marginTop="32dp" />
<TextView
android:id="@+id/check_all_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="All"
app:layout_constraintTop_toBottomOf="@id/check_all"
app:layout_constraintLeft_toLeftOf="@id/check_all"
app:layout_constraintRight_toRightOf="@id/check_all"
android:layout_marginTop="-8dp"/>
<TextView
android:id="@+id/selected_count"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:text="3 items selected"
android:textStyle="bold"
android:textSize="24sp"
android:gravity="center_vertical"
app:layout_constraintTop_toTopOf="@id/check_all"
app:layout_constraintBottom_toTopOf="@id/selected_size"
app:layout_constraintStart_toEndOf="@id/check_all" />
<TextView
android:id="@+id/selected_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="37.8 GB / About 28 minutes"
android:gravity="center_vertical"
app:layout_constraintTop_toTopOf="@id/check_all_label"
app:layout_constraintBottom_toBottomOf="@id/check_all_label"
app:layout_constraintStart_toStartOf="@id/selected_count" />
<View
android:id="@+id/divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?android:attr/dividerHorizontal"
app:layout_constraintTop_toBottomOf="@id/check_all_label"
android:layout_marginVertical="16dp"
android:layout_marginHorizontal="16dp"/>
<CheckBox
android:id="@+id/check_favorites"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/divider"
app:layout_constraintLeft_toLeftOf="parent"
android:layout_marginStart="32dp"
android:layout_marginTop="32dp"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/favorites_icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_margin="16dp"
app:srcCompat="@drawable/heart"
app:layout_constraintStart_toEndOf="@id/check_favorites"
app:layout_constraintTop_toTopOf="@id/check_favorites"
app:layout_constraintBottom_toBottomOf="@id/check_favorites"/>
<TextView
android:id="@+id/favorites_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Favorites"
android:textSize="28sp"
app:layout_constraintTop_toTopOf="@id/favorites_icon"
app:layout_constraintBottom_toTopOf="@id/favorites_count"
app:layout_constraintStart_toEndOf="@id/favorites_icon"
android:layout_marginStart="16dp" />
<TextView
android:id="@+id/favorites_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="275 items"
app:layout_constraintTop_toBottomOf="@id/favorites_label"
app:layout_constraintBottom_toBottomOf="@id/favorites_icon"
app:layout_constraintStart_toStartOf="@id/favorites_label" />
<CheckBox
android:id="@+id/check_history"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/check_favorites"
app:layout_constraintLeft_toLeftOf="parent"
android:layout_marginStart="32dp"
android:layout_marginTop="32dp"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/history_icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_margin="16dp"
app:srcCompat="@drawable/history_rounded"
app:layout_constraintStart_toEndOf="@id/check_history"
app:layout_constraintTop_toTopOf="@id/check_history"
app:layout_constraintBottom_toBottomOf="@id/check_history"/>
<TextView
android:id="@+id/history_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="History"
android:textSize="28sp"
app:layout_constraintTop_toTopOf="@id/history_icon"
app:layout_constraintBottom_toTopOf="@id/history_count"
app:layout_constraintStart_toEndOf="@id/history_icon"
android:layout_marginStart="16dp" />
<TextView
android:id="@+id/history_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="2375 items"
app:layout_constraintTop_toBottomOf="@id/history_label"
app:layout_constraintBottom_toBottomOf="@id/history_icon"
app:layout_constraintStart_toStartOf="@id/history_label" />
<CheckBox
android:id="@+id/check_downloads"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/check_history"
app:layout_constraintLeft_toLeftOf="parent"
android:layout_marginStart="32dp"
android:layout_marginTop="32dp"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/downloads_icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_margin="16dp"
app:srcCompat="@drawable/download"
app:layout_constraintStart_toEndOf="@id/check_downloads"
app:layout_constraintTop_toTopOf="@id/check_downloads"
app:layout_constraintBottom_toBottomOf="@id/check_downloads"/>
<TextView
android:id="@+id/downloads_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Downloads"
android:textSize="28sp"
app:layout_constraintTop_toTopOf="@id/downloads_icon"
app:layout_constraintBottom_toTopOf="@id/downloads_count"
app:layout_constraintStart_toEndOf="@id/downloads_icon"
android:layout_marginStart="16dp" />
<TextView
android:id="@+id/downloads_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="881 items"
app:layout_constraintTop_toBottomOf="@id/downloads_label"
app:layout_constraintBottom_toBottomOf="@id/downloads_icon"
app:layout_constraintStart_toStartOf="@id/downloads_label" />
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/values-ja/strings.xml
View File

@@ -48,6 +48,7 @@
<string name="main_drawer_downloads">ダウンロード</string>
<string name="main_jump_title">ページ移動</string>
<string name="main_jump_message">現ページ番号: %1$d\nページ数: %2$d</string>
<string name="channel_transfer">転送</string>
<string name="unable_to_connect">hitomi.laに接続できません</string>
<string name="main_move_to_page">%1$dページへ移動</string>
<string name="settings_clear_downloads">ダウンロード削除</string>
@@ -160,4 +161,5 @@
<string name="settings_networking">ネットワーク</string>
<string name="settings_recover_downloads">ダウンロードデータベースを再構築</string>
<string name="settings_transfer_data">他の機器にデータを転送</string>
<string name="channel_transfer_description">他の機器へのデータ転送の進捗度を表示</string>
</resources>

2
app/src/main/res/values-ko/strings.xml
View File

@@ -47,6 +47,7 @@
<string name="main_drawer_downloads">다운로드</string>
<string name="main_jump_title">페이지 이동</string>
<string name="main_jump_message">현재 페이지: %1$d\n페이지 수: %2$d</string>
<string name="channel_transfer">전송</string>
<string name="unable_to_connect">hitomi.la에 연결할 수 없습니다</string>
<string name="main_move_to_page">%1$d 페이지로 이동</string>
<string name="settings_clear_downloads">다운로드 삭제</string>
@@ -160,4 +161,5 @@
<string name="settings_networking">네트워크</string>
<string name="settings_recover_downloads">다운로드 데이터베이스 복구</string>
<string name="settings_transfer_data">다른 기기에 데이터 전송</string>
<string name="channel_transfer_description">다른 기기에 데이터 전송 시 상태 표시</string>
</resources>

3
app/src/main/res/values/strings.xml
View File

@@ -43,6 +43,9 @@
<string name="channel_update">Update</string>
<string name="channel_update_description">Shows update progress</string>
<string name="channel_transfer">Transfer</string>
<string name="channel_transfer_description">Shows progress of transferring data to another device</string>
<string name="unable_to_connect">Unable to connect to hitomi.la</string>
<string name="lock_corrupted">Lock file corrupted! Please re-install Pupil</string>