diff --git a/app/src/main/java/com/lsp/view/MainActivity.kt b/app/src/main/java/com/lsp/view/MainActivity.kt index 1e0a986..2cfb726 100644 --- a/app/src/main/java/com/lsp/view/MainActivity.kt +++ b/app/src/main/java/com/lsp/view/MainActivity.kt @@ -5,7 +5,6 @@ import android.animation.AnimatorListenerAdapter import android.content.Context import android.os.Bundle import android.util.Log -import android.view.KeyEvent import android.view.View import android.view.inputmethod.EditorInfo import android.view.inputmethod.InputMethodManager @@ -17,7 +16,7 @@ import com.google.android.material.snackbar.Snackbar import com.lsp.view.bean.Post import com.hentai.yandeview.Retrofit.PostService import com.hentai.yandeview.Retrofit.ServiceCreator -import com.lsp.view.Adapter.PostAdapter +import com.lsp.view.adapter.PostAdapter import retrofit2.Call import retrofit2.Callback import retrofit2.Response @@ -73,20 +72,12 @@ class MainActivity : AppCompatActivity() { return@setOnEditorActionListener false } - - fbtn.setOnClickListener { if (searchBar.visibility == View.GONE) { showSearchBar() } } - - - - - - swipeRefreshLayout.setOnRefreshListener { Log.e("Refresh", "Is refresh") postList.clear() @@ -133,7 +124,6 @@ class MainActivity : AppCompatActivity() { } - private fun loadPost(context: Context, source: String?, tags: String?,page:String){ nowPosition = postList.size-3 @@ -160,17 +150,13 @@ class MainActivity : AppCompatActivity() { if (list != null) { for ((i, post) in list.withIndex()) { -// if (list[i].rating=="s") { - postList.add(post) -// } + postList.add(post) } } else { Log.e("Post", "Is null") } - - val layoutManager = GridLayoutManager(context, 2) val recyclerView = findViewById(R.id.recyclerview) diff --git a/app/src/main/java/com/lsp/view/PicActivity.kt b/app/src/main/java/com/lsp/view/PicActivity.kt index 1649cb5..9c9d015 100644 --- a/app/src/main/java/com/lsp/view/PicActivity.kt +++ b/app/src/main/java/com/lsp/view/PicActivity.kt @@ -20,10 +20,10 @@ import com.bumptech.glide.request.RequestListener import com.bumptech.glide.request.target.Target import com.google.android.flexbox.* import com.google.android.material.snackbar.Snackbar -import com.lsp.view.Adapter.AuthorAdapter -import com.lsp.view.Adapter.IdAdapter -import com.lsp.view.Adapter.SizeAdapter -import com.lsp.view.Adapter.TagAdapter +import com.lsp.view.adapter.AuthorAdapter +import com.lsp.view.adapter.IdAdapter +import com.lsp.view.adapter.SizeAdapter +import com.lsp.view.adapter.TagAdapter import com.lsp.view.bean.Author import com.lsp.view.bean.ID import com.lsp.view.bean.Size diff --git a/app/src/main/java/com/lsp/view/Adapter/AuthorAdapter.kt b/app/src/main/java/com/lsp/view/adapter/AuthorAdapter.kt similarity index 97% rename from app/src/main/java/com/lsp/view/Adapter/AuthorAdapter.kt rename to app/src/main/java/com/lsp/view/adapter/AuthorAdapter.kt index f72587a..d7e3c3c 100644 --- a/app/src/main/java/com/lsp/view/Adapter/AuthorAdapter.kt +++ b/app/src/main/java/com/lsp/view/adapter/AuthorAdapter.kt @@ -1,4 +1,4 @@ -package com.lsp.view.Adapter +package com.lsp.view.adapter import android.view.LayoutInflater import android.view.View diff --git a/app/src/main/java/com/lsp/view/Adapter/IdAdapter.kt b/app/src/main/java/com/lsp/view/adapter/IdAdapter.kt similarity index 97% rename from app/src/main/java/com/lsp/view/Adapter/IdAdapter.kt rename to app/src/main/java/com/lsp/view/adapter/IdAdapter.kt index 8ba6693..749c006 100644 --- a/app/src/main/java/com/lsp/view/Adapter/IdAdapter.kt +++ b/app/src/main/java/com/lsp/view/adapter/IdAdapter.kt @@ -1,4 +1,4 @@ -package com.lsp.view.Adapter +package com.lsp.view.adapter import android.view.LayoutInflater import android.view.View diff --git a/app/src/main/java/com/lsp/view/Adapter/PostAdapter.kt b/app/src/main/java/com/lsp/view/adapter/PostAdapter.kt similarity index 96% rename from app/src/main/java/com/lsp/view/Adapter/PostAdapter.kt rename to app/src/main/java/com/lsp/view/adapter/PostAdapter.kt index dc5f8a5..f4baf8e 100644 --- a/app/src/main/java/com/lsp/view/Adapter/PostAdapter.kt +++ b/app/src/main/java/com/lsp/view/adapter/PostAdapter.kt @@ -1,4 +1,4 @@ -package com.lsp.view.Adapter +package com.lsp.view.adapter import android.content.Context import android.content.Intent @@ -54,7 +54,7 @@ class PostAdapter(val context:Context, private val postList: List) :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){ + if (position==postList.size-1&&postList.size>100){ //到达底部 mLoadMoreListener.loadMore(position) } diff --git a/app/src/main/java/com/lsp/view/Adapter/SizeAdapter.kt b/app/src/main/java/com/lsp/view/adapter/SizeAdapter.kt similarity index 97% rename from app/src/main/java/com/lsp/view/Adapter/SizeAdapter.kt rename to app/src/main/java/com/lsp/view/adapter/SizeAdapter.kt index e9a5bb3..fd0d391 100644 --- a/app/src/main/java/com/lsp/view/Adapter/SizeAdapter.kt +++ b/app/src/main/java/com/lsp/view/adapter/SizeAdapter.kt @@ -1,4 +1,4 @@ -package com.lsp.view.Adapter +package com.lsp.view.adapter import android.util.Log import android.view.LayoutInflater diff --git a/app/src/main/java/com/lsp/view/Adapter/TagAdapter.kt b/app/src/main/java/com/lsp/view/adapter/TagAdapter.kt similarity index 97% rename from app/src/main/java/com/lsp/view/Adapter/TagAdapter.kt rename to app/src/main/java/com/lsp/view/adapter/TagAdapter.kt index 87ebe69..4905962 100644 --- a/app/src/main/java/com/lsp/view/Adapter/TagAdapter.kt +++ b/app/src/main/java/com/lsp/view/adapter/TagAdapter.kt @@ -1,4 +1,4 @@ -package com.lsp.view.Adapter +package com.lsp.view.adapter import android.view.LayoutInflater import android.view.View @@ -22,6 +22,7 @@ class TagAdapter(val tagList:List):RecyclerView.Adapter