rei-forks
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6021 from vector-im/feature/bma/finish_remove_flair 

Remove remaining dead code about flair
This commit is contained in:
Benoit Marty 2022-05-12 11:31:42 +02:00 committed by GitHub
parent e56f6e910c 1ef5416b50
commit 4309fdba7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vector/src/main/res/drawable/ic_settings_root_flair.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="25dp"
android:height="25dp"
android:viewportWidth="25"
android:viewportHeight="25">
<path
android:pathData="M12.4893,23C13.1012,23 13.6058,22.5491 13.6917,21.9156C14.6258,15.3344 15.5169,14.4325 21.8727,13.7132C22.5169,13.638 23,13.112 23,12.5C23,11.8773 22.5276,11.3727 21.8834,11.2868C15.5598,10.4601 14.7439,9.6549 13.6917,3.0736C13.5844,2.4402 13.1012,2 12.4893,2C11.888,2 11.3834,2.4402 11.2868,3.0844C10.3635,9.6656 9.4724,10.5675 3.1166,11.2868C2.4724,11.362 2,11.8773 2,12.5C2,13.112 2.4617,13.6273 3.1166,13.7132C9.4402,14.5936 10.2239,15.3451 11.2868,21.9264C11.4049,22.5598 11.8988,23 12.4893,23Z"
android:fillColor="#000000"/>
</vector>

2
vector/src/main/res/values/strings.xml
View File

@ -1057,7 +1057,7 @@
<string name="settings_play_shutter_sound">Play shutter sound</string>
<!-- TODO Remove -->
<string name="settings_flair" tools:ignore="MissingTranslation">Flair</string>
<string name="settings_flair" tools:ignore="UnusedResources">Flair</string>
<!-- medias saving settings -->
<string name="media_saving_period_3_days">3 days</string>

8
vector/src/main/res/xml/vector_settings_root.xml
View File

@ -8,12 +8,6 @@
app:fragment="im.vector.app.features.settings.VectorSettingsGeneralFragment"
app:isPreferenceVisible="@bool/settings_root_general_visible" />
<im.vector.app.core.preference.VectorPreference
android:icon="@drawable/ic_settings_root_flair"
android:title="@string/settings_flair"
app:fragment="im.vector.app.features.settings.VectorSettingsFlairFragment"
app:isPreferenceVisible="@bool/false_not_implemented" />
<im.vector.app.core.preference.VectorPreference
android:icon="@drawable/ic_settings_root_notification"
android:title="@string/settings_notifications"
@ -62,4 +56,4 @@
app:fragment="im.vector.app.features.settings.legals.LegalsFragment"
app:isPreferenceVisible="@bool/settings_root_legals_visible" />
</androidx.preference.PreferenceScreen>
</androidx.preference.PreferenceScreen>