style: change some view

app/build.gradle

@@ -4,8 +4,7 @@ plugins {
 }
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion "30.0.3"
+    compileSdkVersion = 33
 
     defaultConfig {
         applicationId "com.lsp.view"
@@ -24,8 +23,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'

app/src/main/java/com/lsp/view/YandViewApplication.kt

@@ -29,7 +29,6 @@ class YandViewApplication : Application(), DefaultLifecycleObserver {
         DynamicColors.applyToActivitiesIfAvailable(this)
         val serviceIntent = Intent(this, DownloadService::class.java)
         bindService(serviceIntent, connection, BIND_AUTO_CREATE)
-        statusBarHeight()
     }
 
     override fun onDestroy(owner: LifecycleOwner) {
@@ -37,20 +36,6 @@ class YandViewApplication : Application(), DefaultLifecycleObserver {
         unbindService(connection)
     }
 
-    //计算状态栏高度
-    fun statusBarHeight(): Int {
-        var height = 0
-        val resourceId = resources.getIdentifier(
-            "status_bar_height",
-            "dimen",
-            "android"
-        )
-        if (resourceId > 0) {
-            height = resources.getDimensionPixelSize(resourceId)
-        }
-        return height
-    }
-
     companion object {
         var context: Context? = null
             private set

app/src/main/java/com/lsp/view/activity/BaseActivity.kt

@@ -1,43 +0,0 @@
-package com.lsp.view.activity
-
-import android.graphics.Color
-import android.os.Build
-import android.os.Bundle
-import android.view.WindowManager
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowCompat
-
-open class BaseActivity : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        transparentStatusBar()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            window.setDecorFitsSystemWindows(false)
-        }
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
-            //设置导航栏透明
-            window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION)
-        }
-    }
-    private fun transparentStatusBar(){
-        // 设置状态栏颜色为透明
-        window.statusBarColor = Color.TRANSPARENT
-        window.navigationBarColor = Color.TRANSPARENT
-        //状态栏反色
-        WindowCompat.getInsetsController(window,window.decorView).isAppearanceLightStatusBars = !isDarkMode()
-
-    }
-
-    /**
-     * 获取当前是否为深色模式
-     * 深色模式的值为:0x21
-     * 浅色模式的值为:0x11
-     * @return true 为是深色模式   false为不是深色模式
-     */
-    private fun isDarkMode(): Boolean {
-        return resources.configuration.uiMode == 0x21
-    }
-
-}

app/src/main/java/com/lsp/view/activity/favtag/FavTagActivity.kt

@@ -5,19 +5,17 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
 import android.view.View
+import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.flexbox.*
-import com.google.android.material.appbar.AppBarLayout
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import com.lsp.view.YandViewApplication
 import com.lsp.view.R
-import com.lsp.view.activity.BaseActivity
 import com.lsp.view.activity.main.MainActivity
 import com.lsp.view.repository.bean.Tags
 
-class FavTagActivity : BaseActivity() {
+class FavTagActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_fav_tag)
@@ -26,9 +24,6 @@ class FavTagActivity : BaseActivity() {
         //Toolbar相关
         val toolbar = findViewById<Toolbar>(R.id.toolbar)
         setSupportActionBar(toolbar)
-        val appbar = findViewById<AppBarLayout>(R.id.appbar)
-        val nowHeight = appbar.layoutParams.height
-        appbar.layoutParams.height = (application as YandViewApplication).statusBarHeight()+nowHeight
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setHomeButtonEnabled(true)
 

app/src/main/java/com/lsp/view/activity/main/MainActivity.kt

@@ -4,13 +4,12 @@ import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.content.Intent
 import android.os.*
-import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.EditText
-import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.core.view.GravityCompat
 import androidx.core.view.WindowCompat
@@ -18,32 +17,30 @@ import androidx.core.view.WindowInsetsCompat.Type.ime
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
-import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.navigation.NavigationView
 import com.google.android.material.snackbar.Snackbar
 import com.lsp.view.YandViewApplication
 import com.lsp.view.R
-import com.lsp.view.activity.BaseActivity
 import com.lsp.view.activity.favtag.FavTagActivity
 import com.lsp.view.activity.setting.SettingsActivity
 import com.lsp.view.model.MainViewModel
 
 
-class MainActivity : BaseActivity() {
+class MainActivity : AppCompatActivity() {
     private lateinit var search: EditText
     private var shortAnnotationDuration: Int = 0
     private var username: String? = ""
     private var nowSourceName: String? = null
     val TAG = javaClass.simpleName
     private var safeMode: Boolean = true //安全模式
-    private lateinit var toolbar:Toolbar
     private lateinit var viewModel: MainViewModel
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-        toolbar = findViewById(R.id.toolbar)
+
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
         setSupportActionBar(toolbar)
 
         viewModel = MainViewModel.provideFactory((application as YandViewApplication).repository, this,this).create(MainViewModel::class.java)
@@ -58,9 +55,9 @@ class MainActivity : BaseActivity() {
             Snackbar.make(refresh,it,Snackbar.LENGTH_SHORT).show()
         }
 
-        val appbar = findViewById<AppBarLayout>(R.id.appbar)
-        val nowHeight = appbar.layoutParams.height
-        appbar.layoutParams.height = (application as YandViewApplication).statusBarHeight()+nowHeight
+//        val appbar = findViewById<AppBarLayout>(R.id.appbar)
+//        val nowHeight = appbar.layoutParams.height
+//        appbar.layoutParams.height = (application as YandViewApplication).statusBarHeight()+nowHeight
 
 
         refresh.setOnRefreshListener {
@@ -82,13 +79,13 @@ class MainActivity : BaseActivity() {
             this.adapter = viewModel.adapter
         }
 
-        search = findViewById(R.id.search)
 
         supportActionBar?.let {
             it.setDisplayHomeAsUpEnabled(true)
             it.setHomeAsUpIndicator(R.drawable.ic_baseline_menu_24)
         }
 
+        search = findViewById(R.id.search)
         shortAnnotationDuration = resources.getInteger(android.R.integer.config_shortAnimTime)
 
         search.setOnEditorActionListener { _, actionId, _ ->
@@ -154,7 +151,7 @@ class MainActivity : BaseActivity() {
             safeMode = configSp.getBoolean("safe_mode",true)
         }
 
-        search.setText("")
+//        search.setText("")
 
     }
 

app/src/main/java/com/lsp/view/activity/pic/PicActivity.kt

@@ -12,6 +12,7 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import androidx.activity.addCallback
 import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.DataSource
@@ -25,7 +26,6 @@ import com.google.android.flexbox.*
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.snackbar.Snackbar
 import com.lsp.view.R
-import com.lsp.view.activity.BaseActivity
 import com.lsp.view.activity.main.MainActivity
 import com.lsp.view.repository.bean.ID
 import com.lsp.view.repository.bean.Size
@@ -34,7 +34,7 @@ import com.lsp.view.util.Util
 import kotlin.properties.Delegates
 
 
-class PicActivity : BaseActivity() {
+class PicActivity : AppCompatActivity() {
 
 
     private val idList = ArrayList<ID>()

app/src/main/java/com/lsp/view/activity/setting/SettingsActivity.kt

@@ -2,14 +2,12 @@ package com.lsp.view.activity.setting
 
 import android.os.Bundle
 import android.view.MenuItem
+import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.preference.PreferenceFragmentCompat
-import com.google.android.material.appbar.AppBarLayout
-import com.lsp.view.YandViewApplication
 import com.lsp.view.R
-import com.lsp.view.activity.BaseActivity
 
-class SettingsActivity : BaseActivity() {
+class SettingsActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -18,10 +16,6 @@ class SettingsActivity : BaseActivity() {
         val toolbar = findViewById<Toolbar>(R.id.toolbar)
         setSupportActionBar(toolbar)
 
-        val appbar = findViewById<AppBarLayout>(R.id.appbar)
-        val nowHeight = appbar.layoutParams.height
-        appbar.layoutParams.height = (application as YandViewApplication).statusBarHeight()+nowHeight
-
         if (savedInstanceState == null) {
             supportFragmentManager
                 .beginTransaction()

app/src/main/res/layout/activity_main.xml

@@ -19,21 +19,16 @@
 
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
             <com.google.android.material.appbar.AppBarLayout
-                android:fitsSystemWindows="true"
-                android:id="@+id/appbar"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize">
+                android:layout_height="wrap_content">
 
                 <androidx.appcompat.widget.Toolbar
                     android:layout_width="match_parent"
                     android:layout_height="?attr/actionBarSize"
                     app:menu="@menu/toolbar_menu"
                     android:id="@+id/toolbar"
+                    app:layout_scrollFlags="scroll|enterAlways|snap"
                     >
                     <EditText
                         android:layout_width="match_parent"
@@ -58,8 +53,6 @@
                     android:id="@+id/recyclerview"/>
             </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-        </LinearLayout>
-
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </RelativeLayout>
@@ -73,10 +66,5 @@
         />
 
 
-
-
-    <!--        TODO 侧边连：登录 收藏 Tag列表-->
-
-
 </androidx.drawerlayout.widget.DrawerLayout>
 

build.gradle

@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.4.31"
+    ext.kotlin_version = "1.8.10"
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10'
+        classpath 'com.android.tools.build:gradle:8.1.1'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Sep 12 00:20:10 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME