V2.1(3) 处理bug
This commit is contained in:
parent
dbaff1b05e
commit
82df499eb4
@ -13,14 +13,23 @@ plugins {
|
|||||||
|
|
||||||
val timestamp = SimpleDateFormat("MM_dd_HH_mm").format(Date())
|
val timestamp = SimpleDateFormat("MM_dd_HH_mm").format(Date())
|
||||||
android {
|
android {
|
||||||
|
signingConfigs {
|
||||||
|
create("release") {
|
||||||
|
storeFile =
|
||||||
|
file("C:\\SourceTree_depository\\BreezeBoard_com.app.input.breeze.board\\app\\BreezeBoard")
|
||||||
|
storePassword = "123456"
|
||||||
|
keyPassword = "123456"
|
||||||
|
keyAlias = "key0"
|
||||||
|
}
|
||||||
|
}
|
||||||
namespace = "com.app.input.breeze.board"
|
namespace = "com.app.input.breeze.board"
|
||||||
compileSdk = 36
|
compileSdk = 36
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId = "com.app.input.breeze.board"
|
applicationId = "com.app.input.breeze.board"
|
||||||
minSdk = 24
|
minSdk = 24
|
||||||
targetSdk = 36
|
targetSdk = 36
|
||||||
versionCode = 2
|
versionCode = 3
|
||||||
versionName = "2.0"
|
versionName = "2.1"
|
||||||
setProperty(
|
setProperty(
|
||||||
"archivesBaseName",
|
"archivesBaseName",
|
||||||
"BreezeBoard_V" + versionName + "(${versionCode})_$timestamp"
|
"BreezeBoard_V" + versionName + "(${versionCode})_$timestamp"
|
||||||
@ -31,6 +40,7 @@ android {
|
|||||||
buildTypes {
|
buildTypes {
|
||||||
release {
|
release {
|
||||||
isMinifyEnabled = true
|
isMinifyEnabled = true
|
||||||
|
signingConfig = signingConfigs.getByName("release")
|
||||||
proguardFiles(
|
proguardFiles(
|
||||||
getDefaultProguardFile("proguard-android-optimize.txt"),
|
getDefaultProguardFile("proguard-android-optimize.txt"),
|
||||||
"proguard-rules.pro"
|
"proguard-rules.pro"
|
||||||
|
|||||||
@ -29,6 +29,7 @@ public class CategoryScreen extends AppCompatActivity {
|
|||||||
vb = CategoryScreenBinding.inflate(getLayoutInflater());
|
vb = CategoryScreenBinding.inflate(getLayoutInflater());
|
||||||
EdgeToEdge.enable(this);
|
EdgeToEdge.enable(this);
|
||||||
setContentView(vb.getRoot());
|
setContentView(vb.getRoot());
|
||||||
|
TPAdManager.INSTANCE.loadAllAd(this);
|
||||||
ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
|
ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
|
||||||
Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
|
Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
|
||||||
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
|
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
|
||||||
|
|||||||
@ -7,6 +7,7 @@ import androidx.core.view.ViewCompat
|
|||||||
import androidx.core.view.WindowInsetsCompat
|
import androidx.core.view.WindowInsetsCompat
|
||||||
import androidx.lifecycle.lifecycleScope
|
import androidx.lifecycle.lifecycleScope
|
||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
|
import com.ad.tradpluslibrary.TPAdManager
|
||||||
import com.ad.tradpluslibrary.TPAdManager.showTPAD
|
import com.ad.tradpluslibrary.TPAdManager.showTPAD
|
||||||
import com.app.input.breeze.board.bean.KeyboardTheme
|
import com.app.input.breeze.board.bean.KeyboardTheme
|
||||||
import com.app.input.breeze.board.database.AppDatabase
|
import com.app.input.breeze.board.database.AppDatabase
|
||||||
@ -25,13 +26,13 @@ class FavoriteThemeActivity : AppCompatActivity() {
|
|||||||
vb = FavoriteActivityBinding.inflate(layoutInflater)
|
vb = FavoriteActivityBinding.inflate(layoutInflater)
|
||||||
enableEdgeToEdge()
|
enableEdgeToEdge()
|
||||||
setContentView(vb.root)
|
setContentView(vb.root)
|
||||||
|
TPAdManager.loadAllAd(this)
|
||||||
showTPAD(this) { }
|
showTPAD(this) { }
|
||||||
ViewCompat.setOnApplyWindowInsetsListener(findViewById(android.R.id.content)) { v, insets ->
|
ViewCompat.setOnApplyWindowInsetsListener(findViewById(android.R.id.content)) { v, insets ->
|
||||||
val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
|
val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
|
||||||
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
|
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
|
||||||
insets
|
insets
|
||||||
}
|
}
|
||||||
|
|
||||||
setupRecyclerView()
|
setupRecyclerView()
|
||||||
observeFavorites()
|
observeFavorites()
|
||||||
setupClickListeners()
|
setupClickListeners()
|
||||||
|
|||||||
@ -45,6 +45,7 @@ public class PreviewActivity extends AppCompatActivity {
|
|||||||
vb = PreviewActivityBinding.inflate(getLayoutInflater());
|
vb = PreviewActivityBinding.inflate(getLayoutInflater());
|
||||||
EdgeToEdge.enable(this);
|
EdgeToEdge.enable(this);
|
||||||
setContentView(vb.getRoot());
|
setContentView(vb.getRoot());
|
||||||
|
TPAdManager.INSTANCE.loadAllAd(this);
|
||||||
TPAdManager.INSTANCE.showTPAD(this,()-> null);
|
TPAdManager.INSTANCE.showTPAD(this,()-> null);
|
||||||
ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
|
ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
|
||||||
Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
|
Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
|
||||||
|
|||||||
@ -11,9 +11,9 @@ import android.provider.Settings
|
|||||||
import android.view.View
|
import android.view.View
|
||||||
import androidx.activity.enableEdgeToEdge
|
import androidx.activity.enableEdgeToEdge
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import androidx.core.graphics.Insets
|
|
||||||
import androidx.core.view.ViewCompat
|
import androidx.core.view.ViewCompat
|
||||||
import androidx.core.view.WindowInsetsCompat
|
import androidx.core.view.WindowInsetsCompat
|
||||||
|
import com.ad.tradpluslibrary.TPAdManager.loadAllAd
|
||||||
import com.app.input.breeze.board.BuildConfig
|
import com.app.input.breeze.board.BuildConfig
|
||||||
import com.app.input.breeze.board.R
|
import com.app.input.breeze.board.R
|
||||||
import com.app.input.breeze.board.databinding.SettingsActivityBinding
|
import com.app.input.breeze.board.databinding.SettingsActivityBinding
|
||||||
@ -29,7 +29,7 @@ class SettingsScreen : AppCompatActivity() {
|
|||||||
vb = SettingsActivityBinding.inflate(layoutInflater)
|
vb = SettingsActivityBinding.inflate(layoutInflater)
|
||||||
enableEdgeToEdge()
|
enableEdgeToEdge()
|
||||||
setContentView(vb.root)
|
setContentView(vb.root)
|
||||||
|
loadAllAd(this)
|
||||||
ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
|
ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
|
||||||
val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
|
val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
|
||||||
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
|
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
|
||||||
|
|||||||
@ -22,6 +22,7 @@ import androidx.core.view.isVisible
|
|||||||
import androidx.lifecycle.lifecycleScope
|
import androidx.lifecycle.lifecycleScope
|
||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
|
import com.ad.tradpluslibrary.TPAdManager.loadAllAd
|
||||||
import com.ad.tradpluslibrary.TPAdManager.showTPAD
|
import com.ad.tradpluslibrary.TPAdManager.showTPAD
|
||||||
import com.app.input.breeze.board.App
|
import com.app.input.breeze.board.App
|
||||||
import com.app.input.breeze.board.R
|
import com.app.input.breeze.board.R
|
||||||
@ -103,7 +104,7 @@ class ThemeDetailActivity : AppCompatActivity() {
|
|||||||
v!!.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
|
v!!.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
|
||||||
insets
|
insets
|
||||||
})
|
})
|
||||||
|
loadAllAd(this)
|
||||||
findViewId()
|
findViewId()
|
||||||
getExtraData()
|
getExtraData()
|
||||||
displayData()
|
displayData()
|
||||||
|
|||||||
@ -39,6 +39,7 @@ public class ThemeListActivity extends AppCompatActivity {
|
|||||||
return insets;
|
return insets;
|
||||||
});
|
});
|
||||||
name = getIntent().getStringExtra(KEY_NAME);
|
name = getIntent().getStringExtra(KEY_NAME);
|
||||||
|
TPAdManager.INSTANCE.loadAllAd(this);
|
||||||
TPAdManager.INSTANCE.showTPAD(this,()-> null);
|
TPAdManager.INSTANCE.showTPAD(this,()-> null);
|
||||||
initData();
|
initData();
|
||||||
initClick();
|
initClick();
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||||
<!-- Base application theme. -->
|
<!-- Base application theme. -->
|
||||||
<style name="MyKeyBoard" beanWrapper="Theme.MaterialComponents.DayNight.NoActionBar">
|
<style name="MyKeyBoard" parent="Theme.MaterialComponents.DayNight.NoActionBar">
|
||||||
<!-- Primary brand color. -->
|
<!-- Primary brand color. -->
|
||||||
<item name="colorPrimary">@color/purple_200</item>
|
<item name="colorPrimary">@color/purple_200</item>
|
||||||
<item name="colorPrimaryVariant">@color/purple_700</item>
|
<item name="colorPrimaryVariant">@color/purple_700</item>
|
||||||
|
|||||||
@ -20,4 +20,6 @@ kotlin.code.style=official
|
|||||||
# Enables namespacing of each library's R class so that its R class includes only the
|
# Enables namespacing of each library's R class so that its R class includes only the
|
||||||
# resources declared in the library itself and none from the library's dependencies,
|
# resources declared in the library itself and none from the library's dependencies,
|
||||||
# thereby reducing the size of the R class for that library
|
# thereby reducing the size of the R class for that library
|
||||||
android.nonTransitiveRClass=true
|
android.nonTransitiveRClass=true
|
||||||
|
systemProp.https.proxyHost=127.0.0.1
|
||||||
|
systemProp.https.proxyPort=2080
|
||||||
Loading…
Reference in New Issue
Block a user