diff --git a/.idea/misc.xml b/.idea/misc.xml
index b2b5434..5342b9e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -19,9 +19,12 @@
+
+
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c7f081c..e47bc80 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,6 +17,10 @@
android:name=".setting.SettingsActivity"
android:exported="false"
android:label="@string/title_activity_settings" />
+
()
private var username:String? = ""
-
+ private lateinit var sourceUrl:Array
+ private lateinit var sourceName:Array
+ private lateinit var source:String
+ val TAG = javaClass.simpleName
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
- val configSp = getSharedPreferences("config",0)
- if (configSp.getString("source",null)==null){
- configSp.edit().putString("source","https://yande.re/").apply()
+ sourceName = resources.getStringArray(R.array.pic_source)
+ sourceUrl = resources.getStringArray(R.array.url_source)
+ val configSp = getSharedPreferences("com.lsper.view_preferences",0)
+ if (configSp.getString("sourceName",null)==null){
+ configSp.edit().putString("sourceName","yande.re").apply()
configSp.edit().putString("type","0").apply()
}
+
val fbtn = findViewById(
R.id.fbtn
)
@@ -107,7 +111,6 @@ class MainActivity : AppCompatActivity() {
}
swipeRefreshLayout.setOnRefreshListener {
- Log.e("Refresh", "Is refresh")
postList.clear()
nowPage = 1
loadPost(this, searchTag,nowPage.toString())
@@ -127,9 +130,7 @@ class MainActivity : AppCompatActivity() {
//收藏夹
R.id.fav -> {
swipeRefreshLayout.isRefreshing=true
- Log.e("touch","touch1")
- Log.e("username",username.toString())
- Log.e("touch","touch2")
+ Log.w(TAG,username.toString())
if (username == null) {
alterEditDialog()
postList.clear()
@@ -152,7 +153,7 @@ class MainActivity : AppCompatActivity() {
true
}
//设置
- R.id.settings -> {
+ R.id.setting -> {
val intent = Intent(this,SettingsActivity::class.java)
startActivity(intent)
drawerLayout.closeDrawers()
@@ -172,7 +173,7 @@ class MainActivity : AppCompatActivity() {
.setTitle("请输入您的用户名")
.setView(et)
.setPositiveButton("确定") { _, _ ->
- Log.e("edit",et.text.toString())
+ Log.w(TAG,et.text.toString())
val sharedPreferences = getSharedPreferences("username", 0).edit()
sharedPreferences.putString("username",et.text.toString()).apply()
}.create().show()
@@ -245,11 +246,13 @@ class MainActivity : AppCompatActivity() {
* @param page 页数
*/
private fun loadPost(context: Context, tags: String?,page:String){
+ val configSp = getSharedPreferences("com.lsper.view_preferences",0)
+ for ((index,name) in sourceName.withIndex() ){
+ if (name == configSp.getString("sourceName",null)){
+ source = sourceUrl[index]
+ }
+ }
- val configSp = getSharedPreferences("config",0)
- val source = configSp.getString("source",null)
- val tyep = configSp.getString("type",null)
- Log.w("load",source.toString())
nowPosition = postList.size-3
@@ -259,11 +262,11 @@ class MainActivity : AppCompatActivity() {
ServiceCreator.create("https://yande.re/")
}
var service:Call>
- if (tyep.equals("0")){
- service = postService.getPostData("100", tags,page)
- }else{
- service = postService.getPostData_php("dapi","post","index","100",tags,"1",nowPage.toString())
- }
+// if (tyep.equals("0")){
+ service = postService.getPostData("100", tags,page)
+// }else{
+// service = postService.getPostData_php("dapi","post","index","100",tags,"1",nowPage.toString())
+// }
service.enqueue(object : Callback> {
override fun onFailure(call: Call>, t: Throwable) {
@@ -289,7 +292,7 @@ class MainActivity : AppCompatActivity() {
} else {
swipeRefreshLayout.isRefreshing = false
Snackbar.make(swipeRefreshLayout,"只有这么多了哦",Snackbar.LENGTH_SHORT).show()
- Log.e("Post", "Is null")
+ Log.w(TAG, "post is null")
return
}
@@ -299,7 +302,6 @@ class MainActivity : AppCompatActivity() {
findViewById(R.id.recyclerview)
recyclerView.layoutManager = layoutManager
- Log.e("load",isLoading.toString())
if (isLoading){
recyclerView.scrollToPosition(nowPosition)
adapter.notifyDataSetChanged()
diff --git a/app/src/main/java/com/lsp/view/setting/SettingsActivity.kt b/app/src/main/java/com/lsp/view/setting/SettingsActivity.kt
index 028b9bc..2754e42 100644
--- a/app/src/main/java/com/lsp/view/setting/SettingsActivity.kt
+++ b/app/src/main/java/com/lsp/view/setting/SettingsActivity.kt
@@ -1,65 +1,27 @@
package com.lsp.view.setting
-import android.content.SharedPreferences
import android.os.Bundle
-import android.util.Log
-import android.view.View
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.Spinner
import androidx.appcompat.app.AppCompatActivity
import androidx.preference.PreferenceFragmentCompat
import com.lsp.view.R
-import java.util.*
-class SettingsActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener {
-
- lateinit var name_sourceArray: Array
- lateinit var url_sourceArray:Array
- lateinit var configSp: SharedPreferences
+class SettingsActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.settings_activity)
-
- configSp = getSharedPreferences("config", MODE_PRIVATE)
-
- name_sourceArray = resources.getStringArray(R.array.pic_source)
- url_sourceArray = resources.getStringArray(R.array.url_source)
-
- val spinner = findViewById(R.id.source)
- //设置spinner列表
- val adapter = ArrayAdapter(this,R.layout.spinner_item_layout,name_sourceArray)
- adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
- spinner.adapter = adapter
- spinner.onItemSelectedListener = this
-
- val source = configSp.getString("source",null)
- if (source!=null ){
- for ( (index,value) in url_sourceArray.withIndex()){
- if (value == source){
- spinner.setSelection(index)
- }
- }
+ if (savedInstanceState == null) {
+ supportFragmentManager
+ .beginTransaction()
+ .replace(R.id.settings, SettingsFragment())
+ .commit()
}
-
-
-
+ supportActionBar?.setDisplayHomeAsUpEnabled(true)
}
- override fun onItemSelected(p0: AdapterView<*>?, p1: View?, p2: Int, p3: Long) {
- configSp.edit().putString("source",url_sourceArray[p2]).apply()
-// if (p2==2){
-// configSp.edit().putString("type","1").apply()
-// }else{
- configSp.edit().putString("type","0").apply()
-
-// }
+ class SettingsFragment : PreferenceFragmentCompat() {
+ override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+ setPreferencesFromResource(R.xml.root_preferences, rootKey)
+ }
}
-
- override fun onNothingSelected(p0: AdapterView<*>?) {
- TODO("Not yet implemented")
- }
-
-
}
\ No newline at end of file
diff --git a/app/src/main/java/com/lsp/view/setting/SettingsActivity_BackUp.kt b/app/src/main/java/com/lsp/view/setting/SettingsActivity_BackUp.kt
new file mode 100644
index 0000000..f1fa0cc
--- /dev/null
+++ b/app/src/main/java/com/lsp/view/setting/SettingsActivity_BackUp.kt
@@ -0,0 +1,63 @@
+package com.lsp.view.setting
+
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.view.View
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.Spinner
+import androidx.appcompat.app.AppCompatActivity
+import com.lsp.view.R
+import java.util.*
+
+class SettingsActivity_BackUp : AppCompatActivity(), AdapterView.OnItemSelectedListener {
+
+ lateinit var name_sourceArray: Array
+ lateinit var url_sourceArray:Array
+ lateinit var configSp: SharedPreferences
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(R.layout.settings_activity_backup)
+
+ configSp = getSharedPreferences("config", MODE_PRIVATE)
+
+ name_sourceArray = resources.getStringArray(R.array.pic_source)
+ url_sourceArray = resources.getStringArray(R.array.url_source)
+
+ val spinner = findViewById(R.id.source)
+ //设置spinner列表
+ val adapter = ArrayAdapter(this,R.layout.spinner_item_layout,name_sourceArray)
+ adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+ spinner.adapter = adapter
+ spinner.onItemSelectedListener = this
+
+ val source = configSp.getString("source",null)
+ if (source!=null ){
+ for ( (index,value) in url_sourceArray.withIndex()){
+ if (value == source){
+ spinner.setSelection(index)
+ }
+ }
+ }
+
+
+
+ }
+
+ override fun onItemSelected(p0: AdapterView<*>?, p1: View?, p2: Int, p3: Long) {
+ configSp.edit().putString("source",url_sourceArray[p2]).apply()
+// if (p2==2){
+// configSp.edit().putString("type","1").apply()
+// }else{
+ configSp.edit().putString("type","0").apply()
+
+// }
+ }
+
+ override fun onNothingSelected(p0: AdapterView<*>?) {
+ TODO("Not yet implemented")
+ }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/setting_icon.png b/app/src/main/res/drawable/setting_icon.png
new file mode 100644
index 0000000..82f428a
Binary files /dev/null and b/app/src/main/res/drawable/setting_icon.png differ
diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/settings_activity.xml
index 04c5a33..2b10a28 100644
--- a/app/src/main/res/layout/settings_activity.xml
+++ b/app/src/main/res/layout/settings_activity.xml
@@ -1,26 +1,9 @@
+
-
-
-
-
-
-
-
+ android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_activity_backup.xml b/app/src/main/res/layout/settings_activity_backup.xml
new file mode 100644
index 0000000..99813a1
--- /dev/null
+++ b/app/src/main/res/layout/settings_activity_backup.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/menu/nav_menu.xml b/app/src/main/res/menu/nav_menu.xml
index 47d7892..b4601b8 100644
--- a/app/src/main/res/menu/nav_menu.xml
+++ b/app/src/main/res/menu/nav_menu.xml
@@ -14,7 +14,8 @@
android:icon="@drawable/ic_baseline_label_24"
android:title="Tags"/>