wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7820 from thunderbird/remove-fediverse-link-from-about-screen

Browse source 
Remove fediverse from about screen
This commit is contained in:
Wolf-Martell Montwé 2024-05-08 14:17:21 +00:00 committed by GitHub
commit 0e7941de53
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 0 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt
View file

@ -57,11 +57,6 @@ class AboutFragment : Fragment() {
openUrl(getString(R.string.user_forum_url))
}
val fediverseLayout = view.findViewById<View>(R.id.fediverseLayout)
fediverseLayout.setOnClickListener {
openUrl(getString(R.string.fediverse_url))
}
val manager = LinearLayoutManager(view.context)
val librariesRecyclerView = view.findViewById<RecyclerView>(R.id.libraries)
librariesRecyclerView.apply {

10
app/ui/legacy/src/main/res/drawable/ic_mastodon.xml
View file

@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M20.94,14c-0.28,1.41 -2.44,2.96 -4.97,3.26c-1.31,0.15 -2.6,0.3 -3.97,0.24c-2.25,-0.11 -4,-0.54 -4,-0.54v0.62c0.32,2.22 2.22,2.35 4.03,2.42c1.82,0.05 3.44,-0.46 3.44,-0.46l0.08,1.65s-1.28,0.68 -3.55,0.81c-1.25,0.07 -2.81,-0.03 -4.62,-0.5c-3.92,-1.05 -4.6,-5.24 -4.7,-9.5l-0.01,-3.43c0,-4.34 2.83,-5.61 2.83,-5.61C6.95,2.3 9.41,2 11.97,2h0.06c2.56,0 5.02,0.3 6.47,0.96c0,0 2.83,1.27 2.83,5.61c0,0 0.04,3.21 -0.39,5.43M18,8.91c0,-1.08 -0.3,-1.91 -0.85,-2.56c-0.56,-0.63 -1.3,-0.96 -2.23,-0.96c-1.06,0 -1.87,0.41 -2.42,1.23l-0.5,0.88l-0.5,-0.88c-0.56,-0.82 -1.36,-1.23 -2.43,-1.23c-0.92,0 -1.66,0.33 -2.23,0.96C6.29,7 6,7.83 6,8.91v5.26h2.1V9.06c0,-1.06 0.45,-1.62 1.36,-1.62c1,0 1.5,0.65 1.5,1.93v2.79h2.07V9.37c0,-1.28 0.5,-1.93 1.51,-1.93c0.9,0 1.35,0.56 1.35,1.62v5.11H18V8.91z" />
</vector>

40
app/ui/legacy/src/main/res/layout/fragment_about.xml
View file

@ -280,46 +280,6 @@
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/fediverseLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center"
android:contentDescription="@null"
app:srcCompat="@drawable/ic_mastodon" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingStart="30dp"
android:paddingEnd="0dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/about_fediverse_title"
android:textColor="?android:attr/textColorPrimary" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/fediverse_handle" />
</LinearLayout>
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
app/ui/legacy/src/main/res/values/constants.xml
View file

@ -7,6 +7,4 @@
<string name="app_authors_url" translatable="false">https://github.com/thunderbird/thunderbird-android/graphs/contributors</string>
<string name="app_source_url" translatable="false">https://github.com/thunderbird/thunderbird-android</string>
<string name="app_license_url" translatable="false">https://www.apache.org/licenses/LICENSE-2.0</string>
<string name="fediverse_handle" translatable="false">\@k9mail@fosstodon.org</string>
<string name="fediverse_url" translatable="false">https://fosstodon.org/@k9mail</string>
</resources>

1
app/ui/legacy/src/main/res/values/strings.xml
View file

@ -20,7 +20,6 @@
<string name="user_manual_title">User manual</string>
<string name="get_help_title">Get help</string>
<string name="user_forum_title">User forum</string>
<string name="about_fediverse_title">Fediverse</string>
<string name="about_libraries">Libraries</string>
<string name="license">License</string>
<string name="changelog_title">Changelog</string>