Skip to content

Commit

Permalink
UI Refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
@WSTxda
WSTxda committed Mar 23, 2024
1 parent 55904d9 commit dccad0e
Show file tree
Hide file tree
Showing 29 changed files with 107 additions and 204 deletions.
14 changes: 7 additions & 7 deletions play-services-base/core/src/main/res/drawable/ic_expand_apps.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:width="25dp"
android:height="25dp"
android:tint="?attr/colorAccent"
android:viewportWidth="24"
android:viewportHeight="24">
android:viewportWidth="25"
android:viewportHeight="25">
<group>
<clip-path android:pathData="M0 0H24V24H0z" />
<clip-path android:pathData="M.64.92H24.64V24.92H.64z" />
<group>
<path
android:fillColor="#FF000000"
android:pathData="M12.6 12L8 7.4 9.4 6l6 6-6 6L8 16.6l4.6-4.6Z" />
android:fillColor="#FF1C1B1F"
android:pathData="M13.24 12.92l-3.9-3.9C9.16 8.83 9.07 8.6 9.07 8.32c0-0.29 0.1-0.52 0.27-0.7 0.19-0.19 0.42-0.28 0.7-0.28 0.29 0 0.52 0.1 0.7 0.28l4.6 4.6c0.1 0.1 0.17 0.2 0.22 0.32 0.04 0.12 0.06 0.24 0.06 0.38 0 0.13-0.02 0.26-0.06 0.37-0.05 0.12-0.12 0.23-0.22 0.33l-4.6 4.6c-0.18 0.18-0.41 0.27-0.7 0.27-0.28 0-0.51-0.09-0.7-0.27-0.18-0.19-0.27-0.42-0.27-0.7 0-0.29 0.1-0.52 0.27-0.7l3.9-3.9Z" />
</group>
</group>
</vector>
21 changes: 0 additions & 21 deletions play-services-base/core/src/main/res/drawable/ic_info_outline.xml
View file

This file was deleted.

21 changes: 21 additions & 0 deletions play-services-base/core/src/main/res/drawable/ic_information.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ SPDX-FileCopyrightText: 2019, The Android Open Source Project
~ SPDX-FileCopyrightText: 2020, microG Project Team
~ SPDX-License-Identifier: Apache-2.0
-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24">
<group>
<clip-path android:pathData="M0 0H24V24H0z" />
<group>
<path
android:fillColor="#FF1C1B1F"
android:pathData="M12 17c0.28 0 0.52-0.1 0.71-0.29C12.91 16.52 13 16.28 13 16v-4c0-0.28-0.1-0.52-0.29-0.71C12.52 11.09 12.28 11 12 11c-0.28 0-0.52 0.1-0.71 0.29C11.09 11.48 11 11.72 11 12v4c0 0.28 0.1 0.52 0.29 0.71C11.48 16.91 11.72 17 12 17Zm0-8c0.28 0 0.52-0.1 0.71-0.29C12.91 8.52 13 8.28 13 8c0-0.28-0.1-0.52-0.29-0.71C12.52 7.09 12.28 7 12 7c-0.28 0-0.52 0.1-0.71 0.29C11.09 7.48 11 7.72 11 8c0 0.28 0.1 0.52 0.29 0.71C11.48 8.91 11.72 9 12 9Zm0 13c-1.38 0-2.68-0.26-3.9-0.79-1.22-0.52-2.27-1.23-3.17-2.14-0.9-0.9-1.62-1.95-2.14-3.17C2.26 14.68 2 13.38 2 12s0.26-2.68 0.79-3.9C3.3 6.88 4.03 5.83 4.92 4.93c0.9-0.9 1.96-1.62 3.18-2.14C9.32 2.26 10.62 2 12 2s2.68 0.26 3.9 0.79c1.22 0.52 2.28 1.24 3.17 2.13 0.9 0.9 1.62 1.96 2.14 3.18C21.74 9.32 22 10.62 22 12s-0.26 2.68-0.79 3.9c-0.52 1.22-1.23 2.28-2.14 3.17-0.9 0.9-1.95 1.62-3.17 2.14C14.68 21.74 13.38 22 12 22Zm0-2c2.23 0 4.13-0.77 5.68-2.32C19.23 16.13 20 14.23 20 12c0-2.23-0.77-4.13-2.32-5.67C16.13 4.78 14.23 4 12 4 9.77 4 7.87 4.78 6.33 6.33 4.78 7.87 4 9.77 4 12s0.78 4.13 2.33 5.68C7.87 19.23 9.77 20 12 20Z" />
</group>
</group>
</vector>
4 changes: 2 additions & 2 deletions play-services-base/core/src/main/res/drawable/ic_open.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<clip-path android:pathData="M0 0H24V24H0z" />
<group>
<path
android:fillColor="#000000"
android:pathData="M5 21c-0.55 0-1.02-0.2-1.41-0.59C3.19 20.02 3 19.55 3 19V5c0-0.55 0.2-1.02 0.59-1.41C3.98 3.19 4.45 3 5 3h7v2H5v14h14v-7h2v7c0 0.55-0.2 1.02-0.59 1.41C20.02 20.81 19.55 21 19 21H5Zm4.7-5.3l-1.4-1.4L17.6 5H14V3h7v7h-2V6.4l-9.3 9.3Z" />
android:fillColor="#FF1C1B1F"
android:pathData="M5 21c-0.55 0-1.02-0.2-1.41-0.59C3.19 20.02 3 19.55 3 19V5c0-0.55 0.2-1.02 0.59-1.41C3.98 3.19 4.45 3 5 3h6c0.28 0 0.52 0.1 0.71 0.29C11.91 3.48 12 3.72 12 4c0 0.28-0.1 0.52-0.29 0.71C11.52 4.91 11.28 5 11 5H5v14h14v-6c0-0.28 0.1-0.52 0.29-0.71C19.48 12.09 19.72 12 20 12c0.28 0 0.52 0.1 0.71 0.29C20.91 12.48 21 12.72 21 13v6c0 0.55-0.2 1.02-0.59 1.41C20.02 20.81 19.55 21 19 21H5ZM19 6.4L10.4 15c-0.18 0.18-0.42 0.28-0.7 0.28-0.28 0-0.52-0.1-0.7-0.28-0.18-0.18-0.28-0.42-0.28-0.7 0-0.28 0.1-0.52 0.28-0.7L17.6 5H15c-0.28 0-0.52-0.1-0.71-0.29C14.09 4.52 14 4.28 14 4c0-0.28 0.1-0.52 0.29-0.71C14.48 3.09 14.72 3 15 3h5c0.28 0 0.52 0.1 0.71 0.29C20.91 3.48 21 3.72 21 4v5c0 0.28-0.1 0.52-0.29 0.71C20.52 9.91 20.28 10 20 10c-0.28 0-0.52-0.1-0.71-0.29C19.09 9.52 19 9.28 19 9V6.4Z" />
</group>
</group>
</vector>
2 changes: 1 addition & 1 deletion play-services-base/core/src/main/res/drawable/ic_patcher.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<clip-path android:pathData="M0 0H24V24H0z" />
<group>
<path
android:fillColor="#000000"
android:fillColor="#FF1C1B1F"
android:pathData="M18.85 21.98c-0.13 0-0.26-0.03-0.38-0.07-0.11-0.04-0.22-0.11-0.32-0.21l-5.1-5.1c-0.1-0.1-0.17-0.2-0.21-0.33-0.04-0.11-0.06-0.24-0.06-0.37s0.02-0.26 0.06-0.38c0.04-0.11 0.11-0.22 0.21-0.32l2.13-2.13c0.1-0.1 0.2-0.17 0.32-0.2 0.12-0.05 0.24-0.07 0.38-0.07 0.13 0 0.25 0.02 0.37 0.06 0.12 0.04 0.23 0.12 0.32 0.21l5.1 5.1c0.1 0.1 0.18 0.21 0.22 0.33 0.04 0.12 0.06 0.24 0.06 0.38 0 0.13-0.02 0.25-0.06 0.37-0.04 0.12-0.12 0.23-0.21 0.32l-2.13 2.13c-0.1 0.1-0.2 0.17-0.32 0.21-0.12 0.04-0.25 0.07-0.38 0.07Zm0-2.38l0.72-0.73-3.67-3.67-0.72 0.73 3.67 3.67ZM5.12 22C5 22 4.87 21.98 4.75 21.93 4.6 21.88 4.5 21.8 4.4 21.7l-2.1-2.1c-0.1-0.1-0.17-0.21-0.22-0.34C2.02 19.14 2 19.01 2 18.87c0-0.13 0.02-0.25 0.08-0.37 0.04-0.12 0.12-0.23 0.22-0.32l5.3-5.3h2.13l0.84-0.86L6.45 7.9H5.03L2 4.87l2.83-2.82 3.02 3.03V6.5l4.13 4.13 2.9-2.9-1.08-1.08 1.4-1.4h-2.82l-0.7-0.7L15.21 1l0.7 0.7v2.83l1.4-1.4 3.55 3.54c0.29 0.29 0.5 0.6 0.65 0.97 0.16 0.36 0.23 0.74 0.23 1.14 0 0.4-0.07 0.78-0.23 1.15-0.14 0.36-0.36 0.69-0.64 0.97l-2.13-2.13-1.4 1.4-1.05-1.04-5.18 5.17v2.1l-5.3 5.3c-0.1 0.1-0.2 0.18-0.32 0.23C5.38 21.98 5.26 22 5.12 22Zm0-2.4l4.25-4.25v-0.72H8.65L4.4 18.87l0.72 0.73Zm0 0L4.4 18.87l0.38 0.36 0.34 0.37Z" />
</group>
</group>
Expand Down
4 changes: 2 additions & 2 deletions play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_less.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
<clip-path android:pathData="M0 0H24V24H0z" />
<group>
<path
android:fillColor="#000000"
android:pathData="M7.4 15.38L6 13.97l6-6 6 6-1.4 1.4-4.6-4.6-4.6 4.6Z" />
android:fillColor="#FF1C1B1F"
android:pathData="M12 10.78l-3.9 3.9c-0.18 0.18-0.42 0.27-0.7 0.27-0.28 0-0.52-0.1-0.7-0.27-0.18-0.19-0.28-0.42-0.28-0.7 0-0.29 0.1-0.52 0.28-0.7l4.6-4.6c0.1-0.1 0.2-0.18 0.32-0.22C11.74 8.42 11.88 8.4 12 8.4s0.26 0.02 0.38 0.06c0.11 0.04 0.22 0.11 0.32 0.21l4.6 4.6c0.18 0.19 0.27 0.42 0.27 0.7 0 0.29-0.09 0.52-0.27 0.7-0.18 0.19-0.42 0.28-0.7 0.28-0.28 0-0.52-0.1-0.7-0.27l-3.9-3.9Z" />
</group>
</group>
</vector>
6 changes: 3 additions & 3 deletions play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_more.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
android:viewportWidth="24"
android:viewportHeight="24">
<group>
<clip-path android:pathData="M.2.82H24.2V24.82H.2z" />
<clip-path android:pathData="M0 0H24V24H0z" />
<group>
<path
android:fillColor="#000000"
android:pathData="M12.2 16.2l-6-6 1.4-1.4 4.6 4.6 4.6-4.6 1.4 1.4-6 6Z" />
android:fillColor="#FF1C1B1F"
android:pathData="M12 14.95c-0.13 0-0.26-0.02-0.38-0.06-0.11-0.04-0.22-0.12-0.32-0.21l-4.6-4.6c-0.18-0.19-0.28-0.42-0.28-0.7 0-0.29 0.1-0.52 0.28-0.7C6.88 8.49 7.12 8.4 7.4 8.4c0.28 0 0.52 0.1 0.7 0.28l3.9 3.9 3.9-3.9c0.18-0.19 0.42-0.28 0.7-0.28 0.28 0 0.52 0.1 0.7 0.28 0.18 0.18 0.27 0.41 0.27 0.7 0 0.28-0.09 0.51-0.27 0.7l-4.6 4.6c-0.1 0.1-0.2 0.17-0.32 0.2-0.12 0.05-0.25 0.07-0.38 0.07Z" />
</group>
</group>
</vector>
87 changes: 0 additions & 87 deletions play-services-core/microg-ui-tools/src/main/res/layout-v21/preference_material.xml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion play-services-core/src/main/java/org/microg/gms/ui/AccountsFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ class AccountsFragment : PreferenceFragmentCompat() {
}

override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
inflater.inflate(R.menu.privacy_menu_item, menu)
inflater.inflate(R.menu.accounts_menu_item, menu)
super.onCreateOptionsMenu(menu, inflater)
}

Expand Down
16 changes: 16 additions & 0 deletions play-services-core/src/main/res/drawable/ic_accounts.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="25dp"
android:height="25dp"
android:tint="?colorControlNormal"
android:viewportWidth="25"
android:viewportHeight="25">
<group>
<clip-path android:pathData="M.5.5H24.5V24.5H.5z" />
<group>
<path
android:fillColor="#FF1C1B1F"
android:pathData="M6.35 17.6c0.85-0.65 1.8-1.16 2.85-1.54 1.05-0.37 2.15-0.56 3.3-0.56s2.25 0.19 3.3 0.56c1.05 0.38 2 0.89 2.85 1.54 0.58-0.68 1.04-1.46 1.36-2.33 0.33-0.86 0.49-1.79 0.49-2.77 0-2.22-0.78-4.1-2.34-5.66C16.6 5.28 14.72 4.5 12.5 4.5S8.4 5.28 6.84 6.84C5.28 8.4 4.5 10.28 4.5 12.5c0 0.98 0.16 1.9 0.49 2.78 0.32 0.86 0.78 1.64 1.36 2.32Zm6.15-4.1c-0.98 0-1.81-0.34-2.49-1.01C9.34 11.8 9 10.99 9 10c0-0.98 0.34-1.81 1.01-2.49 0.68-0.67 1.5-1.01 2.49-1.01 0.98 0 1.81 0.34 2.49 1.01C15.66 8.2 16 9.01 16 10c0 0.98-0.34 1.81-1.01 2.49-0.68 0.67-1.5 1.01-2.49 1.01Zm0 9c-1.38 0-2.68-0.26-3.9-0.79-1.22-0.52-2.27-1.23-3.17-2.14-0.9-0.9-1.62-1.95-2.14-3.17-0.53-1.22-0.79-2.52-0.79-3.9s0.26-2.68 0.79-3.9C3.8 7.38 4.53 6.33 5.42 5.43c0.9-0.9 1.96-1.62 3.18-2.14 1.22-0.53 2.52-0.79 3.9-0.79s2.68 0.26 3.9 0.79c1.22 0.52 2.28 1.24 3.18 2.13 0.9 0.9 1.6 1.96 2.13 3.18 0.53 1.22 0.79 2.52 0.79 3.9s-0.26 2.68-0.79 3.9c-0.52 1.22-1.23 2.28-2.14 3.18-0.9 0.9-1.95 1.6-3.17 2.13-1.22 0.53-2.52 0.79-3.9 0.79Zm0-2c0.88 0 1.72-0.13 2.5-0.39s1.5-0.63 2.15-1.11c-0.65-0.48-1.37-0.85-2.15-1.11-0.78-0.26-1.62-0.39-2.5-0.39-0.88 0-1.72 0.13-2.5 0.39S8.5 18.52 7.85 19c0.65 0.48 1.37 0.85 2.15 1.11 0.78 0.26 1.62 0.39 2.5 0.39Zm0-9c0.43 0 0.8-0.14 1.07-0.43C13.86 10.8 14 10.43 14 10c0-0.43-0.14-0.8-0.43-1.07C13.3 8.64 12.93 8.5 12.5 8.5c-0.43 0-0.8 0.14-1.07 0.43C11.14 9.2 11 9.57 11 10c0 0.43 0.14 0.8 0.43 1.07 0.28 0.29 0.64 0.43 1.07 0.43Z" />
</group>
</group>
</vector>
16 changes: 0 additions & 16 deletions play-services-core/src/main/res/drawable/ic_add_account.xml
View file

This file was deleted.

4 changes: 2 additions & 2 deletions play-services-core/src/main/res/drawable/ic_add_new_account.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<clip-path android:pathData="M0 0H24V24H0z" />
<group>
<path
android:fillColor="#000000"
android:pathData="M11 13H5v-2h6V5h2v6h6v2h-6v6h-2v-6Z" />
android:fillColor="#FF1C1B1F"
android:pathData="M11 13H6c-0.28 0-0.52-0.1-0.71-0.29C5.09 12.52 5 12.28 5 12c0-0.28 0.1-0.52 0.29-0.71C5.48 11.09 5.72 11 6 11h5V6c0-0.28 0.1-0.52 0.29-0.71C11.48 5.09 11.72 5 12 5c0.28 0 0.52 0.1 0.71 0.29C12.91 5.48 13 5.72 13 6v5h5c0.28 0 0.52 0.1 0.71 0.29C18.91 11.48 19 11.72 19 12c0 0.28-0.1 0.52-0.29 0.71C18.52 12.91 18.28 13 18 13h-5v5c0 0.28-0.1 0.52-0.29 0.71C12.52 18.91 12.28 19 12 19c-0.28 0-0.52-0.1-0.71-0.29C11.09 18.52 11 18.28 11 18v-5Z" />
</group>
</group>
</vector>
16 changes: 0 additions & 16 deletions play-services-core/src/main/res/drawable/ic_cloud_bell.xml
View file

This file was deleted.

16 changes: 16 additions & 0 deletions play-services-core/src/main/res/drawable/ic_cloud_messaging.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24">
<group>
<clip-path android:pathData="M0 0H24V24H0z" />
<group>
<path
android:fillColor="#FF1C1B1F"
android:pathData="M5 19c-0.28 0-0.52-0.1-0.71-0.29C4.09 18.52 4 18.28 4 18c0-0.28 0.1-0.52 0.29-0.71C4.48 17.09 4.72 17 5 17h1v-7c0-1.38 0.42-2.61 1.25-3.69 0.83-1.07 1.92-1.78 3.25-2.11V3.5c0-0.42 0.15-0.77 0.44-1.06C11.23 2.14 11.58 2 12 2c0.42 0 0.77 0.15 1.06 0.44 0.3 0.29 0.44 0.64 0.44 1.06v0.7c1.33 0.33 2.42 1.04 3.25 2.11C17.58 7.4 18 8.61 18 10v7h1c0.28 0 0.52 0.1 0.71 0.29C19.91 17.48 20 17.72 20 18c0 0.28-0.1 0.52-0.29 0.71C19.52 18.91 19.28 19 19 19H5Zm7 3c-0.55 0-1.02-0.2-1.41-0.59C10.19 21.02 10 20.55 10 20h4c0 0.55-0.2 1.02-0.59 1.41C13.02 21.81 12.55 22 12 22Zm-4-5h8v-7c0-1.1-0.4-2.04-1.18-2.83C14.04 6.4 13.1 6 12 6c-1.1 0-2.04 0.4-2.82 1.17C8.39 7.96 8 8.9 8 10v7Z" />
</group>
</group>
</vector>
Loading

0 comments on commit dccad0e

Please sign in to comment.