Commit a8faa526 authored by wanglei's avatar wanglei

feat:白包订版

parent 4b2cd782
...@@ -36,6 +36,32 @@ android { ...@@ -36,6 +36,32 @@ android {
buildFeatures { buildFeatures {
viewBinding = true viewBinding = true
} }
lint {
//https://blog.csdn.net/destiny1507/article/details/104329583
checkReleaseBuilds = false
abortOnError = false
}
signingConfigs {
create("keyStore") {
storeFile = file("../kokoAndroidConfigure.jks")
storePassword = "wenlu1796"
keyAlias = "Smilekoko"
keyPassword = "wanglei1796"
}
}
buildTypes {
val signConfig = signingConfigs.getByName("keyStore")
release {
isMinifyEnabled = true
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
signingConfig = signConfig
}
}
} }
dependencies { dependencies {
......
...@@ -12,7 +12,10 @@ import androidx.appcompat.app.AppCompatActivity ...@@ -12,7 +12,10 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.core.view.ViewCompat import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat
import androidx.navigation.NavController
import androidx.navigation.NavDestination
import androidx.navigation.findNavController import androidx.navigation.findNavController
import androidx.navigation.fragment.NavHostFragment
import com.google.android.material.navigation.NavigationBarView import com.google.android.material.navigation.NavigationBarView
import com.zxhy.solarmasterace.databinding.ActivityMainBinding import com.zxhy.solarmasterace.databinding.ActivityMainBinding
import com.zxhy.solarmasterace.permission.requestStoreFollow import com.zxhy.solarmasterace.permission.requestStoreFollow
...@@ -40,6 +43,24 @@ class MainActivity : AppCompatActivity() { ...@@ -40,6 +43,24 @@ class MainActivity : AppCompatActivity() {
binding.bNav.itemIconTintList = null binding.bNav.itemIconTintList = null
binding.bNav.setItemIconSizeRes(R.dimen.dp_24) binding.bNav.setItemIconSizeRes(R.dimen.dp_24)
val navHostFragment =
supportFragmentManager.findFragmentById(R.id.fragment_container_view) as NavHostFragment
navHostFragment.navController.addOnDestinationChangedListener { controller, destination, arguments ->
when (destination.id) {
R.id.managerFragment -> {
window.statusBarColor =
ContextCompat.getColor(this@MainActivity, R.color.color_FF5C67E5)
binding.bNav.selectedItemId = R.id.nav_manager
}
R.id.toolsFragment -> {
window.statusBarColor =
ContextCompat.getColor(this@MainActivity, R.color.white)
binding.bNav.selectedItemId = R.id.nav_tools
}
}
}
binding.bNav.setOnItemSelectedListener(object : OnItemSelectedListener, binding.bNav.setOnItemSelectedListener(object : OnItemSelectedListener,
NavigationBarView.OnItemSelectedListener { NavigationBarView.OnItemSelectedListener {
override fun onItemSelected( override fun onItemSelected(
......
...@@ -10,6 +10,7 @@ import android.view.View ...@@ -10,6 +10,7 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import com.zxhy.solarmasterace.MainActivity
import com.zxhy.solarmasterace.R import com.zxhy.solarmasterace.R
import com.zxhy.solarmasterace.databinding.FragmentManagerBinding import com.zxhy.solarmasterace.databinding.FragmentManagerBinding
import com.zxhy.solarmasterace.internalstorage.InternalStorageActivity import com.zxhy.solarmasterace.internalstorage.InternalStorageActivity
......
...@@ -144,6 +144,7 @@ class ToolsFragment : Fragment() { ...@@ -144,6 +144,7 @@ class ToolsFragment : Fragment() {
} }
companion object { companion object {
@JvmStatic @JvmStatic
fun newInstance() = fun newInstance() =
......
...@@ -19,11 +19,11 @@ ...@@ -19,11 +19,11 @@
<com.google.android.material.bottomnavigation.BottomNavigationView <com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/b_nav" android:id="@+id/b_nav"
android:layout_marginTop="20dp"
android:background="@color/white"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginTop="20dp"
android:background="@color/white"
app:itemBackground="@color/white" app:itemBackground="@color/white"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:menu="@menu/menu_main" /> app:menu="@menu/menu_main" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment