diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 0c0c338..42b1f0d 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -3,7 +3,20 @@ - + + + + + + + + + + + + + + diff --git a/app/build.gradle b/app/build.gradle index 06f8d16..e67e660 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,17 +7,17 @@ android { namespace 'com.timber.soft.myemoticon' compileSdk 34 - signingConfigs { - debug { - storeFile file('D:\\Android_Files\\MyEmoticon\\info\\key_emoticon_test.jks') - storePassword 'key123' - keyPassword 'key123' - keyAlias 'key_emoticon' - } - } +// signingConfigs { +// debug { +// storeFile file('D:\\Android_Files\\MyEmoticon\\info\\key_emoticon_test.jks') +// storePassword 'key123' +// keyPassword 'key123' +// keyAlias 'key_emoticon' +// } +// } defaultConfig { - applicationId "com.stickify.stickers.app.test" + applicationId "com.stickify.stickers.app" minSdk 22 targetSdk 34 versionCode 1 @@ -64,5 +64,4 @@ dependencies { implementation 'com.github.bumptech.glide:glide:4.12.0' annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0' - } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 30441de..8aa9ce7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -8,9 +8,9 @@ android:allowBackup="true" android:dataExtractionRules="@xml/data_extraction_rules" android:fullBackupContent="@xml/backup_rules" - android:icon="@mipmap/ic_launcher" + android:icon="@mipmap/icon_logo" android:label="@string/app_name" - android:roundIcon="@mipmap/ic_launcher_round" + android:roundIcon="@mipmap/icon_logo" android:supportsRtl="true" android:theme="@style/Theme.MyEmoticon" tools:targetApi="31"> @@ -30,7 +30,7 @@ diff --git a/app/src/main/java/com/timber/soft/myemoticon/MainActivity.kt b/app/src/main/java/com/timber/soft/myemoticon/MainActivity.kt index e3112c1..a6bcff7 100644 --- a/app/src/main/java/com/timber/soft/myemoticon/MainActivity.kt +++ b/app/src/main/java/com/timber/soft/myemoticon/MainActivity.kt @@ -11,6 +11,7 @@ import android.os.Bundle import android.util.TypedValue import android.view.Gravity import android.view.View +import android.view.Window import android.widget.TextView import androidx.annotation.RequiresApi import androidx.appcompat.app.AppCompatActivity @@ -63,7 +64,7 @@ class MainActivity : AppCompatActivity() { binding.btMenu.setOnClickListener() { binding.drawerRoot.openDrawer(GravityCompat.START) } - + binding.drawerRoot.addDrawerListener(object : DrawerLayout.DrawerListener { override fun onDrawerSlide(drawerView: View, slideOffset: Float) { } diff --git a/app/src/main/java/com/timber/soft/myemoticon/tools/AppTools.kt b/app/src/main/java/com/timber/soft/myemoticon/tools/AppTools.kt index 13d5eab..1f0f5a3 100644 --- a/app/src/main/java/com/timber/soft/myemoticon/tools/AppTools.kt +++ b/app/src/main/java/com/timber/soft/myemoticon/tools/AppTools.kt @@ -38,10 +38,13 @@ object AppTools { fun dpCovertPx(context: Context): Int { // 获取当前设备的屏幕密度,并赋值给变量 scale var result = 0 + // 获取状态栏高度的资源ID,赋值给变量 resourceId val resourceId = context.resources.getIdentifier("status_bar_height", "dimen", "android") + // 如果资源ID大于0,则获取状态栏的高度并赋值给变量 result if (resourceId > 0) { result = context.resources.getDimensionPixelSize(resourceId) } + // 返回结果 return result } diff --git a/app/src/main/java/com/timber/soft/myemoticon/tools/AppVal.kt b/app/src/main/java/com/timber/soft/myemoticon/tools/AppVal.kt index 03de265..0b735ca 100644 --- a/app/src/main/java/com/timber/soft/myemoticon/tools/AppVal.kt +++ b/app/src/main/java/com/timber/soft/myemoticon/tools/AppVal.kt @@ -1,7 +1,7 @@ package com.timber.soft.myemoticon.tools object AppVal { - const val AUTHOR = "com.stickify.stickers.app.test.StickerProvider" + const val AUTHOR = "com.stickify.stickers.app.StickerProvider" const val STICKER_ACTION = "com.whatsapp.intent.action.ENABLE_STICKER_PACK" const val KEY_PACK_ID = "sticker_pack_id" const val KEY_PACK_AUTHORITY = "sticker_pack_authority" diff --git a/app/src/main/res/layout/activity_details.xml b/app/src/main/res/layout/activity_details.xml index 4da76a6..bd8313b 100644 --- a/app/src/main/res/layout/activity_details.xml +++ b/app/src/main/res/layout/activity_details.xml @@ -50,6 +50,7 @@ android:layout_height="0dp" android:background="@color/main_bg_color" android:paddingStart="12dp" + android:paddingTop="6dp" android:paddingEnd="12dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/app_bar" diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 83f396d..2a2dce4 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -94,7 +94,7 @@ + android:src="@mipmap/icon_logo" /> diff --git a/app/src/main/res/mipmap-xxxhdpi/icon_logo.png b/app/src/main/res/mipmap-xxxhdpi/icon_logo.png new file mode 100644 index 0000000..92602a6 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/icon_logo.png differ