Skip to content

Commit 679ed40

Browse files
thewizrdthewizrd
authored
Merge pull request #30 from SimpleAppProjects/develop
v1.13.1
2 parents b4fba34 + b068509 commit 679ed40

File tree

57 files changed

+1920
-481
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1920
-481
lines changed

‎build.gradle‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
buildscript {
44
ext {
55
compileSdkVersion = 34
6-
minSdkVersion = 23
6+
minSdkVersion = 24
77
targetSdkVersion = 33
88

99
kotlin_version = '1.9.0'
1010
kotlinx_version = '1.7.3'
1111

1212
desugar_version = '2.0.3'
1313

14-
firebase_version = '32.2.3'
14+
firebase_version = '32.3.1'
1515

1616
appcompat_version = '1.6.1'
1717
constraintlayout_version = '2.1.4'
18-
core_version = '1.10.1'
18+
core_version = '1.12.0'
1919
fragment_version = '1.6.1'
20-
lifecycle_version = '2.6.1'
20+
lifecycle_version = '2.6.2'
2121
preference_version = '1.2.1'
2222
recyclerview_version = '1.3.1'
2323
coresplash_version = '1.0.0'
@@ -33,13 +33,17 @@ buildscript {
3333
material_version = '1.9.0'
3434

3535
compose_compiler_version = '1.5.2'
36-
compose_version = '1.5.0'
36+
compose_version = '1.5.1'
3737
wear_compose_version = '1.2.0'
3838
horologist_version = '0.4.12'
3939
accompanist_version = '0.30.1'
4040

4141
gson_version = '2.10.1'
4242
timber_version = '5.0.1'
43+
44+
// Shizuku
45+
shizuku_version = '13.1.5'
46+
refine_version = '4.3.0'
4347
}
4448

4549
repositories {

‎hidden-api/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

‎hidden-api/build.gradle‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
plugins {
2+
id 'com.android.library'
3+
id 'org.jetbrains.kotlin.android'
4+
}
5+
6+
android {
7+
compileSdk rootProject.compileSdkVersion
8+
9+
defaultConfig {
10+
minSdkVersion rootProject.minSdkVersion
11+
targetSdkVersion rootProject.targetSdkVersion
12+
13+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
14+
consumerProguardFiles "consumer-rules.pro"
15+
}
16+
17+
buildTypes {
18+
debug {
19+
minifyEnabled false
20+
}
21+
release {
22+
minifyEnabled true
23+
}
24+
}
25+
26+
compileOptions {
27+
// Sets Java compatibility to Java 8
28+
sourceCompatibility JavaVersion.VERSION_17
29+
targetCompatibility JavaVersion.VERSION_17
30+
}
31+
32+
kotlin {
33+
jvmToolchain(17)
34+
}
35+
36+
namespace 'com.thewizrd.wearsettings.hidden_api'
37+
}
38+
39+
dependencies {
40+
annotationProcessor 'dev.rikka.tools.refine:annotation-processor:4.3.0'
41+
compileOnly 'dev.rikka.tools.refine:annotation:4.3.0'
42+
implementation 'androidx.annotation:annotation:1.7.0'
43+
}

‎hidden-api/consumer-rules.pro‎

Whitespace-only changes.

‎hidden-api/proguard-rules.pro‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Add project specific ProGuard rules here.
2+
# You can control the set of applied configuration files using the
3+
# proguardFiles setting in build.gradle.
4+
#
5+
# For more details, see
6+
# http://developer.android.com/guide/developing/tools/proguard.html
7+
8+
# If your project uses WebView with JS, uncomment the following
9+
# and specify the fully qualified class name to the JavaScript interface
10+
# class:
11+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
12+
# public *;
13+
#}
14+
15+
# Uncomment this to preserve the line number information for
16+
# debugging stack traces.
17+
#-keepattributes SourceFile,LineNumberTable
18+
19+
# If you keep the line number information, uncomment this to
20+
# hide the original source file name.
21+
#-renamesourcefileattribute SourceFile

‎hidden-api/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest />

‎hidden-api/src/main/java/android/net/wifi/IWifiManager.java‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package android.net.wifi;
2+
3+
import android.os.Binder;
4+
import android.os.Build;
5+
import android.os.IBinder;
6+
import android.os.IInterface;
7+
8+
import androidx.annotation.DeprecatedSinceApi;
9+
import androidx.annotation.RequiresApi;
10+
11+
public interface IWifiManager extends IInterface {
12+
@DeprecatedSinceApi(api = Build.VERSION_CODES.N_MR1)
13+
boolean setWifiEnabled(boolean enable);
14+
15+
@RequiresApi(api = Build.VERSION_CODES.N_MR1)
16+
boolean setWifiEnabled(String packageName, boolean enable);
17+
18+
abstract class Stub extends Binder implements IWifiManager {
19+
public static IWifiManager asInterface(IBinder obj) {
20+
throw new RuntimeException("Stub!");
21+
}
22+
}
23+
}

‎hidden-api/src/main/java/com/android/internal/telephony/ITelephony.java‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
package com.android.internal.telephony;
2+
3+
import android.os.Binder;
4+
import android.os.Build;
5+
import android.os.IBinder;
6+
import android.os.IInterface;
7+
8+
import androidx.annotation.DeprecatedSinceApi;
9+
import androidx.annotation.RequiresApi;
10+
11+
public interface ITelephony extends IInterface {
12+
@DeprecatedSinceApi(api = Build.VERSION_CODES.P)
13+
void setDataEnabled(int subId, boolean enable);
14+
15+
@DeprecatedSinceApi(api = Build.VERSION_CODES.P)
16+
boolean getDataEnabled(int subId);
17+
18+
@RequiresApi(api = Build.VERSION_CODES.P)
19+
@DeprecatedSinceApi(api = Build.VERSION_CODES.S)
20+
void setUserDataEnabled(int subId, boolean enable);
21+
22+
@RequiresApi(api = Build.VERSION_CODES.P)
23+
@DeprecatedSinceApi(api = Build.VERSION_CODES.S)
24+
boolean isUserDataEnabled(int subId);
25+
26+
@RequiresApi(api = Build.VERSION_CODES.S)
27+
@DeprecatedSinceApi(api = Build.VERSION_CODES.TIRAMISU)
28+
void setDataEnabledForReason(int subId, int reason, boolean enable);
29+
30+
@RequiresApi(api = Build.VERSION_CODES.S)
31+
boolean isDataEnabledForReason(int subId, int reason);
32+
33+
@RequiresApi(api = Build.VERSION_CODES.TIRAMISU)
34+
void setDataEnabledForReason(int subId, int reason, boolean enable, String callingPackage);
35+
36+
@DeprecatedSinceApi(api = Build.VERSION_CODES.TIRAMISU)
37+
boolean enableDataConnectivity();
38+
39+
@DeprecatedSinceApi(api = Build.VERSION_CODES.TIRAMISU)
40+
boolean disableDataConnectivity();
41+
42+
@RequiresApi(api = Build.VERSION_CODES.TIRAMISU)
43+
boolean enableDataConnectivity(String callingPackage);
44+
45+
@RequiresApi(api = Build.VERSION_CODES.TIRAMISU)
46+
boolean disableDataConnectivity(String callingPackage);
47+
48+
abstract class Stub extends Binder implements ITelephony {
49+
public static ITelephony asInterface(IBinder obj) {
50+
throw new RuntimeException("Stub!");
51+
}
52+
}
53+
}

‎mobile/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ android {
2121
minSdkVersion rootProject.minSdkVersion
2222
targetSdkVersion rootProject.targetSdkVersion
2323
// NOTE: Version Code Format [TargetSDK, Version Name, Build Number, Variant Code (Android: 00, WearOS: 01)]
24-
versionCode 331913000
25-
versionName "1.13.0"
24+
versionCode 331913100
25+
versionName "1.13.1"
2626

2727
vectorDrawables.useSupportLibrary = true
2828
}
@@ -89,7 +89,7 @@ dependencies {
8989
implementation "androidx.work:work-runtime-ktx:$work_version"
9090
implementation "androidx.core:core-splashscreen:$coresplash_version"
9191

92-
implementation 'com.google.android.gms:play-services-wearable:18.0.0'
92+
implementation 'com.google.android.gms:play-services-wearable:18.1.0'
9393

9494
implementation platform("com.google.firebase:firebase-bom:$firebase_version")
9595
implementation 'com.google.firebase:firebase-analytics'

‎mobile/src/main/AndroidManifest.xml‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,20 @@
99
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_CAMERA" />
1010
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
1111
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_PHONE_CALL" />
12-
<uses-permission android:name="android.permission.BLUETOOTH" />
13-
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
12+
<uses-permission
13+
android:name="android.permission.BLUETOOTH"
14+
android:maxSdkVersion="30" />
15+
<uses-permission
16+
android:name="android.permission.BLUETOOTH_ADMIN"
17+
android:maxSdkVersion="30" />
1418
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
1519
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
1620
<uses-permission android:name="android.permission.CAMERA" />
1721
<uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
1822
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
1923
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
24+
<!-- For background activity starts -->
25+
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
2026

2127
<uses-permission
2228
android:name="android.permission.WRITE_SETTINGS"
@@ -79,6 +85,22 @@
7985
</intent-filter>
8086
</activity>
8187

88+
<activity
89+
android:name=".wearable.RemoteLaunchActivity"
90+
android:theme="@android:style/Theme.NoDisplay"
91+
android:exported="true">
92+
<intent-filter>
93+
<action android:name="android.intent.action.VIEW" />
94+
95+
<category android:name="android.intent.category.DEFAULT" />
96+
<category android:name="android.intent.category.BROWSABLE" />
97+
98+
<data
99+
android:scheme="simplewear"
100+
android:host="launch-activity" />
101+
</intent-filter>
102+
</activity>
103+
82104
<service
83105
android:name=".wearable.WearableDataListenerService"
84106
android:enabled="true"

0 commit comments

Comments
 (0)