Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Twitter from about screen #7233

Merged
merged 1 commit into from
Oct 11, 2023
Merged

Remove Twitter from about screen #7233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,6 @@ class AboutFragment : Fragment() {
openUrl(getString(R.string.fediverse_url))
}

val twitterLayout = view.findViewById<View>(R.id.twitterLayout)
twitterLayout.setOnClickListener {
openUrl(getString(R.string.twitter_url))
}

val manager = LinearLayoutManager(view.context)
val librariesRecyclerView = view.findViewById<RecyclerView>(R.id.libraries)
librariesRecyclerView.apply {
Expand Down
10 changes: 0 additions & 10 deletions app/ui/legacy/src/main/res/drawable/ic_twitter.xml
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions app/ui/legacy/src/main/res/layout/fragment_about.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,46 +320,6 @@
</LinearLayout>
</LinearLayout>

<LinearLayout
android:id="@+id/twitterLayout"
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="?attr/iconAboutTwitter" />

<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_twitter_title"
android:textColor="?android:attr/textColorPrimary" />

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/twitter_handle" />
</LinearLayout>
</LinearLayout>

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down
1 change: 0 additions & 1 deletion app/ui/legacy/src/main/res/values/attrs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@
<attr name="iconAboutSourceCode" format="reference"/>
<attr name="iconAboutLicense" format="reference"/>
<attr name="iconAboutWebsite" format="reference"/>
<attr name="iconAboutTwitter" format="reference"/>
<attr name="iconAboutFediverse" format="reference"/>
<attr name="iconUserForum" format="reference"/>
<attr name="iconUserManual" format="reference"/>
Expand Down
2 changes: 0 additions & 2 deletions app/ui/legacy/src/main/res/values/constants.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,4 @@
<string name="app_license_url" translatable="false">https://www.apache.org/licenses/LICENSE-2.0</string>
<string name="fediverse_handle" translatable="false">\@[email protected]</string>
<string name="fediverse_url" translatable="false">https://fosstodon.org/@k9mail</string>
<string name="twitter_handle" translatable="false">\@k9mail_app</string>
<string name="twitter_url" translatable="false">https://twitter.com/k9mail_app</string>
</resources>
1 change: 0 additions & 1 deletion app/ui/legacy/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
<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_twitter_title">Twitter</string>
<string name="about_libraries">Libraries</string>
<string name="license">License</string>
<string name="changelog_title">Changelog</string>
Expand Down
2 changes: 0 additions & 2 deletions app/ui/legacy/src/main/res/values/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@
<item name="iconUserManual">@drawable/ic_open_book</item>
<item name="iconHelp">@drawable/ic_help</item>
<item name="iconAboutFediverse">@drawable/ic_mastodon</item>
<item name="iconAboutTwitter">@drawable/ic_twitter</item>

<item name="unencryptedAttachmentUnlock">@drawable/ic_visibility</item>
<item name="openpgp_black">#000</item>
Expand Down Expand Up @@ -315,7 +314,6 @@
<item name="iconUserManual">@drawable/ic_open_book</item>
<item name="iconHelp">@drawable/ic_help</item>
<item name="iconAboutFediverse">@drawable/ic_mastodon</item>
<item name="iconAboutTwitter">@drawable/ic_twitter</item>

<item name="unencryptedAttachmentUnlock">@drawable/ic_visibility</item>
<item name="openpgp_black">#fff</item>
Expand Down