Skip to content

Commit fa0e330

Browse files
WSTxdaWSTxda
committed
Update included libraries list
1 parent 1c9212c commit fa0e330

File tree

4 files changed

+23
-11
lines changed

4 files changed

+23
-11
lines changed

‎play-services-core/microg-ui-tools/src/main/res/layout/about_root.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:app="http://schemas.android.com/apk/res-auto"
23
android:layout_width="match_parent"
34
android:layout_height="match_parent">
45

@@ -10,7 +11,7 @@
1011
android:paddingEnd="17dp"
1112
android:paddingBottom="12dp">
1213

13-
<com.google.android.material.card.MaterialCardView xmlns:app="http://schemas.android.com/apk/res-auto"
14+
<com.google.android.material.card.MaterialCardView
1415
android:id="@+id/card"
1516
style="?attr/materialCardViewFilledStyle"
1617
android:layout_width="match_parent"
@@ -33,6 +34,7 @@
3334
android:layout_width="48dp"
3435
android:layout_height="48dp"
3536
android:layout_gravity="center_horizontal"
37+
android:importantForAccessibility="no"
3638
android:src="@android:drawable/sym_def_app_icon" />
3739

3840
<TextView

‎play-services-core/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@
470470
android:excludeFromRecents="true"
471471
android:targetActivity="org.microg.gms.ui.AccountManagerActivity"
472472
android:taskAffinity="org.microg.gms.settings">
473-
<intent-filter>
473+
<intent-filter tools:ignore="AppLinkUrlError">
474474
<action android:name="com.google.android.gms.accountsettings.action.VIEW_SETTINGS" />
475475
<action android:name="${basePackageName}.android.gms.accountsettings.action.VIEW_SETTINGS" />
476476
<action android:name="com.google.android.gms.accountsettings.action.BROWSE_SETTINGS" />

‎play-services-core/src/main/java/org/microg/gms/ui/AboutFragment.java‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,32 @@ public class AboutFragment extends AbstractAboutFragment {
3131
protected void collectLibraries(List<AbstractAboutFragment.Library> libraries) {
3232
if (BuildConfig.FLAVOR.toLowerCase().contains("vtm")) {
3333
libraries.add(new AbstractAboutFragment.Library("org.oscim.android", "V™", "GNU LGPLv3, Hannes Janetzek and devemux86."));
34-
libraries.add(new AbstractAboutFragment.Library("org.slf4j", "SLF4J", "MIT License, QOS.ch."));
34+
libraries.add(new AbstractAboutFragment.Library("org.slf4j", "slf4j-api", "MIT License, QOS.ch."));
3535
} else {
36-
libraries.add(new AbstractAboutFragment.Library("org.maplibre.android", "MapLibre Native for Android", "Two-Clause BSD, MapLibre contributors."));
36+
libraries.add(new AbstractAboutFragment.Library("org.maplibre.gl", "MapLibre GL Native for Android", "Two-Clause BSD, MapLibre contributors."));
3737
}
38+
39+
libraries.add(new AbstractAboutFragment.Library("androidx.appcompat", "AndroidX AppCompat", "Apache License 2.0, The Android Open Source Project."));
40+
libraries.add(new AbstractAboutFragment.Library("androidx.core", "AndroidX Core", "Apache License 2.0, The Android Open Source Project."));
41+
libraries.add(new AbstractAboutFragment.Library("androidx.fragment", "AndroidX Fragment", "Apache License 2.0, The Android Open Source Project."));
42+
libraries.add(new AbstractAboutFragment.Library("androidx.lifecycle", "AndroidX Lifecycle", "Apache License 2.0, The Android Open Source Project."));
43+
libraries.add(new AbstractAboutFragment.Library("androidx.preference", "AndroidX Preference", "Apache License 2.0, The Android Open Source Project."));
3844
libraries.add(new AbstractAboutFragment.Library("androidx", "Android Jetpack", "Apache License 2.0, The Android Open Source Project."));
39-
libraries.add(new AbstractAboutFragment.Library("com.upokecenter.cbor", "CBOR", "Creative Commons Zero, Peter O."));
45+
libraries.add(new AbstractAboutFragment.Library("com.google.android.material", "Material Components", "Apache License 2.0, Google LLC."));
46+
libraries.add(new AbstractAboutFragment.Library("com.google.android.material", "Material Symbols", "Apache License 2.0, Google LLC."));
4047
libraries.add(new AbstractAboutFragment.Library("de.hdodenhof.circleimageview", "CircleImageView", "Apache License 2.0, Henning Dodenhof."));
41-
libraries.add(new AbstractAboutFragment.Library("su.litvak.chromecast.api.v2", "ChromeCast Java API v2", "Apache License 2.0, Vitaly Litvak."));
4248
libraries.add(new AbstractAboutFragment.Library("org.conscrypt", "Conscrypt", "Apache License 2.0, The Android Open Source Project."));
4349
libraries.add(new AbstractAboutFragment.Library("org.chromium.net", "Cronet", "BSD-style License, The Chromium Authors."));
44-
libraries.add(new AbstractAboutFragment.Library("org.jetbrains.kotlin", "Kotlin", "Apache License 2.0, JetBrains s.r.o."));
45-
libraries.add(new AbstractAboutFragment.Library("com.google.android.material", "Material Symbols", "Apache License 2.0, Google LLC."));
50+
libraries.add(new AbstractAboutFragment.Library("org.jetbrains.kotlin", "Kotlin", "Apache License 2.0, JetBrains."));
51+
libraries.add(new AbstractAboutFragment.Library("org.jetbrains.kotlinx", "kotlinx.coroutines", "Apache License 2.0, JetBrains."));
4652
libraries.add(new AbstractAboutFragment.Library("com.squareup.okhttp3", "OkHttp", "Apache License 2.0, Square Inc."));
47-
libraries.add(new AbstractAboutFragment.Library("com.android.volley", "Volley", "Apache License 2.0, The Android Open Source Project."));
4853
libraries.add(new AbstractAboutFragment.Library("com.squareup.wire", "Wire Protocol Buffers", "Apache License 2.0, Square Inc."));
54+
libraries.add(new AbstractAboutFragment.Library("com.google.protobuf", "Protobuf", "BSD 3-Clause License, Google."));
55+
libraries.add(new AbstractAboutFragment.Library("com.android.volley", "Volley", "Apache License 2.0, The Android Open Source Project."));
4956
libraries.add(new AbstractAboutFragment.Library("com.google.zxing", "ZXing", "Apache License 2.0, ZXing authors."));
57+
libraries.add(new AbstractAboutFragment.Library("com.journeyapps", "ZXing Android Embedded", "Apache License 2.0, Journey Mobile."));
58+
libraries.add(new AbstractAboutFragment.Library("su.litvak.chromecast.api.v2", "ChromeCast Java API v2", "Apache License 2.0, Vitaly Litvak."));
59+
libraries.add(new AbstractAboutFragment.Library("org.json", "JSON-java", "Public Domain."));
5060
}
5161

5262
public static class AsActivity extends AbstractSettingsActivity {

‎play-services-core/src/main/java/org/microg/gms/ui/AccountsFragment.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import android.accounts.AccountManager
55
import android.content.ActivityNotFoundException
66
import android.content.Intent
77
import android.graphics.Bitmap
8-
import android.net.Uri
98
import android.os.Bundle
109
import android.provider.Settings
1110
import android.util.Log
@@ -28,6 +27,7 @@ import org.microg.gms.auth.AuthConstants
2827
import org.microg.gms.auth.login.LoginActivity
2928
import org.microg.gms.people.DatabaseHelper
3029
import org.microg.gms.people.PeopleManager
30+
import androidx.core.net.toUri
3131

3232
class AccountsFragment : PreferenceFragmentCompat() {
3333

@@ -103,7 +103,7 @@ class AccountsFragment : PreferenceFragmentCompat() {
103103
}
104104

105105
private fun openUrl(url: String) {
106-
val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
106+
val intent = Intent(Intent.ACTION_VIEW, url.toUri())
107107
startActivitySafelyIntent(intent, "Failed to open URL: $url")
108108
}
109109

0 commit comments

Comments
 (0)