peter/Obtainium
1
0
Fork 0
mirror of https://github.com/ImranR98/Obtainium.git synced 2025-07-13 05:16:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

System font and newer dependencies

Browse Source
This commit is contained in:
Gregory
2023-12-31 19:33:33 +03:00
parent 1fc8ee6fee
commit 5ba33786ab
11 changed files with 127 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
android/app/build.gradle
View File

@ -37,12 +37,12 @@ android {
ndkVersion flutter.ndkVersion
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}
sourceSets {
@ -96,16 +96,11 @@ repositories {
}
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
def shizuku_version = '13.1.5'
implementation "dev.rikka.shizuku:api:$shizuku_version"
implementation "dev.rikka.shizuku:provider:$shizuku_version"
def hidden_api_version = '4.1.0'
// DO NOT UPDATE Hidden API without updating the Android tools
// and do not update Android tools without updating the whole Flutter
// (also in android/build.gradle)
def hidden_api_version = '4.3.1'
implementation "dev.rikka.tools.refine:runtime:$hidden_api_version"
implementation "dev.rikka.hidden:compat:$hidden_api_version"
compileOnly "dev.rikka.hidden:stub:$hidden_api_version"

33
android/app/src/main/kotlin/dev/imranr/obtainium/DefaultSystemFont.kt Normal file
View File

@ -0,0 +1,33 @@
package dev.imranr.obtainium
import android.util.Xml
import org.xmlpull.v1.XmlPullParser
import java.io.File
import java.io.FileInputStream
class DefaultSystemFont {
fun get(): String? {
return try {
val file = File("/system/etc/fonts.xml")
val fileStream = FileInputStream(file)
parseFontsFileStream(fileStream)
} catch (_: Exception) {
null
}
}
private fun parseFontsFileStream(fileStream: FileInputStream): String {
fileStream.use { stream ->
val parser = Xml.newPullParser()
parser.setInput(stream, null)
parser.nextTag()
return parseFonts(parser)
}
}
private fun parseFonts(parser: XmlPullParser): String {
while (parser.name != "font") { parser.next() }
parser.next()
return "/system/fonts/" + parser.text.trim()
}
}

15
android/app/src/main/kotlin/dev/imranr/obtainium/MainActivity.kt
View File

@ -28,7 +28,7 @@ import rikka.shizuku.Shizuku.OnRequestPermissionResultListener
import rikka.shizuku.ShizukuBinderWrapper
class MainActivity: FlutterActivity() {
private var installersChannel: MethodChannel? = null
private var nativeChannel: MethodChannel? = null
private val SHIZUKU_PERMISSION_REQUEST_CODE = (10..200).random()
private fun shizukuCheckPermission(result: Result) {
@ -52,7 +52,7 @@ class MainActivity: FlutterActivity() {
requestCode: Int, grantResult: Int ->
if (requestCode == SHIZUKU_PERMISSION_REQUEST_CODE) {
val res = if (grantResult == PackageManager.PERMISSION_GRANTED) 1 else 0
installersChannel!!.invokeMethod("resPermShizuku", mapOf("res" to res))
nativeChannel!!.invokeMethod("resPermShizuku", mapOf("res" to res))
}
}
@ -151,11 +151,14 @@ class MainActivity: FlutterActivity() {
HiddenApiBypass.addHiddenApiExemptions("")
}
Shizuku.addRequestPermissionResultListener(shizukuRequestPermissionResultListener)
installersChannel = MethodChannel(
flutterEngine.dartExecutor.binaryMessenger, "installers")
installersChannel!!.setMethodCallHandler {
nativeChannel = MethodChannel(
flutterEngine.dartExecutor.binaryMessenger, "native")
nativeChannel!!.setMethodCallHandler {
call, result ->
if (call.method == "checkPermissionShizuku") {
if (call.method == "getSystemFont") {
val res = DefaultSystemFont().get()
result.success(res)
} else if (call.method == "checkPermissionShizuku") {
shizukuCheckPermission(result)
} else if (call.method == "checkPermissionRoot") {
rootCheckPermission(result)

4
android/build.gradle
View File

@ -6,9 +6,9 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:7.2.0'
classpath "com.android.tools.build:gradle:7.4.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'dev.rikka.tools.refine:gradle-plugin:4.1.0' // Do not update!
classpath "dev.rikka.tools.refine:gradle-plugin:4.3.1"
}
}

3
assets/translations/en.json
View File

@ -285,7 +285,8 @@
"normal": "Normal",
"shizuku": "Shizuku",
"root": "Root",
"shizukuBinderNotFound": "Shizuku is not running",
"shizukuBinderNotFound": "Сompatible Shizuku service wasn't found",
"tryUseSystemFont": "Try to use a system font",
"removeAppQuestion": {
"one": "Remove App?",
"other": "Remove Apps?"

3
assets/translations/ru.json
View File

@ -285,7 +285,8 @@
"normal": "Нормальный",
"shizuku": "Shizuku",
"root": "Суперпользователь",
"shizukuBinderNotFound": "Shizuku не запущен",
"shizukuBinderNotFound": "Совместимый сервис Shizuku не найден",
"tryUseSystemFont": "Попытаться использовать системный шрифт",
"removeAppQuestion": {
"one": "Удалить приложение?",
"other": "Удалить приложения?"

15
lib/main.dart
View File

@ -5,6 +5,7 @@ import 'package:flutter/services.dart';
import 'package:obtainium/pages/home.dart';
import 'package:obtainium/providers/apps_provider.dart';
import 'package:obtainium/providers/logs_provider.dart';
import 'package:obtainium/providers/native_provider.dart';
import 'package:obtainium/providers/notifications_provider.dart';
import 'package:obtainium/providers/settings_provider.dart';
import 'package:obtainium/providers/source_provider.dart';
@ -185,6 +186,16 @@ class _ObtainiumState extends State<Obtainium> {
}
existingUpdateInterval = actualUpdateInterval;
}
settingsProvider.addListener(() async {
if (settingsProvider.tryUseSystemFont &&
settingsProvider.appFont == "Metropolis") {
bool fontLoaded = await NativeFeatures.tryLoadSystemFont();
if (fontLoaded) { settingsProvider.appFont = "SystemFont"; }
} else if (!settingsProvider.tryUseSystemFont &&
settingsProvider.appFont != "Metropolis") {
settingsProvider.appFont = "Metropolis";
}
});
}
return DynamicColorBuilder(
@ -221,13 +232,13 @@ class _ObtainiumState extends State<Obtainium> {
colorScheme: settingsProvider.theme == ThemeSettings.dark
? darkColorScheme
: lightColorScheme,
fontFamily: 'Metropolis'),
fontFamily: settingsProvider.appFont),
darkTheme: ThemeData(
useMaterial3: true,
colorScheme: settingsProvider.theme == ThemeSettings.light
? lightColorScheme
: darkColorScheme,
fontFamily: 'Metropolis'),
fontFamily: settingsProvider.appFont),
home: Shortcuts(shortcuts: <LogicalKeySet, Intent>{
LogicalKeySet(LogicalKeyboardKey.select): const ActivateIntent(),
}, child: const HomePage()));

15
lib/pages/settings.dart
View File

@ -351,8 +351,6 @@ class _SettingsPageState extends State<SettingsPage> {
],
),
height16,
installMethodDropdown,
height16,
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
@ -365,6 +363,7 @@ class _SettingsPageState extends State<SettingsPage> {
})
],
),
installMethodDropdown,
height32,
Text(
tr('sourceSpecific'),
@ -409,6 +408,18 @@ class _SettingsPageState extends State<SettingsPage> {
height16,
localeDropdown,
height16,
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Flexible(child: Text(tr('tryUseSystemFont'))),
Switch(
value: settingsProvider.tryUseSystemFont,
onChanged: (value) {
settingsProvider.tryUseSystemFont = value;
})
],
),
height16,
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [

10
lib/providers/apps_provider.dart
View File

@ -33,7 +33,7 @@ import 'package:http/http.dart';
import 'package:android_intent_plus/android_intent.dart';
import 'package:flutter_archive/flutter_archive.dart';
import 'package:shared_storage/shared_storage.dart' as saf;
import 'installers_provider.dart';
import 'native_provider.dart';
final pm = AndroidPackageManager();
@ -523,12 +523,12 @@ class AppsProvider with ChangeNotifier {
code = await AndroidPackageInstaller.installApk(
apkFilePath: file.file.path);
case InstallMethodSettings.shizuku:
code = (await Installers.installWithShizuku(
code = (await NativeFeatures.installWithShizuku(
apkFileUri: file.file.uri.toString()))
? 0
: 1;
case InstallMethodSettings.root:
code = (await Installers.installWithRoot(apkFilePath: file.file.path))
code = (await NativeFeatures.installWithRoot(apkFilePath: file.file.path))
? 0
: 1;
}
@ -694,14 +694,14 @@ class AppsProvider with ChangeNotifier {
throw ObtainiumError(tr('cancelled'));
}
case InstallMethodSettings.shizuku:
int code = await Installers.checkPermissionShizuku();
int code = await NativeFeatures.checkPermissionShizuku();
if (code == -1) {
throw ObtainiumError(tr('shizukuBinderNotFound'));
} else if (code == 0) {
throw ObtainiumError(tr('cancelled'));
}
case InstallMethodSettings.root:
if (!(await Installers.checkPermissionRoot())) {
if (!(await NativeFeatures.checkPermissionRoot())) {
throw ObtainiumError(tr('cancelled'));
}
}

36
lib/providers/installers_provider.dart → lib/providers/native_provider.dart
View File

@ -1,12 +1,25 @@
import 'dart:async';
import 'dart:io';
import 'package:flutter/services.dart';
class Installers {
static const MethodChannel _channel = MethodChannel('installers');
class NativeFeatures {
static const MethodChannel _channel = MethodChannel('native');
static bool _callbacksApplied = false;
static int _resPermShizuku = -2; // not set
static Future waitWhile(bool Function() test,
static Future<ByteData> _readFileBytes(String path) async {
var file = File(path);
var bytes = await file.readAsBytes();
return ByteData.view(bytes.buffer);
}
static Future _handleCalls(MethodCall call) async {
if (call.method == 'resPermShizuku') {
_resPermShizuku = call.arguments['res'];
}
}
static Future _waitWhile(bool Function() test,
[Duration pollInterval = const Duration(milliseconds: 250)]) {
var completer = Completer();
check() {
@ -20,20 +33,23 @@ class Installers {
return completer.future;
}
static Future handleCalls(MethodCall call) async {
if (call.method == 'resPermShizuku') {
_resPermShizuku = call.arguments['res'];
}
static Future<bool> tryLoadSystemFont() async {
var font = await _channel.invokeMethod('getSystemFont');
if (font == null) { return false; }
var fontLoader = FontLoader('SystemFont');
fontLoader.addFont(_readFileBytes(font));
await fontLoader.load();
return true;
}
static Future<int> checkPermissionShizuku() async {
if (!_callbacksApplied) {
_channel.setMethodCallHandler(handleCalls);
_channel.setMethodCallHandler(_handleCalls);
_callbacksApplied = true;
}
int res = await _channel.invokeMethod('checkPermissionShizuku');
if(res == -2) {
await waitWhile(() => _resPermShizuku == -2);
if (res == -2) {
await _waitWhile(() => _resPermShizuku == -2);
res = _resPermShizuku;
_resPermShizuku = -2;
}

18
lib/providers/settings_provider.dart
View File

@ -51,6 +51,24 @@ class SettingsProvider with ChangeNotifier {
notifyListeners();
}
String get appFont {
return prefs?.getString('appFont') ?? 'Metropolis';
}
set appFont(String appFont) {
prefs?.setString('appFont', appFont);
notifyListeners();
}
bool get tryUseSystemFont {
return prefs?.getBool('tryUseSystemFont') ?? false;
}
set tryUseSystemFont(bool tryUseSystemFont) {
prefs?.setBool('tryUseSystemFont', tryUseSystemFont);
notifyListeners();
}
InstallMethodSettings get installMethod {
return InstallMethodSettings
.values[prefs?.getInt('installMethod') ?? InstallMethodSettings.normal.index];