From 1f01057d4a926490e3ab8206ac8546c040341420 Mon Sep 17 00:00:00 2001
From: NerLink <inxtes@gmail.com>
Date: Sat, 8 May 2021 17:09:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BD=BF=E7=94=A8=E4=BD=93?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/jarRepositories.xml                     |  5 ++
 app/build.gradle                              |  1 +
 .../main/java/com/lsp/view/MainActivity.kt    |  5 +-
 app/src/main/java/com/lsp/view/PicActivity.kt | 51 ++++++++++++++++++-
 .../java/com/lsp/view/adapter/PostAdapter.kt  |  2 +-
 app/src/main/res/layout/activity_pic.xml      |  7 ++-
 build.gradle                                  |  4 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 8 files changed, 70 insertions(+), 7 deletions(-)

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index a5f05cd..460527a 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -21,5 +21,10 @@
       <option name="name" value="Google" />
       <option name="url" value="https://dl.google.com/dl/android/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://www.jitpack.io" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index f967d28..ca5cd97 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -33,6 +33,7 @@ android {
 }
 
 dependencies {
+    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
     implementation 'com.lcodecorex:tkrefreshlayout:1.0.7'
     api 'com.google.android:flexbox:1.0.0'
     implementation ('androidx.swiperefreshlayout:swiperefreshlayout:1.1.0')
diff --git a/app/src/main/java/com/lsp/view/MainActivity.kt b/app/src/main/java/com/lsp/view/MainActivity.kt
index 2cfb726..f41fad0 100644
--- a/app/src/main/java/com/lsp/view/MainActivity.kt
+++ b/app/src/main/java/com/lsp/view/MainActivity.kt
@@ -148,12 +148,15 @@ class MainActivity : AppCompatActivity() {
                     )
                 val list = response.body()
 
-                if (list != null) {
+                if (list != null&&list.size>1) {
                     for ((i, post) in list.withIndex()) {
                         postList.add(post)
                     }
                 } else {
+                    swipeRefreshLayout.isRefreshing = false
+                    Snackbar.make(swipeRefreshLayout,"只有这么多了哦",Snackbar.LENGTH_SHORT).show()
                     Log.e("Post", "Is null")
+                    return
                 }
 
 
diff --git a/app/src/main/java/com/lsp/view/PicActivity.kt b/app/src/main/java/com/lsp/view/PicActivity.kt
index 9c9d015..57e8c84 100644
--- a/app/src/main/java/com/lsp/view/PicActivity.kt
+++ b/app/src/main/java/com/lsp/view/PicActivity.kt
@@ -1,5 +1,7 @@
 package com.lsp.view
 
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.graphics.drawable.Drawable
@@ -18,6 +20,7 @@ import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.GlideException
 import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.target.Target
+import com.github.chrisbanes.photoview.PhotoView
 import com.google.android.flexbox.*
 import com.google.android.material.snackbar.Snackbar
 import com.lsp.view.adapter.AuthorAdapter
@@ -34,6 +37,7 @@ import java.io.*
 import java.lang.Exception
 import kotlin.collections.ArrayList
 import kotlin.concurrent.thread
+import kotlin.properties.Delegates
 
 class PicActivity : AppCompatActivity() {
 
@@ -43,10 +47,15 @@ class PicActivity : AppCompatActivity() {
     private val idList = ArrayList<ID>()
     private val time = System.currentTimeMillis()
     private val sizeList = ArrayList<Size>()
+    private lateinit var image:ImageView
+    private lateinit var photoView:PhotoView
+    private var shortAnnotationDuration by Delegates.notNull<Int>()
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_pic)
-
+        image =findViewById<ImageView>(R.id.titleImage)
+        shortAnnotationDuration = resources.getInteger(android.R.integer.config_shortAnimTime)
         val intent = intent
         val tags = intent.getStringExtra("tags")
         if (tags != null) {
@@ -91,8 +100,31 @@ class PicActivity : AppCompatActivity() {
                 "${time}.$file_ext"
 
 
+        photoView = findViewById<PhotoView>(R.id.photoView)
+
+        image.setOnClickListener {
+            photoView.apply {
+                alpha = 0f
+                visibility = View.VISIBLE
+                animate()
+                    .alpha(1f)
+                    .setDuration(shortAnnotationDuration.toLong())
+                    .setListener(null)
+            }
+            Glide.with(this).load(sample_url).into(photoView)
 
 
+        }
+        photoView.setOnClickListener {
+            photoView.animate()
+                .alpha(0f)
+                .setDuration(shortAnnotationDuration.toLong())
+                .setListener(object : AnimatorListenerAdapter(){
+                    override fun onAnimationEnd(animation: Animator?) {
+                        photoView.visibility = View.GONE
+                    }
+                })
+        }
 
         fbtn.setOnClickListener {
             if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.WRITE_EXTERNAL_STORAGE)!=
@@ -117,6 +149,21 @@ class PicActivity : AppCompatActivity() {
 
 
 
+    }
+
+    override fun onBackPressed() {
+        if (photoView.visibility==View.GONE) {
+            super.onBackPressed()
+        }else{
+            photoView.animate()
+                .alpha(0f)
+                .setDuration(shortAnnotationDuration.toLong())
+                .setListener(object : AnimatorListenerAdapter(){
+                    override fun onAnimationEnd(animation: Animator?) {
+                        photoView.visibility = View.GONE
+                    }
+                })
+        }
     }
 
     override fun onRequestPermissionsResult(
@@ -199,7 +246,7 @@ class PicActivity : AppCompatActivity() {
     }
 
     private fun loadPic(url:String){
-        val image = findViewById<ImageView>(R.id.titleImage)
+
         Glide.with(this).load(url).listener(object :RequestListener<Drawable?>{
             override fun onLoadFailed(
                 e: GlideException?,
diff --git a/app/src/main/java/com/lsp/view/adapter/PostAdapter.kt b/app/src/main/java/com/lsp/view/adapter/PostAdapter.kt
index f4baf8e..09546a9 100644
--- a/app/src/main/java/com/lsp/view/adapter/PostAdapter.kt
+++ b/app/src/main/java/com/lsp/view/adapter/PostAdapter.kt
@@ -54,7 +54,7 @@ class PostAdapter(val context:Context, private val postList: List<Post>) :Recycl
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val post = postList[position]
         Glide.with(context).load(post.preview_url).into(holder.picImage)
-        if (position==postList.size-1&&postList.size>100){
+        if (position==postList.size-1&&postList.size>6){
             //到达底部
             mLoadMoreListener.loadMore(position)
         }
diff --git a/app/src/main/res/layout/activity_pic.xml b/app/src/main/res/layout/activity_pic.xml
index b647f98..9241f15 100644
--- a/app/src/main/res/layout/activity_pic.xml
+++ b/app/src/main/res/layout/activity_pic.xml
@@ -115,5 +115,10 @@
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:id="@+id/pb"/>
-
+<com.github.chrisbanes.photoview.PhotoView
+    android:background="#000"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:visibility="gone"
+    android:id="@+id/photoView"/>
 </FrameLayout>
diff --git a/build.gradle b/build.gradle
index e194d85..4ad845e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,11 +2,12 @@
 buildscript {
     ext.kotlin_version = "1.4.31"
     repositories {
+        maven { url "https://www.jitpack.io" }
         google()
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.2"
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -16,6 +17,7 @@ buildscript {
 
 allprojects {
     repositories {
+        maven { url "https://www.jitpack.io" }
         google()
         jcenter()
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 142d4ff..d338e54 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip