Skip to content

Commit

Permalink
Update some things
Browse files Browse the repository at this point in the history
  • Loading branch information
@WSTxda
WSTxda committed Mar 24, 2024
1 parent 4d5fc3a commit e98047c
Show file tree
Hide file tree
Showing 13 changed files with 51 additions and 40 deletions.
6 changes: 3 additions & 3 deletions play-services-base/core/src/main/kotlin/org/microg/gms/ui/AppPreference.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@ abstract class AppPreference : Preference {
packageName.contains(".vanced.android") -> context.getString(R.string.vanced)
packageName.contains(".revanced.android") -> context.getString(R.string.revanced)
packageName.contains(".rvx.android") -> context.getString(R.string.revanced_extended)
packageName.contains(".rve.android") -> context.getString(R.string.revanced_extended)
packageName.contains("anddea.youtube") -> context.getString(R.string.revanced_extended)
packageName.contains("bill.youtube") -> context.getString(R.string.revanced_extended)
packageName.contains(".rex.android") -> context.getString(R.string.youtube_advanced)
packageName.contains(".rve.android") -> context.getString(R.string.revanced_extended_rufusin)
packageName.contains("anddea.youtube") -> context.getString(R.string.revanced_extended_anddea)
packageName.contains("bill.youtube") -> context.getString(R.string.revanced_extended_anddea)
else -> ""
}

Expand Down
2 changes: 1 addition & 1 deletion play-services-base/core/src/main/res/values-pt-rBR/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<string name="foreground_service_notification_text"><xliff:g example="Exposure Notification">%1$s</xliff:g> está rodando em segundo plano</string>
<string name="foreground_service_notification_big_text">Exclua o <xliff:g example="microG Services">%1$s</xliff:g> das otimizações de bateria ou altere as configurações de notificação para ocultar este aviso</string>

<string name="menu_advanced">Avançado</string>
<string name="menu_settings">Configurações</string>

<string name="list_no_item_none">Nenhum</string>
<string name="list_item_see_all">Ver todos</string>
Expand Down
6 changes: 4 additions & 2 deletions play-services-base/core/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<string name="foreground_service_notification_text"><xliff:g example="Exposure Notification">%1$s</xliff:g> is running in background</string>
<string name="foreground_service_notification_big_text">Exclude <xliff:g example="microG Services">%1$s</xliff:g> from battery optimizations or change notification settings to hide this notification</string>

<string name="menu_advanced">Advanced</string>
<string name="menu_settings">Settings</string>

<string name="list_no_item_none">None</string>
<string name="list_item_see_all">See all</string>
Expand All @@ -27,6 +27,8 @@

<string name="vanced">Vanced</string>
<string name="revanced">ReVanced</string>
<string name="revanced_extended">ReVanced Extended</string>
<string name="youtube_advanced">YT Advanced</string>
<string name="revanced_extended">ReVanced Extended</string>
<string name="revanced_extended_anddea">ReVanced Extended (Anddea)</string>
<string name="revanced_extended_rufusin">ReVanced Extended (Rufusin)</string>
</resources>
1 change: 0 additions & 1 deletion play-services-core/microg-ui-tools/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,4 @@

<string name="error_connection">Connection error:</string>
<string name="error_others">Error:</string>

</resources>
2 changes: 1 addition & 1 deletion play-services-core/src/main/java/org/microg/gms/ui/AskPushPermission.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public void onCreate(Bundle savedInstanceState) {
return;
}

View gcmView = getLayoutInflater().inflate(R.layout.ask_gcm, null);
View gcmView = getLayoutInflater().inflate(R.layout.ask_push_notification, null);

// Create and show the AlertDialog
try {
Expand Down
2 changes: 1 addition & 1 deletion play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationAdvancedFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class PushNotificationAdvancedFragment : PreferenceFragmentCompat() {
private lateinit var networkOther: ListPreference

override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
addPreferencesFromResource(R.xml.preferences_gcm_advanced)
addPreferencesFromResource(R.xml.preferences_push_notification_settings)
}

override fun onCreate(savedInstanceState: Bundle?) {
Expand Down
2 changes: 1 addition & 1 deletion play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ class PushNotificationFragment : PreferenceFragmentCompat() {

override fun onOptionsItemSelected(item: MenuItem): Boolean {
return when (item.itemId) {
R.id.menu_advanced -> {
R.id.menu_settings -> {
findNavController().navigate(R.id.openGcmAdvancedSettings)
true
}
Expand Down
38 changes: 23 additions & 15 deletions ...ices-core/src/main/res/layout/ask_gcm.xml → ...main/res/layout/ask_push_notification.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,23 +59,31 @@
android:layout_marginBottom="18dp"
android:divider="?attr/dividerHorizontal"
android:orientation="vertical"
android:paddingLeft="20dp"
android:paddingRight="20dp">
android:paddingStart="26dp"
android:paddingEnd="26dp">

<com.google.android.material.button.MaterialButton
android:id="@+id/permission_allow_button"
android:layout_width="match_parent"
android:layout_height="64dp"
android:text="@string/allow">
</com.google.android.material.button.MaterialButton>
<com.google.android.material.button.MaterialButtonToggleGroup
android:id="@+id/toggleButton"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical">

<Button
android:id="@+id/permission_allow_button"
style="@style/Widget.Material3.Button.TonalButton"
android:layout_width="fill_parent"
android:layout_height="72dp"
android:text="@string/allow" />

<Button
android:id="@+id/permission_deny_button"
style="@style/Widget.Material3.Button.TonalButton"
android:layout_width="fill_parent"
android:layout_height="72dp"
android:text="@string/deny" />

<com.google.android.material.button.MaterialButton
android:id="@+id/permission_deny_button"
style="@style/Widget.Material3.Button.TonalButton"
android:layout_width="match_parent"
android:layout_height="64dp"
android:text="@string/deny">
</com.google.android.material.button.MaterialButton>
</com.google.android.material.button.MaterialButtonToggleGroup>
</LinearLayout>

</LinearLayout>
Expand Down
4 changes: 2 additions & 2 deletions play-services-core/src/main/res/menu/gcm_menu_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto">

<item
android:id="@+id/menu_advanced"
android:id="@+id/menu_settings"
android:icon="@drawable/ic_settings"
android:title="@string/menu_advanced"
android:title="@string/menu_settings"
app:showAsAction="ifRoom" />
</menu>
2 changes: 1 addition & 1 deletion play-services-core/src/main/res/navigation/nav_settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<fragment
android:id="@+id/gcmAdvancedFragment"
android:name="org.microg.gms.ui.PushNotificationAdvancedFragment"
android:label="@string/menu_advanced" />
android:label="@string/menu_settings" />

<fragment
android:id="@+id/privacyFragment"
Expand Down
15 changes: 8 additions & 7 deletions play-services-core/src/main/res/values-pt-rBR/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ Isso pode levar alguns minutos."</string>
<string name="pref_auth_visible_title">Permitir que aplicativos encontrem contas</string>
<string name="pref_auth_visible_summary">Quando ativado, todos os aplicativos deste dispositivo poderão ver o endereço de e-mail de suas contas do Google sem autorização prévia</string>
<string name="pref_auth_include_android_id_title">Autenticar com o registro de dispositivos</string>
<string name="pref_auth_include_android_id_summary">Quando desabilitado, as solicitações de autenticação não serão vinculadas ao registro de dispositivos, o que permite que dispositivos não autorizados entrem, mas podem haver consequências imprevistas</string>
<string name="pref_auth_include_android_id_summary">Quando desativado, as solicitações de autenticação não serão vinculadas ao registro de dispositivos, o que permite que dispositivos não autorizados entrem, mas podem haver consequências imprevistas</string>
<string name="pref_auth_strip_device_name_title">Remover nome do dispositivo para autenticação</string>
<string name="pref_auth_strip_device_name_summary">Quando ativado, solicitações de autenticação não incluirão o nome do dispositivo, o que pode permitir que dispositivos não autorizados façam login, mas pode ter consequências imprevistas</string>

Expand Down Expand Up @@ -127,7 +127,7 @@ Isso pode levar alguns minutos."</string>
<string name="gcm_messages_counter">Mensagens: <xliff:g example="123">%1$d</xliff:g> (<xliff:g example="12345">%2$d</xliff:g> bytes)</string>
<string name="gcm_network_state_disconnected">Desconectado</string>
<string name="gcm_network_state_connected">Conectado: <xliff:g example="2 hours ago">%1$s</xliff:g></string>
<string name="gcm_enable_switch">Receber notificações push</string>
<string name="gcm_enable_switch">Notificações push</string>
<string name="gcm_allow_app_popup">Permitir que <xliff:g example="F-Droid">%1$s</xliff:g> se registre para notificações push?</string>

<string name="pref_push_app_allow_register_title">Permitir registro</string>
Expand Down Expand Up @@ -156,6 +156,11 @@ Isso pode levar alguns minutos."</string>
<string name="push_notifications_summary_values_seconds">%s segundos</string>
<string name="push_notifications_summary_values_minutes">%s minutos</string>

<string name="pref_network_google_enabled_summary">Se desativado, todas as conexões com os servidores do Google normalmente feitas pelo MicroG serão negadas. Isso substitui as configurações específicas do serviço</string>
<string name="pref_network_google_enabled">Permitir a conexão aos servidores do Google</string>
<string name="pref_network_google_use_tor">Conectar ao Google via rede Tor</string>
<string name="pref_network_google_use_tor_summary">Exige que o Orbot esteja instalado\\nAinda não há suporte</string>

<!-- Account settings-->

<string name="pref_accounts_summary">Adicionar e gerenciar contas Google</string>
Expand All @@ -174,13 +179,9 @@ Isso pode levar alguns minutos."</string>
<string name="dialog_cancel_button">Cancelar</string>
<string name="toast_remove_account_success">%s removida</string>

<!-- Redesign strings-->
<!-- Settings options strings-->

<string name="developer">Desenvolvedor</string>
<string name="github_source">Repositório com o código fonte</string>
<string name="pref_hide_launcher_icon">Ocultar ícone do launcher</string>
<string name="pref_network_google_enabled_summary">Se desativado, todas as conexões com os servidores do Google normalmente feitas pelo MicroG serão negadas. Isso substitui as configurações específicas do serviço</string>
<string name="pref_network_google_enabled">Permitir a conexão aos servidores do Google</string>
<string name="pref_network_google_use_tor">Conectar ao Google via rede Tor</string>
<string name="pref_network_google_use_tor_summary">Exige que o Orbot esteja instalado\\nAinda não há suporte</string>
</resources>
11 changes: 6 additions & 5 deletions play-services-core/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,11 @@ This can take a couple of minutes"</string>
<string name="push_notifications_summary_values_seconds">%s seconds</string>
<string name="push_notifications_summary_values_minutes">%s minutes</string>

<string name="pref_network_google_enabled_summary">If disabled, all connections to Google servers usually done by MicroG will be denied. This overrides service specific settings</string>
<string name="pref_network_google_enabled">Allow connecting to Google servers</string>
<string name="pref_network_google_use_tor">Connect to Google via Tor network</string>
<string name="pref_network_google_use_tor_summary">Requires Orbot to be installed\\nNot yet supported</string>

<!-- Account settings-->

<string name="pref_accounts_summary">Add and manage Google accounts</string>
Expand All @@ -185,7 +190,7 @@ This can take a couple of minutes"</string>
<string name="dialog_cancel_button">Cancel</string>
<string name="toast_remove_account_success">%s removed</string>

<!-- Redesign strings-->
<!-- Settings options strings-->

<string name="wstxda">WSTxda</string>
<string name="developer">Developer</string>
Expand All @@ -194,8 +199,4 @@ This can take a couple of minutes"</string>
<string name="github_source">Source code repository</string>
<string name="github_link">https://github.com/WSTxda/MicroG-RE</string>
<string name="pref_hide_launcher_icon">Hide icon in launcher</string>
<string name="pref_network_google_enabled_summary">If disabled, all connections to Google servers usually done by MicroG will be denied. This overrides service specific settings</string>
<string name="pref_network_google_enabled">Allow connecting to Google servers</string>
<string name="pref_network_google_use_tor">Connect to Google via Tor network</string>
<string name="pref_network_google_use_tor_summary">Requires Orbot to be installed\\nNot yet supported</string>
</resources>
0 ...main/res/xml/preferences_gcm_advanced.xml → ...references_push_notification_settings.xml
View file
File renamed without changes.

0 comments on commit e98047c

Please sign in to comment.