Skip to content

Commit

Permalink
Bump GMS version to 24.38.64
Browse files Browse the repository at this point in the history
  • Loading branch information
AykhanUV committed Oct 10, 2024
1 parent 1e12e76 commit 7ce022d
Show file tree
Hide file tree
Showing 14 changed files with 132 additions and 54 deletions.
17 changes: 0 additions & 17 deletions .github/matchers/gradle-build-kotlin-error-matcher.json

This file was deleted.

This file was deleted.

16 changes: 0 additions & 16 deletions .github/matchers/gradle-build-matcher.json

This file was deleted.

2 changes: 0 additions & 2 deletions .github/matchers/gradle-build-matcher.json.license

This file was deleted.

42 changes: 39 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,26 @@
# MicroG (MicroG Services Redesign)
# MicroG RE (MicroG Services Redesign)

[GmsCore](https://github.com/microg/GmsCore) fork designed for ReVanced with Material You design, along with some improvements and features

[![Release](https://img.shields.io/github/v/release/AykhanUV/MicroG?display_name=tag&style=for-the-badge&logo=github&labelColor=21262d&color=1f6feb)](https://github.com/AykhanUV/MicroG/releases/latest)
[![Platform](https://img.shields.io/badge/android-platform?style=for-the-badge&label=platform&labelColor=21262d&color=6e7681)](https://www.android.com) [![API](https://img.shields.io/badge/24%2B-level?style=for-the-badge&logo=android&logoColor=3cd382&label=API&labelColor=21262d&color=ff663b)](https://developer.android.com/studio/releases/platforms) [![Release](https://img.shields.io/github/v/release/WSTxda/MicroG-RE?display_name=tag&style=for-the-badge&logo=github&labelColor=21262d&color=1f6feb)](https://github.com/WSTxda/MicroG-RE/releases/latest) [![Downloads](https://img.shields.io/github/downloads/WSTxda/MicroG-RE/total?style=for-the-badge&labelColor=21262d&color=238636)](https://github.com/WSTxda/MicroG-RE/releases)

![Banner](https://raw.githubusercontent.com/WSTxda/MicroG-RE/master/Images/Banner.svg)

**Screenshots**

<details>
<summary>Light</summary>

![Banner](https://raw.githubusercontent.com/WSTxda/MicroG-RE/master/Images/Light.png)

</details>

<details>
<summary>Dark</summary>

![Banner](https://raw.githubusercontent.com/WSTxda/MicroG-RE/master/Images/Dark.png)

</details>

**Recommended Patches**

Expand All @@ -12,12 +30,30 @@

[ReVanced Extended (anddea)](https://github.com/anddea/revanced-patches)

[ReVanced Extended (AykhanUV)](https://github.com/AykhanUV/revanced-patches)
[ReVanced Extended (rufusin)](https://github.com/rufusin/revanced-patches)

[YT Advanced (REX)](https://github.com/YT-Advanced/ReX-patches)

**Download**

[<img src="https://raw.githubusercontent.com/WSTxda/QP-Gallery-Releases/master/Images/GitHub.svg"
alt='Get it on GitHub'
height="80">](https://github.com/WSTxda/MicroG-RE/releases) [<img src="https://raw.githubusercontent.com/WSTxda/QP-Gallery-Releases/master/Images/Telegram.svg"
alt='Get it on Telegram'
height="80">](https://t.me/WSTprojects)

**Donate**

[<img src="https://raw.githubusercontent.com/WSTxda/QP-Gallery-Releases/master/Images/PayPal.svg"
alt='Donate with PayPal'
height="80">](https://bit.ly/2lV0E6u) [<img src="https://raw.githubusercontent.com/WSTxda/QP-Gallery-Releases/master/Images/BMC.svg"
alt='Donate with BMC'
height="80">](https://www.buymeacoffee.com/wstxda)

**Credits**

[microG Project](https://github.com/microg) for GmsCore, alternative of Play Services. [wiki](https://github.com/microg/GmsCore/wiki)

[Shadow578](https://github.com/shadow578) for the implementation of GmsCore for ReVanced

[AyushTNM](https://github.com/ayushTNM) for some useful implementations and ideas
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ allprojects {
apply plugin: 'idea'

group = 'org.microg.gms'
ext.appVersionName = 2.0
ext.appVersionName = 5.9
ext.appVersionCode = 243864000
ext.baseVersion = ext.appVersionCode.toString()[0..1] + '.' + ext.appVersionCode.toString()[2..3] + '.' + ext.appVersionCode.toString()[4..5]
version = ext.appVersionName+" GMS-"+ext.baseVersion.replaceAll("\\.", "")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@ import android.view.View
import androidx.annotation.AttrRes
import androidx.annotation.ColorInt
import androidx.annotation.IdRes
import androidx.appcompat.app.AlertDialog
import androidx.core.content.ContextCompat
import androidx.databinding.BindingAdapter
import androidx.navigation.NavController
import androidx.navigation.navOptions
import androidx.navigation.ui.R
import com.google.android.material.dialog.MaterialAlertDialogBuilder

fun PackageManager.getApplicationInfoIfExists(packageName: String?, flags: Int = 0): ApplicationInfo? = packageName?.let {
try {
Expand Down Expand Up @@ -57,6 +59,12 @@ val Context.systemAnimationsEnabled: Boolean
return duration != 0f && transition != 0f
}

fun Context.buildAlertDialog() = try {
// Try material design first
MaterialAlertDialogBuilder(this)
} catch (e: Exception) {
AlertDialog.Builder(this)
}

@ColorInt
fun Context.resolveColor(@AttrRes resid: Int): Int? {
Expand Down
25 changes: 25 additions & 0 deletions play-services-base/core/src/main/res/values-in/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ SPDX-FileCopyrightText: 2020, microG Project Team
~ SPDX-License-Identifier: Apache-2.0
-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="foreground_service_notification_title">Aktif di latar belakang</string>
<string name="foreground_service_notification_text"><xliff:g example="Exposure Notification">%1$s</xliff:g> sedang berjalan di latar belakang</string>
<string name="foreground_service_notification_big_text">Kecualikan <xliff:g example="microG Services">%1$s</xliff:g> dari optimisasi baterai atau ubah pengaturan notifikasi untuk menyembunyikan notifikasi ini</string>

<string name="menu_settings">Pengaturan</string>

<string name="list_no_item_none">Tidak ada</string>
<string name="list_item_see_all">Lihat semua</string>

<string name="open_app">Buka</string>

<string name="service_status_disabled">Dinonaktifkan</string>
<string name="service_status_enabled">Diaktifkan</string>
<string name="service_status_automatic">Otomatis</string>
<string name="service_status_manual">Manual</string>
<string name="service_status_enabled_short">Aktif</string>
<string name="service_status_disabled_short">Nonaktif</string>
</resources>
25 changes: 25 additions & 0 deletions play-services-base/core/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ SPDX-FileCopyrightText: 2020, microG Project Team
~ SPDX-License-Identifier: Apache-2.0
-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="foreground_service_notification_title">Attivo in secondo piano</string>
<string name="foreground_service_notification_text"><xliff:g example="Exposure Notification">%1$s</xliff:g> è in fase di esecuzione in secondo piano</string>
<string name="foreground_service_notification_big_text">Escludi <xliff:g example="microG Services">%1$s</xliff:g> dalla lista delle app con ottimizzazione della batteria attiva o nascondi questa notifica dalle impostazioni dell\'app</string>

<string name="menu_settings">Impostazioni</string>

<string name="list_no_item_none">Nessuno</string>
<string name="list_item_see_all">Vedi tutti</string>

<string name="open_app">Apri</string>

<string name="service_status_disabled">Disattivato</string>
<string name="service_status_enabled">Attivo</string>
<string name="service_status_automatic">Automatico</string>
<string name="service_status_manual">Manuale</string>
<string name="service_status_enabled_short">Attivo</string>
<string name="service_status_disabled_short">Disattivato</string>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
import org.microg.gms.common.Constants;
import org.microg.gms.common.GmsService;
import org.microg.gms.utils.ToStringHelper;

import java.util.Arrays;

Expand Down Expand Up @@ -57,13 +58,13 @@ public class GetServiceRequest extends AbstractSafeParcelable {
@Field(11)
public Feature[] apiFeatures;
@Field(12)
boolean supportsConnectionInfo;
public boolean supportsConnectionInfo;
@Field(13)
int field13;
@Field(14)
boolean field14;
@Field(15)
String attributionTag;
public String attributionTag;

private GetServiceRequest() {
serviceId = -1;
Expand All @@ -79,14 +80,18 @@ public GetServiceRequest(@Param(2) int serviceId) {

@Override
public String toString() {
return "GetServiceRequest{" +
"serviceId=" + GmsService.nameFromServiceId(serviceId) +
", gmsVersion=" + gmsVersion +
", packageName='" + packageName + '\'' +
(scopes == null || scopes.length == 0 ? "" : (", scopes=" + Arrays.toString(scopes))) +
(extras == null ? "" : (", extras=" + extras)) +
(account == null ? "" : (", account=" + account)) +
'}';
return ToStringHelper.name("GetServiceRequest")
.value(GmsService.nameFromServiceId(serviceId))
.field("packageName", packageName)
.field("gmsVersion", gmsVersion)
.field("scopes", scopes)
.field("extras", extras)
.field("account", account)
.field("defaultFeatures", defaultFeatures)
.field("apiFeatures", apiFeatures)
.field("supportsConnectionInfo", supportsConnectionInfo)
.field("attributionTag", attributionTag)
.end();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

import android.util.Base64;

import java.util.Arrays;

public class ToStringHelper {
private StringBuilder sb;
private boolean hasField;
Expand Down Expand Up @@ -111,6 +113,15 @@ public ToStringHelper field(String name, byte[] val, boolean forceNull) {
return fieldUnquoted(name, val == null ? "null" : Base64.encodeToString(val, Base64.NO_WRAP | Base64.NO_PADDING | Base64.URL_SAFE));
}

public ToStringHelper field(String name, Object[] val) {
return field(name, val, false);
}

public ToStringHelper field(String name, Object[] val, boolean forceNull) {
if (val == null && !forceNull) return this;
return fieldUnquoted(name, val == null ? "null" : Arrays.toString(val));
}

public String end() {
if (!hasEnd) sb.append(']');
hasEnd = true;
Expand Down
1 change: 0 additions & 1 deletion play-services-core/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
../proguard.flags
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ class FieldInfo(val clazz: ClassInfo, val fieldElement: VariableElement) {
"int[]" -> "$variableName = $SafeParcelReader.readIntArray(parcel, header)"
"java.util.List<java.lang.String>", "java.util.ArrayList<java.lang.String>" -> when {
!useValueParcel -> "$variableName = $SafeParcelReader.readStringList(parcel, header)"
else -> "$variableName = $SafeParcelReader.readList(parcel, header, String.class.getClassloader())"
else -> "$variableName = $SafeParcelReader.readList(parcel, header, String.class.getClassLoader())"
}
// "java.util.List<java.lang.Integer>", "java.util.ArrayList<java.lang.Integer>" -> "$variableName = $SafeParcelReader.readIntegerList(parcel, header)"
// "java.util.List<java.lang.Boolean>", "java.util.ArrayList<java.lang.Boolean>" -> "$variableName = $SafeParcelReader.readBooleanList(parcel, header)"
Expand All @@ -343,7 +343,7 @@ class FieldInfo(val clazz: ClassInfo, val fieldElement: VariableElement) {
else -> when {
isList && isParcelable && !useValueParcel -> "$variableName = $SafeParcelReader.readParcelableList(parcel, header, $listItemType.CREATOR)"
isArray && isParcelable -> "$variableName = $SafeParcelReader.readParcelableArray(parcel, header, $listItemType.CREATOR)"
isList -> "$variableName = $SafeParcelReader.readList(parcel, header, $listItemType.class.getClassloader())"
isList -> "$variableName = $SafeParcelReader.readList(parcel, header, $listItemType.class.getClassLoader())"
isParcelable -> "$variableName = $SafeParcelReader.readParcelable(parcel, header, $type.CREATOR)"
!isList && isIInterface -> "$variableName = $type.Stub.asInterface($SafeParcelReader.readBinder(parcel, header))"
else -> throw UnsupportedOperationException("Field $name in ${clazz.fullName} has unsupported type $type.")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#
# SPDX-FileCopyrightText: 2024 microG Project Team
# SPDX-License-Identifier: Apache-2.0
#

org.microg.safeparcel.SafeParcelProcessor, isolating

0 comments on commit 7ce022d

Please sign in to comment.