Skip to content

Commit

Permalink
Debug Release 3.9.3 (393000)
Browse files Browse the repository at this point in the history
🔧 New dependencies changes:
• Update Activity(-ktx) to 1.9.1
• Update Androidx-junit to 1.2.1
• Update Appcompat to 1.7.0
• Update Balloon to 1.6.6
• Update Gradle to 8.7.0-alpha03
• Update Gson to 2.11.0
• Update Espresso-core to 3.6.1
• Update Firebase-bom to 33.1.2
• Update Firebase-analytics(-ktx) to 22.0.2
• Update Fragment-ktx to 1.8.2
• Update GoogleServices to 4.4.2
• Update Kotlin to 2.0.0
• Update Kotlin KSP to 2.0.0-1.0.24
• Update Libsu to 6.0.0
• Update Lifecycle-viewmodel-ktx to 2.8.4
• Update Ui-tooling to 1.6.8

🗂️ Others Changes:
• Update versionCode to 393000 (3.9.3)
• Update compileSdk & targetSdk to 35
• Update buildToolsVersion to 35.0.0
• Update Gradle to 8.9
• Update Workflow File
• Fix EdgeToEdge on Android 15
• Fix NavigationBar Color on all Android
• Fix About activity crash when first opened without internet
  • Loading branch information
AkosPaha01 authored Jul 30, 2024
2 parents c77e1e8 + 596f9e5 commit e45d208
Show file tree
Hide file tree
Showing 46 changed files with 474 additions and 153 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/buildCi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

- uses: nttld/setup-ndk@v1
with:
ndk-version: r26d
ndk-version: r27

- name: Get Commit Message
id: commitMessage
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
signingKey: ${{ secrets.SIGNING_KEY }}
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }}
buildToolsVersion: '35.0.0-rc3'
buildToolsVersion: '35.0.0'

- name: Delete old APK
run: rm app/build/outputs/apk/debug/app-debug.apk
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/buildPro.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }}
env:
buildToolsVersion: '35.0.0-rc3'
buildToolsVersion: '35.0.0'

- name: List files
run: ls app/build/outputs/apk/pro
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/buildRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

- uses: nttld/setup-ndk@v1
with:
ndk-version: r26d
ndk-version: r27

- name: Get Commit Message
id: commitMessage
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
signingKey: ${{ secrets.SIGNING_KEY }}
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }}
buildToolsVersion: '35.0.0-rc3'
buildToolsVersion: '35.0.0'

- name: List files
run: ls app/build/outputs/apk/release
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deployToGoogle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

- uses: nttld/setup-ndk@v1
with:
ndk-version: r26d
ndk-version: r27

- name: Setup JDK
uses: actions/setup-java@v4
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }}
env:
buildToolsVersion: '35.0.0-rc3'
buildToolsVersion: '35.0.0'

- name: Upload Artifact
uses: actions/upload-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pullRequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

- uses: nttld/setup-ndk@v1
with:
ndk-version: r26d
ndk-version: r27

- name: Setup JDK
uses: actions/setup-java@v4
Expand Down
6 changes: 3 additions & 3 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ plugins {
}

android {
buildToolsVersion = "35.0.0 rc3"
compileSdkPreview = "VanillaIceCream"
buildToolsVersion = "35.0.0"
compileSdk = 35
buildFeatures.dataBinding = true
buildFeatures.viewBinding = true
buildFeatures.buildConfig = true
Expand All @@ -24,16 +24,16 @@ android {
defaultConfig {
applicationId = "de.dertyp7214.rboardthememanager"
minSdk = 31
targetSdk = 34
versionCode = 392008
versionName = "3.9.2"
targetSdk = 35
versionCode = 393000
versionName = "3.9.3"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

resourceConfigurations += listOf(
"ar", "cs", "da", "de",
"el", "en", "es", "fi",
"fr", "hi", "hu", "id",
"fr", "hi", "hu", "in",
"it", "ja", "nl", "no",
"pl", "pt-rBR", "ro", "ru",
"sv", "uk", "vi",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class Application : Application() {
Config.RAW_PREFIX = Config.GITLAB_RAW_PREFIX
}
if (!URL("https://bin.utwitch.net").isReachable())
Logger.customBin = "hastebin.com"
Logger.customBin = "bin.dertyp.dev"
}
PreferenceManager.getDefaultSharedPreferences(this)
.edit { putString("logMode", if (BuildConfig.DEBUG) "VERBOSE" else "ERROR") }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ fun hasRoot(): Boolean {

@Suppress("DEPRECATION", "UNUSED_PARAMETER")
fun hasRoot(activity: Activity): Boolean = try {
Shell.su().exec()
Shell.cmd().exec()
hasRoot()
} catch (_: Exception) {
false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ fun String.fontSize(relative: Float): CharSequence {

@Suppress("DEPRECATION")
fun String.runAsCommand(callback: (result: Array<String>) -> Unit = {}): Boolean {
return Shell.su(this).exec().apply {
return Shell.cmd(this).exec().apply {
if (err.size > 0) Logger.log(
Logger.Companion.Type.ERROR, "RUN COMMAND",
err.toTypedArray().apply { callback(this) }.contentToString()
Expand Down Expand Up @@ -108,7 +108,7 @@ fun String.setSystemProperty(value: String = "", saveToModule: Boolean = false):

@Suppress("DEPRECATION")
fun List<String>.runAsCommand(callback: (result: Array<String>) -> Unit = {}): Boolean {
return Shell.su(*this.toTypedArray()).exec().apply {
return Shell.cmd(*this.toTypedArray()).exec().apply {
if (err.size > 0) Logger.log(
Logger.Companion.Type.ERROR, "RUN COMMAND",
err.toTypedArray().apply { callback(this) }.contentToString()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@ package de.dertyp7214.rboardthememanager.dialogs

import android.app.Dialog
import android.os.Bundle
import android.graphics.Color
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.activity.ComponentDialog
import androidx.activity.SystemBarStyle
import androidx.activity.enableEdgeToEdge
import androidx.fragment.app.DialogFragment
import androidx.fragment.app.FragmentActivity
import com.google.android.material.button.MaterialButton
Expand Down Expand Up @@ -41,6 +44,14 @@ class NoRootDialog : DialogFragment() {

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
activity?.enableEdgeToEdge(
statusBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT)
)

dialog?.window?.setDecorFitsSystemWindows(false)

dialog?.window?.isNavigationBarContrastEnforced = false
dialog?.window?.navigationBarColor = Color.TRANSPARENT

val getMagiskButton: MaterialButton = view.findViewById(R.id.magisk_button)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
package de.dertyp7214.rboardthememanager.dialogs

import android.app.Dialog
import android.graphics.Color
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.activity.ComponentDialog
import androidx.activity.SystemBarStyle
import androidx.activity.enableEdgeToEdge
import androidx.fragment.app.DialogFragment
import androidx.fragment.app.FragmentActivity
import com.google.android.material.card.MaterialCardView
Expand Down Expand Up @@ -47,6 +50,14 @@ class UsageDialog(

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
activity?.enableEdgeToEdge(
statusBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT)
)

dialog?.window?.setDecorFitsSystemWindows(false)

dialog?.window?.isNavigationBarContrastEnforced = false
dialog?.window?.navigationBarColor = Color.TRANSPARENT

val magiskCard: MaterialCardView = view.findViewById(R.id.cardMagisk)
val gboardCard: MaterialCardView = view.findViewById(R.id.cardGboard)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import android.view.MenuInflater
import android.view.MenuItem
import android.view.View
import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide
import com.bumptech.glide.load.resource.bitmap.RoundedCorners
Expand All @@ -18,6 +19,8 @@ import de.Maxr1998.modernpreferences.helpers.pref
import de.dertyp7214.rboardthememanager.R
import de.dertyp7214.rboardthememanager.core.SafeJSON
import de.dertyp7214.rboardthememanager.core.openUrl
import de.dertyp7214.rboardthememanager.core.isReachable
import java.net.URL

class About(private val activity: AppCompatActivity, private val args: SafeJSON) :
AbstractMenuPreference() {
Expand Down Expand Up @@ -45,11 +48,16 @@ class About(private val activity: AppCompatActivity, private val args: SafeJSON)
builder.pref("rkbdi") {
titleRes = R.string.rkbdi
summaryRes = R.string.owner_themer
useTint = false
icon = glide
.load(activity.getString(R.string.rkbdi_image))
.apply(options)
.submit(100, 100).get()
if (!URL(activity.getString(R.string.rkbdi_image)).isReachable()) {
iconRes = R.drawable.ic_person
}
else{
useTint = false
icon = glide
.load(activity.getString(R.string.rkbdi_image))
.apply(options)
.submit(100, 100).get()
}
onClick {
activity.openUrl(activity.getString(R.string.rkbdi_github))
false
Expand All @@ -58,11 +66,16 @@ class About(private val activity: AppCompatActivity, private val args: SafeJSON)
builder.pref("akos") {
titleRes = R.string.akos_paha
summaryRes = R.string.developer_themer
useTint = false
icon = glide
.load(activity.getString(R.string.akos_image))
.apply(options)
.submit(100, 100).get()
if (!URL(activity.getString(R.string.akos_image)).isReachable()) {
iconRes = R.drawable.ic_person
}
else{
useTint = false
icon = glide
.load(activity.getString(R.string.akos_image))
.apply(options)
.submit(100, 100).get()
}
onClick {
activity.openUrl(activity.getString(R.string.akos_github))
false
Expand All @@ -71,11 +84,16 @@ class About(private val activity: AppCompatActivity, private val args: SafeJSON)
builder.pref("dertyp") {
titleRes = R.string.dertyp
summaryRes = R.string.developer
useTint = false
icon = glide
.load(activity.getString(R.string.dertyp_image))
.apply(options)
.submit(100, 100).get()
if (!URL(activity.getString(R.string.dertyp_image)).isReachable()) {
iconRes = R.drawable.ic_person
}
else{
useTint = false
icon = glide
.load(activity.getString(R.string.dertyp_image))
.apply(options)
.submit(100, 100).get()
}
onClick {
activity.openUrl(activity.getString(R.string.dertyp_github))
false
Expand All @@ -84,11 +102,16 @@ class About(private val activity: AppCompatActivity, private val args: SafeJSON)
builder.pref("dan") {
titleRes = R.string.dan
summaryRes = R.string.moderator
useTint = false
icon = glide
.load(activity.getString(R.string.dan_image))
.apply(options)
.submit(100, 100).get()
if (!URL(activity.getString(R.string.dan_image)).isReachable()) {
iconRes = R.drawable.ic_person
}
else{
useTint = false
icon = glide
.load(activity.getString(R.string.dan_image))
.apply(options)
.submit(100, 100).get()
}
onClick {
activity.openUrl(activity.getString(R.string.dan_github))
false
Expand Down Expand Up @@ -181,4 +204,4 @@ class About(private val activity: AppCompatActivity, private val args: SafeJSON)
iconRes = FlagKit.getResId(activity, "cn")
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ class Settings(private val activity: Activity, private val args: SafeJSON) : Abs
"clear_recent_emojis",
R.string.clear_recent_emojis,
R.string.clear_recent_emojis_long,
R.drawable.ic_emoji,
R.drawable.ic_emoji_clear,
"",
TYPE.STRING,
listOf(),
Expand Down Expand Up @@ -338,7 +338,7 @@ class Settings(private val activity: Activity, private val args: SafeJSON) : Abs
"LOGS",
R.string.logs,
R.string.logs_long,
-1,
R.drawable.ic_logs,
"",
TYPE.STRING,
listOf(),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package de.dertyp7214.rboardthememanager.screens

import android.graphics.Color
import android.os.Bundle
import android.view.View
import android.widget.Toast
import androidx.activity.SystemBarStyle
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.LinearLayoutManager
Expand All @@ -20,6 +24,7 @@ import de.dertyp7214.rboardthememanager.core.resize
import de.dertyp7214.rboardthememanager.core.screenWidth
import de.dertyp7214.rboardthememanager.data.ThemeDataClass
import de.dertyp7214.rboardthememanager.databinding.ActivityInstallPackBinding
import dev.chrisbanes.insetter.applyInsetter
import java.io.File
import java.util.regex.Pattern

Expand All @@ -28,6 +33,13 @@ class InstallPackActivity : AppCompatActivity() {
private lateinit var binding: ActivityInstallPackBinding

override fun onCreate(savedInstanceState: Bundle?) {
enableEdgeToEdge(
statusBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT)
)
window.setDecorFitsSystemWindows(false)
val view: View = window.decorView
window.isNavigationBarContrastEnforced = false
window.navigationBarColor = Color.TRANSPARENT
super.onCreate(savedInstanceState)
binding = ActivityInstallPackBinding.inflate(layoutInflater)
setContentView(binding.root)
Expand All @@ -36,6 +48,18 @@ class InstallPackActivity : AppCompatActivity() {
val toolbar = binding.toolbar
val recyclerview = binding.recyclerview

toolbar.applyInsetter {
type(statusBars = true) {
margin()
}
}

recyclerview.applyInsetter {
type(navigationBars = true) {
margin()
}
}

toolbar.title = getString(R.string.install_themes, "0")

val themes = arrayListOf<ThemeDataClass>()
Expand Down
Loading

0 comments on commit e45d208

Please sign in to comment.