diff --git a/app/build.gradle b/app/build.gradle index 79c232db..cdf9c456 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,7 +38,7 @@ android { minSdkVersion 16 targetSdkVersion 30 versionCode 63 - versionName "5.1.5-hotfix2" + versionName "5.1.6" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true } diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt index d6d9f1eb..f56c42b1 100644 --- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt +++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt @@ -18,6 +18,8 @@ package xyz.quaver.pupil.adapters +import android.content.ClipData +import android.content.ClipboardManager import android.content.Context import android.graphics.drawable.Drawable import android.util.Log @@ -26,6 +28,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.LinearLayout +import android.widget.Toast import androidx.cardview.widget.CardView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView @@ -94,6 +97,13 @@ class GalleryBlockAdapter(private val galleries: List) : RecyclerSwipeAdapt visibility = View.VISIBLE } + view.galleryblock_id.setOnClickListener { + (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip( + ClipData.newPlainText("gallery_id", galleryID.toString()) + ) + Toast.makeText(context, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show() + } + if (!imageList.contains(null)) { val downloadManager = DownloadManager.getInstance(context) diff --git a/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt b/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt index 20ab37cd..6f59e0dd 100644 --- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt +++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt @@ -21,11 +21,9 @@ package xyz.quaver.pupil.ui.fragment import android.app.Activity import android.content.* import android.os.Bundle -import android.os.LocaleList import android.widget.Toast import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AppCompatDelegate -import androidx.core.os.LocaleListCompat import androidx.preference.* import com.google.android.gms.oss.licenses.OssLicensesMenuActivity import kotlinx.coroutines.CoroutineScope @@ -112,7 +110,7 @@ class SettingsFragment : (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip( ClipData.newPlainText("user_id", Preferences.get("user_id")) ) - Toast.makeText(context, R.string.settings_user_id_toast, Toast.LENGTH_SHORT).show() + Toast.makeText(context, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show() } else -> return false } diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 653f6341..231faee4 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -128,7 +128,7 @@ こうかはばつぐんだ! 登場人物を全て18歳以上にする ユーザーID - ユーザーIDをクリップボードにコピーしました + クリップボードにコピーしました リトライ まばたき検知スクロール 全てのギャラリーを対象に検索 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 3dec5094..a5b041b7 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -128,7 +128,7 @@ 힘세고 강한 지문 인식 판사님 저는 페도가 아닙니다 유저 ID - 유저 ID를 클립보드에 복사했습니다 + 클립보드에 복사됨 재시도 눈 깜빡임 감지 스크롤 모든 갤러리 검색 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d20929e1..efb5d22c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -30,6 +30,8 @@ Ignore + Copied to clipboard + Download Shows download status @@ -187,7 +189,6 @@ Protect yourself against light attacks! Import old galleries User ID - User ID is copied to clipboard Open Source Notice