Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1bcbc5f42b | ||
|
|
290b7fb158 | ||
|
|
9f103dcffe | ||
|
|
68ec919ae4 | ||
|
|
b0e194898e | ||
|
|
03b88c5b4b | ||
|
|
a5d4cbfaec |
@@ -38,7 +38,7 @@ android {
|
||||
compileSdk 34
|
||||
targetSdkVersion 34
|
||||
versionCode 69
|
||||
versionName "5.3.13"
|
||||
versionName "5.3.15"
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
vectorDrawables.useSupportLibrary = true
|
||||
}
|
||||
@@ -82,13 +82,14 @@ dependencies {
|
||||
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"
|
||||
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
|
||||
implementation "org.jetbrains.kotlinx:kotlinx-datetime:0.3.2"
|
||||
|
||||
|
||||
implementation "androidx.core:core-ktx:1.12.0"
|
||||
implementation "androidx.appcompat:appcompat:1.4.1"
|
||||
implementation "androidx.activity:activity-ktx:1.4.0"
|
||||
implementation "androidx.fragment:fragment-ktx:1.4.1"
|
||||
implementation "androidx.preference:preference-ktx:1.2.0"
|
||||
implementation "androidx.recyclerview:recyclerview:1.2.1"
|
||||
implementation "androidx.constraintlayout:constraintlayout:2.1.3"
|
||||
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
|
||||
implementation "androidx.gridlayout:gridlayout:1.0.0"
|
||||
implementation "androidx.biometric:biometric:1.1.0"
|
||||
implementation "androidx.work:work-runtime-ktx:2.7.1"
|
||||
@@ -116,6 +117,7 @@ dependencies {
|
||||
|
||||
//noinspection GradleDependency
|
||||
implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
|
||||
implementation "io.ktor:ktor-network:2.3.10"
|
||||
|
||||
implementation "com.tbuonomo.andrui:viewpagerdotsindicator:4.1.2"
|
||||
|
||||
@@ -127,6 +129,8 @@ dependencies {
|
||||
|
||||
implementation "ru.noties.markwon:core:3.1.0"
|
||||
|
||||
implementation "com.skyfishjy.ripplebackground:library:1.0.1"
|
||||
|
||||
implementation "org.jsoup:jsoup:1.14.3"
|
||||
|
||||
implementation "xyz.quaver:documentfilex:0.7.2"
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
"filters": [],
|
||||
"attributes": [],
|
||||
"versionCode": 69,
|
||||
"versionName": "5.3.12",
|
||||
"versionName": "5.3.14",
|
||||
"outputFile": "app-release.apk"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -8,11 +8,17 @@
|
||||
<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.FOREGROUND_SERVICE" />
|
||||
<uses-permission android:name="android.permission.CAMERA" />
|
||||
<uses-permission android:name="android.permission.VIBRATE"/>
|
||||
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"/>
|
||||
<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" />
|
||||
@@ -48,7 +54,15 @@
|
||||
|
||||
<service android:name=".services.DownloadService"
|
||||
android:exported="false"
|
||||
android:foregroundServiceType="specialUse" />
|
||||
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"
|
||||
@@ -179,6 +193,7 @@
|
||||
</intent-filter>
|
||||
</activity>
|
||||
<activity android:name="net.rdrei.android.dirchooser.DirectoryChooserActivity" />
|
||||
<activity android:name=".ui.TransferActivity" />
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
@@ -236,6 +236,13 @@ class Pupil : Application() {
|
||||
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")) {
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
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
|
||||
}
|
||||
}
|
||||
@@ -16,8 +16,10 @@
|
||||
|
||||
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
|
||||
@@ -35,6 +37,7 @@ 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)
|
||||
@@ -91,6 +94,14 @@ fun getGalleryIDsForQuery(query: String) : Set<Int> {
|
||||
}
|
||||
}
|
||||
|
||||
fun encodeSearchQueryForUrl(s: Char) =
|
||||
when(s) {
|
||||
' ' -> "_"
|
||||
'/' -> "slash"
|
||||
'.' -> "dot"
|
||||
else -> s.toString()
|
||||
}
|
||||
|
||||
fun getSuggestionsForQuery(query: String) : List<Suggestion> {
|
||||
query.replace('_', ' ').let {
|
||||
var field = "global"
|
||||
@@ -102,14 +113,33 @@ fun getSuggestionsForQuery(query: String) : List<Suggestion> {
|
||||
term = sides[1]
|
||||
}
|
||||
|
||||
val key = hashTerm(term)
|
||||
val node = getNodeAtAddress(field, 0) ?: return emptyList()
|
||||
val data = bSearch(field, key, node)
|
||||
val chars = term.map(::encodeSearchQueryForUrl)
|
||||
val url = "https://$tagIndexDomain/$field${if (chars.isNotEmpty()) "/${chars.joinToString("/")}" else ""}.json"
|
||||
|
||||
if (data != null)
|
||||
return getSuggestionsFromData(field, data)
|
||||
val request = Request.Builder()
|
||||
.url(url)
|
||||
.build()
|
||||
|
||||
return emptyList()
|
||||
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))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
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))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -226,7 +226,6 @@ class DownloadService : Service() {
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call, response: Response) {
|
||||
Log.d("PUPILD", "ONRESPONSE ${call.request().tag()}")
|
||||
val (galleryID, index, startId) = call.request().tag() as Tag
|
||||
val ext = call.request().url().encodedPath().split('.').last()
|
||||
|
||||
@@ -344,7 +343,7 @@ class DownloadService : Service() {
|
||||
return@launch
|
||||
}
|
||||
|
||||
notification[galleryID]?.setContentTitle(galleryInfo.title?.ellipsize(30))
|
||||
notification[galleryID]?.setContentTitle(galleryInfo.title.ellipsize(32))
|
||||
notify(galleryID)
|
||||
|
||||
val queued = mutableSetOf<Int>()
|
||||
@@ -409,7 +408,7 @@ class DownloadService : Service() {
|
||||
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_SPECIAL_USE)
|
||||
startForeground(R.id.downloader_notification_id, serviceNotification.build(), ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC)
|
||||
}
|
||||
|
||||
when (intent?.getStringExtra(KEY_COMMAND)) {
|
||||
@@ -434,7 +433,7 @@ class DownloadService : Service() {
|
||||
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_SPECIAL_USE)
|
||||
startForeground(R.id.downloader_notification_id, serviceNotification.build(), ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC)
|
||||
}
|
||||
interceptors[Tag::class] = interceptor
|
||||
}
|
||||
|
||||
@@ -0,0 +1,128 @@
|
||||
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
|
||||
}
|
||||
@@ -0,0 +1,94 @@
|
||||
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")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,123 @@
|
||||
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
|
||||
}
|
||||
382
app/src/main/java/xyz/quaver/pupil/ui/TransferActivity.kt
Normal file
382
app/src/main/java/xyz/quaver/pupil/ui/TransferActivity.kt
Normal file
@@ -0,0 +1,382 @@
|
||||
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)
|
||||
}
|
||||
}
|
||||
@@ -21,12 +21,14 @@ 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
|
||||
@@ -40,6 +42,7 @@ 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
|
||||
@@ -113,6 +116,9 @@ class SettingsFragment :
|
||||
)
|
||||
Toast.makeText(context, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
"transfer_data" -> {
|
||||
activity?.startActivity(Intent(activity, TransferActivity::class.java))
|
||||
}
|
||||
else -> return false
|
||||
}
|
||||
}
|
||||
@@ -300,6 +306,9 @@ class SettingsFragment :
|
||||
true
|
||||
}
|
||||
}
|
||||
"transfer_data" -> {
|
||||
onPreferenceClickListener = this@SettingsFragment
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
package xyz.quaver.pupil.ui.fragment
|
||||
|
||||
import androidx.fragment.app.Fragment
|
||||
import xyz.quaver.pupil.R
|
||||
|
||||
class TransferConnectedFragment: Fragment(R.layout.transfer_connected_fragment) {
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
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
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
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
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
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
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
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
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
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
|
||||
}
|
||||
|
||||
}
|
||||
@@ -20,6 +20,7 @@ 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
|
||||
@@ -28,7 +29,10 @@ import kotlinx.serialization.encodeToString
|
||||
import kotlinx.serialization.json.Json
|
||||
import okhttp3.Call
|
||||
import xyz.quaver.io.FileX
|
||||
import xyz.quaver.io.util.*
|
||||
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
|
||||
|
||||
@@ -24,6 +24,7 @@ import android.app.Activity
|
||||
import android.content.Context
|
||||
import android.content.pm.PackageManager
|
||||
import android.os.Build
|
||||
import android.util.Log
|
||||
import androidx.activity.result.ActivityResultLauncher
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import androidx.core.app.ActivityCompat
|
||||
@@ -125,11 +126,32 @@ suspend fun GalleryInfo.getRequestBuilders(): List<Request.Builder> {
|
||||
}
|
||||
}
|
||||
|
||||
fun String.ellipsize(n: Int): String =
|
||||
if (this.length > n)
|
||||
this.slice(0 until n) + "…"
|
||||
else
|
||||
this
|
||||
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]
|
||||
|
||||
13
app/src/main/res/drawable/arrow.xml
Normal file
13
app/src/main/res/drawable/arrow.xml
Normal 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="M4.5,10.5 L12,3m0,0 l7.5,7.5M12,3v18"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="1.5"
|
||||
android:fillColor="#00000000"
|
||||
android:strokeColor="@color/colorPrimaryDark"
|
||||
android:strokeLineCap="round"/>
|
||||
</vector>
|
||||
13
app/src/main/res/drawable/check.xml
Normal file
13
app/src/main/res/drawable/check.xml
Normal 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
13
app/src/main/res/drawable/download.xml
Normal 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
13
app/src/main/res/drawable/heart.xml
Normal 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
9
app/src/main/res/drawable/history_rounded.xml
Normal 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>
|
||||
13
app/src/main/res/drawable/link.xml
Normal file
13
app/src/main/res/drawable/link.xml
Normal 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="M13.19,8.688a4.5,4.5 0,0 1,1.242 7.244l-4.5,4.5a4.5,4.5 0,0 1,-6.364 -6.364l1.757,-1.757m13.35,-0.622 l1.757,-1.757a4.5,4.5 0,0 0,-6.364 -6.364l-4.5,4.5a4.5,4.5 0,0 0,1.242 7.244"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="1.5"
|
||||
android:fillColor="#00000000"
|
||||
android:strokeColor="@color/colorPrimaryDark"
|
||||
android:strokeLineCap="round"/>
|
||||
</vector>
|
||||
13
app/src/main/res/drawable/round_button.xml
Normal file
13
app/src/main/res/drawable/round_button.xml
Normal file
@@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_pressed="false">
|
||||
<shape android:shape="oval">
|
||||
<solid android:color="#dddddd"/>
|
||||
</shape>
|
||||
</item>
|
||||
<item android:state_pressed="true">
|
||||
<shape android:shape="oval">
|
||||
<solid android:color="#888888"/>
|
||||
</shape>
|
||||
</item>
|
||||
</selector>
|
||||
12
app/src/main/res/drawable/transfer_device.xml
Normal file
12
app/src/main/res/drawable/transfer_device.xml
Normal file
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:bottom="-8dp">
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="32dp"
|
||||
android:bottomLeftRadius="0dp"
|
||||
android:bottomRightRadius="0dp" />
|
||||
<stroke android:width="4dp" android:color="#444444"/>
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
9
app/src/main/res/drawable/transfer_ripple.xml
Normal file
9
app/src/main/res/drawable/transfer_ripple.xml
Normal file
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="#9d9d9d">
|
||||
<item android:id="@android:id/mask">
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="#9d9d9d" />
|
||||
<corners android:radius="16dp" />
|
||||
</shape>
|
||||
</item>
|
||||
</ripple>
|
||||
13
app/src/main/res/drawable/warning.xml
Normal file
13
app/src/main/res/drawable/warning.xml
Normal 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="M12,9v3.75m-9.303,3.376c-0.866,1.5 0.217,3.374 1.948,3.374h14.71c1.73,0 2.813,-1.874 1.948,-3.374L13.949,3.378c-0.866,-1.5 -3.032,-1.5 -3.898,0L2.697,16.126ZM12,15.75h0.007v0.008H12v-0.008Z"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="1.5"
|
||||
android:fillColor="#00000000"
|
||||
android:strokeColor="@color/colorAccent"
|
||||
android:strokeLineCap="round"/>
|
||||
</vector>
|
||||
7
app/src/main/res/layout/transfer_activity.xml
Normal file
7
app/src/main/res/layout/transfer_activity.xml
Normal file
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.fragment.app.FragmentContainerView
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/fragment_container_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:name="xyz.quaver.pupil.ui.fragment.TransferDirectionFragment" />
|
||||
28
app/src/main/res/layout/transfer_connected_fragment.xml
Normal file
28
app/src/main/res/layout/transfer_connected_fragment.xml
Normal 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>
|
||||
89
app/src/main/res/layout/transfer_direction_fragment.xml
Normal file
89
app/src/main/res/layout/transfer_direction_fragment.xml
Normal file
@@ -0,0 +1,89 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
android:layout_marginTop="80dp"
|
||||
android:text="Transfer your data"
|
||||
android:textAlignment="center"
|
||||
android:textSize="28sp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<View
|
||||
android:id="@+id/device"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="300dp"
|
||||
android:layout_marginHorizontal="64dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:background="@drawable/transfer_device"/>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/out_button"
|
||||
android:layout_width="100dp"
|
||||
android:layout_height="100dp"
|
||||
android:orientation="vertical"
|
||||
android:gravity="center"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:background="@drawable/transfer_ripple"
|
||||
app:layout_constraintBottom_toTopOf="@id/device"
|
||||
app:layout_constraintLeft_toLeftOf="@id/device"
|
||||
app:layout_constraintRight_toRightOf="@id/device"
|
||||
android:layout_marginBottom="32dp">
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/out_arrow"
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
app:srcCompat="@drawable/arrow"
|
||||
android:layout_marginBottom="4dp" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/out_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Send data"
|
||||
android:textStyle="bold"
|
||||
android:layout_marginTop="4dp"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/in_button"
|
||||
android:layout_width="100dp"
|
||||
android:layout_height="100dp"
|
||||
android:orientation="vertical"
|
||||
android:gravity="center"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:background="@drawable/transfer_ripple"
|
||||
app:layout_constraintTop_toTopOf="@id/device"
|
||||
app:layout_constraintLeft_toLeftOf="@id/device"
|
||||
app:layout_constraintRight_toRightOf="@id/device"
|
||||
android:layout_marginTop="32dp">
|
||||
<TextView
|
||||
android:id="@+id/in_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Receive data"
|
||||
android:textStyle="bold"
|
||||
android:layout_marginBottom="4dp"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/in_arrow"
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
app:srcCompat="@drawable/arrow"
|
||||
android:layout_marginTop="4dp"
|
||||
android:rotation="180"/>
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
32
app/src/main/res/layout/transfer_peer_list_item.xml
Normal file
32
app/src/main/res/layout/transfer_peer_list_item.xml
Normal file
@@ -0,0 +1,32 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:background="?attr/selectableItemBackground"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:padding="16dp">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/device_name"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Gonsales Vorecek's Galaxy S22 Ultra"
|
||||
android:textStyle="bold"
|
||||
android:textSize="24sp"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
android:layout_marginBottom="4dp"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/device_address"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="26:7D:2D:3A:4F:5E"
|
||||
android:textSize="16sp"
|
||||
app:layout_constraintTop_toBottomOf="@id/device_name"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
android:layout_marginTop="4dp"/>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
38
app/src/main/res/layout/transfer_permission_fragment.xml
Normal file
38
app/src/main/res/layout/transfer_permission_fragment.xml
Normal file
@@ -0,0 +1,38 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/icon"
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
android:layout_marginTop="48dp"
|
||||
app:srcCompat="@drawable/warning"
|
||||
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="Permissions Missing"
|
||||
android:textAlignment="center"
|
||||
android:textSize="28sp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintTop_toBottomOf="@id/icon" />
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/permissions_button"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Grant Permissions"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
android:layout_marginHorizontal="36dp"
|
||||
android:layout_marginVertical="64dp"/>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
196
app/src/main/res/layout/transfer_select_data_fragment.xml
Normal file
196
app/src/main/res/layout/transfer_select_data_fragment.xml
Normal 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>
|
||||
58
app/src/main/res/layout/transfer_target_fragment.xml
Normal file
58
app/src/main/res/layout/transfer_target_fragment.xml
Normal file
@@ -0,0 +1,58 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/icon"
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
android:layout_marginTop="48dp"
|
||||
app:srcCompat="@drawable/link"
|
||||
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="Connect to your device"
|
||||
android:textAlignment="center"
|
||||
android:textSize="28sp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintTop_toBottomOf="@id/icon" />
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/device_list"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
|
||||
android:layout_marginHorizontal="32dp"
|
||||
android:layout_marginVertical="32dp"
|
||||
app:layout_constraintTop_toBottomOf="@id/textView"
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
<com.skyfishjy.library.RippleBackground
|
||||
android:id="@+id/ripple"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
app:rb_color="@color/colorPrimaryDark"
|
||||
app:rb_radius="32dp"
|
||||
app:rb_type="strokeRipple"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatButton
|
||||
android:id="@+id/retry_button"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Retry"
|
||||
style="@style/Widget.AppCompat.Button.Borderless"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
android:visibility="invisible"
|
||||
android:layout_margin="32dp"/>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -0,0 +1,54 @@
|
||||
<?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/link"
|
||||
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="Wait for connection"
|
||||
android:textAlignment="center"
|
||||
android:textSize="28sp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintTop_toBottomOf="@id/icon" />
|
||||
|
||||
<com.skyfishjy.library.RippleBackground
|
||||
android:id="@+id/ripple"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
app:layout_constraintDimensionRatio="1"
|
||||
app:layout_constraintTop_toTopOf="@id/barrier"
|
||||
app:layout_constraintBottom_toBottomOf="@id/barrier"
|
||||
app:rb_color="@color/colorPrimaryDark"
|
||||
app:rb_radius="32dp"
|
||||
app:rb_type="strokeRipple"/>
|
||||
|
||||
<androidx.constraintlayout.widget.Barrier
|
||||
android:id="@+id/barrier"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:barrierDirection="top"
|
||||
app:constraint_referenced_ids="device" />
|
||||
|
||||
<View
|
||||
android:id="@+id/device"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="300dp"
|
||||
android:layout_marginHorizontal="64dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:background="@drawable/transfer_device"/>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -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>
|
||||
@@ -159,4 +160,6 @@
|
||||
<string name="unaccessible_download_folder">アンドロイド11以上では外部からのアプリ内部空間接近が不可能です。ダウンロードフォルダを変更しますか?</string>
|
||||
<string name="settings_networking">ネットワーク</string>
|
||||
<string name="settings_recover_downloads">ダウンロードデータベースを再構築</string>
|
||||
<string name="settings_transfer_data">他の機器にデータを転送</string>
|
||||
<string name="channel_transfer_description">他の機器へのデータ転送の進捗度を表示</string>
|
||||
</resources>
|
||||
@@ -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>
|
||||
@@ -159,4 +160,6 @@
|
||||
<string name="unaccessible_download_folder">안드로이드 11 이상에서는 외부에서 현재 다운로드 폴더에 접근할 수 없습니다. 변경하시겠습니까?</string>
|
||||
<string name="settings_networking">네트워크</string>
|
||||
<string name="settings_recover_downloads">다운로드 데이터베이스 복구</string>
|
||||
<string name="settings_transfer_data">다른 기기에 데이터 전송</string>
|
||||
<string name="channel_transfer_description">다른 기기에 데이터 전송 시 상태 표시</string>
|
||||
</resources>
|
||||
@@ -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>
|
||||
@@ -174,6 +177,7 @@
|
||||
<string name="settings_nomedia_title">Hide image from gallery</string>
|
||||
<string name="settings_low_quality">Low quality images</string>
|
||||
<string name="settings_low_quality_summary">Load low quality images to improve load speed and data usage</string>
|
||||
<string name="settings_transfer_data">Transfer data to another device</string>
|
||||
|
||||
<!-- SETTINGS/APP LOCK -->
|
||||
|
||||
|
||||
@@ -52,6 +52,10 @@
|
||||
app:defaultValue="8"
|
||||
app:useSimpleSummaryProvider="true"/>
|
||||
|
||||
<Preference
|
||||
app:key="transfer_data"
|
||||
app:title="@string/settings_transfer_data"/>
|
||||
|
||||
<SwitchPreferenceCompat
|
||||
app:key="nomedia"
|
||||
app:title="@string/settings_nomedia_title"/>
|
||||
|
||||
Reference in New Issue
Block a user