diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 2cd7bfe..e2eb010 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -4,18 +4,18 @@ - + - + - - + + - - + + diff --git a/app/build.gradle b/app/build.gradle index 25b76f1..bc9118b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,11 +4,21 @@ plugins { } android { + +// signingConfigs { +// debug { +// storeFile file('D:\\Android_Files\\NewKeyboard\\info\\key0.jks') +// storePassword 'kb123456' +// keyPassword 'kb123456' +// keyAlias 'kb_key0' +// } +// } + namespace 'com.timber.soft.newkeyboard' compileSdk 34 defaultConfig { - applicationId "com.timber.soft.newkeyboard" + applicationId "com.theme.keyboard.fancy" minSdk 22 targetSdk 34 versionCode 1 @@ -22,6 +32,10 @@ android { minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } +// debug { +// minifyEnabled true +// proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' +// } } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index cf50408..8d55a63 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -20,3 +20,13 @@ # hide the original source file name. #-renamesourcefileattribute SourceFile +-keepattributes Signature +-keepattributes *Annotation* +-keep class com.google.gson.stream.** { *; } +-keep class com.google.gson.examples.android.model.** { *; } +-keep class * implements com.google.gson.TypeAdapter { *; } +-keep class com.google.gson.internal.LinkedTreeMap { *; } +-keep class com.timber.soft.newkeyboard.tools.** { *; } + +-keep class com.omicronapplications.** { *; } +-keep class net.sf.sevenzipjbinding.** { *; } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index aa4861d..8687634 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,9 +9,9 @@ android:allowBackup="true" android:dataExtractionRules="@xml/data_extraction_rules" android:fullBackupContent="@xml/backup_rules" - android:icon="@mipmap/ic_launcher" + android:icon="@mipmap/png_logo_icon" android:label="@string/app_name" - android:roundIcon="@mipmap/ic_launcher_round" + android:roundIcon="@mipmap/png_logo_icon" android:supportsRtl="true" android:theme="@style/Theme.NewKeyboard" tools:targetApi="31"> diff --git a/app/src/main/java/com/timber/soft/newkeyboard/activityandview/MainActivity.kt b/app/src/main/java/com/timber/soft/newkeyboard/activityandview/MainActivity.kt index 8d455a5..c9248a2 100644 --- a/app/src/main/java/com/timber/soft/newkeyboard/activityandview/MainActivity.kt +++ b/app/src/main/java/com/timber/soft/newkeyboard/activityandview/MainActivity.kt @@ -60,6 +60,7 @@ class MainActivity : AppCompatActivity() { (View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or View.SYSTEM_UI_FLAG_LAYOUT_STABLE) or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR window.statusBarColor = Color.TRANSPARENT } + initDrawer() initTabLayOut() binding.viewpager.offscreenPageLimit = 3 diff --git a/app/src/main/java/com/timber/soft/newkeyboard/activityandview/MyKeyboardView.kt b/app/src/main/java/com/timber/soft/newkeyboard/activityandview/MyKeyboardView.kt index 717dab8..551e92e 100644 --- a/app/src/main/java/com/timber/soft/newkeyboard/activityandview/MyKeyboardView.kt +++ b/app/src/main/java/com/timber/soft/newkeyboard/activityandview/MyKeyboardView.kt @@ -159,7 +159,6 @@ class MyKeyboardView @JvmOverloads constructor( )?.let { drawBG -> icDel = getStatus(drawBG, drawBG) - } getbgic(con, it.plus(AppVal.parent_path).plus(AppVal.title_shitf_ic_lock))?.let { icShittLock = it diff --git a/app/src/main/res/drawable/png_loading.png b/app/src/main/res/drawable/png_loading.png index e19dde0..bb4c3e8 100644 Binary files a/app/src/main/res/drawable/png_loading.png and b/app/src/main/res/drawable/png_loading.png differ diff --git a/app/src/main/res/drawable/png_loading_err.png b/app/src/main/res/drawable/png_loading_err.png index 1338626..f5f85f4 100644 Binary files a/app/src/main/res/drawable/png_loading_err.png and b/app/src/main/res/drawable/png_loading_err.png differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 32fd829..3718ddc 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -81,7 +81,7 @@ + android:src="@mipmap/png_logo_icon" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ae28766..f1ca2da 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - NewKeyboard + Fancy Keyboard Theme Share our Apps Find us in store Setting