Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import java.util.Properties
import org.jetbrains.kotlin.config.KotlinCompilerVersion
import java.util.Properties

plugins {
id("com.android.application")
kotlin("android")
kotlin("kapt")
id("com.google.devtools.ksp")
id("kotlin-parcelize")
}

Expand All @@ -15,9 +16,9 @@ android {
defaultConfig {
applicationId = AppConfig.appId
minSdk = AppConfig.minSdkVersion
targetSdk = AppConfig.targetSdlVersion
versionCode = 15
versionName = "2.2.1"
targetSdk = AppConfig.targetSdkVersion
versionCode = 16
versionName = "2.2.2"
vectorDrawables.useSupportLibrary = true
resourceConfigurations.addAll(listOf("en", "de", "pt-rBR"))
javaCompileOptions {
Expand Down Expand Up @@ -62,8 +63,8 @@ android {
}

buildFeatures {
android.buildFeatures.viewBinding = true
android.buildFeatures.dataBinding = true
viewBinding = true
dataBinding = true
compose = true
}

Expand All @@ -73,7 +74,7 @@ android {
getByName("androidTest").assets.srcDir("$projectDir/schemas")
}

packagingOptions {
packaging {
resources.excludes.addAll(
arrayOf(
"/META-INF/**",
Expand All @@ -88,23 +89,19 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = "1.8"
kotlin {
jvmToolchain(17)
}

composeOptions {
kotlinCompilerExtensionVersion = Compose.kotlinCompilerExtensionVersion
}
}

kapt {
correctErrorTypes = true
}

dependencies {
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
implementation(kotlin("stdlib-jdk8", KotlinCompilerVersion.VERSION))
Expand All @@ -123,7 +120,8 @@ dependencies {
implementation(AndroidX.preference)
implementation(AndroidX.room)
implementation(AndroidX.roomRuntime)
kapt(AndroidX.roomCompiler)
implementation(AndroidX.workManager)
ksp(AndroidX.roomCompiler)

implementation(Google.gson)

Expand Down
17 changes: 7 additions & 10 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />

<queries>
<package android:name="net.dinglisch.android.taskerm" />
</queries>

<application
android:name=".SysctlGuiApp"
android:allowBackup="false"
Expand Down Expand Up @@ -66,7 +70,7 @@
<receiver
android:name=".receivers.BootReceiver"
android:enabled="true"
android:exported="false">
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
Expand All @@ -90,19 +94,12 @@
</intent-filter>
</receiver>

<service
android:name=".services.TaskerService"
android:enabled="true"
android:exported="false" />
<service
android:name=".services.StartUpService"
android:permission="android.permission.BIND_JOB_SERVICE" />
<service
android:name=".widgets.FavoritesWidgetService"
android:permission="android.permission.BIND_REMOTEVIEWS" />
<service
android:name=".services.tiles.StartUpTileService"
android:exported="false"
android:exported="true"
android:icon="@drawable/ic_start_up_tile"
android:label="@string/tile_toggle_start_up_label"
android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
Expand All @@ -113,7 +110,7 @@
</service>
<service
android:name=".services.tiles.StartAppTileService"
android:exported="false"
android:exported="true"
android:icon="@drawable/ic_start_app_tile"
android:label="@string/tile_start_app_label"
android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/kotlin/com/androidvip/sysctlgui/Extensions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ import com.androidvip.sysctlgui.receivers.TaskerReceiver
import com.google.android.material.color.ColorRoles
import com.google.android.material.color.MaterialColors
import com.google.android.material.snackbar.Snackbar
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import java.io.InputStream
import kotlin.contracts.ExperimentalContracts
import kotlin.contracts.contract
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext

fun View.goAway() { this.visibility = View.GONE }
fun View.hide() { this.visibility = View.INVISIBLE }
fun View.show() { this.visibility = View.VISIBLE }

fun View.getColorRoles(@AttrRes colorAttrRes: Int = R.attr.colorPrimary): ColorRoles {
fun View.getColorRoles(@AttrRes colorAttrRes: Int = androidx.appcompat.R.attr.colorPrimary): ColorRoles {
val color = MaterialColors.getColor(this, colorAttrRes)
return MaterialColors.getColorRoles(context, color)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@ package com.androidvip.sysctlgui.receivers
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import com.androidvip.sysctlgui.services.StartUpService
import com.androidvip.sysctlgui.work.StartUpWorker

class BootReceiver : BroadcastReceiver() {
override fun onReceive(context: Context?, intent: Intent?) {
if (intent?.action == Intent.ACTION_BOOT_COMPLETED) {
context?.let {
StartUpService.start(context)
}
context?.let { StartUpWorker.enqueue(context.applicationContext) }
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.util.Log
import com.androidvip.sysctlgui.utils.Consts
import com.androidvip.sysctlgui.isValidTaskerBundle
import com.androidvip.sysctlgui.services.TaskerService
import com.androidvip.sysctlgui.utils.Consts
import com.androidvip.sysctlgui.work.TaskerWorker
import kotlin.contracts.ExperimentalContracts

@ExperimentalContracts
Expand All @@ -19,11 +19,7 @@ class TaskerReceiver : BroadcastReceiver() {
val bundle: Bundle? = intent.getBundleExtra(EXTRA_BUNDLE)
if (bundle.isValidTaskerBundle()) {
val taskerList = bundle.getInt(BUNDLE_EXTRA_LIST_NUMBER, Consts.LIST_NUMBER_INVALID)
val serviceIntent = Intent(context, TaskerService::class.java).apply {
putExtra(BUNDLE_EXTRA_LIST_NUMBER, taskerList)
}

context.startService(serviceIntent)
TaskerWorker.enqueue(context.applicationContext, taskerList)
} else {
Log.w(TAG, "Invalid tasker bundle: $bundle")
}
Expand Down

This file was deleted.

This file was deleted.

Loading
Loading