Merge pull request #7233 from thundernest/remove_twitter_link (aeed534b) · Commits · e / os / Mail

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

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -62,11 +62,6 @@ class AboutFragment : Fragment() {
	openUrl(getString(R.string.fediverse_url))		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 manager = LinearLayoutManager(view.context)
	val librariesRecyclerView = view.findViewById<RecyclerView>(R.id.libraries)		val librariesRecyclerView = view.findViewById<RecyclerView>(R.id.libraries)
	librariesRecyclerView.apply {		librariesRecyclerView.apply {

deleted100644 → 0

+0 −10

Original line number	Original line	Diff line number	Diff line
	<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="M22.46,6c-0.77,0.35 -1.6,0.58 -2.46,0.69c0.88,-0.53 1.56,-1.37 1.88,-2.38c-0.83,0.5 -1.75,0.85 -2.72,1.05C18.37,4.5 17.26,4 16,4c-2.35,0 -4.27,1.92 -4.27,4.29c0,0.34 0.04,0.67 0.11,0.98C8.28,9.09 5.11,7.38 3,4.79c-0.37,0.63 -0.58,1.37 -0.58,2.15c0,1.49 0.75,2.81 1.91,3.56c-0.71,0 -1.37,-0.2 -1.95,-0.5v0.03c0,2.08 1.48,3.82 3.44,4.21a4.22,4.22 0,0 1,-1.93 0.07a4.28,4.28 0,0 0,4 2.98a8.521,8.521 0,0 1,-5.33 1.84c-0.34,0 -0.68,-0.02 -1.02,-0.06C3.44,20.29 5.7,21 8.12,21C16,21 20.33,14.46 20.33,8.79c0,-0.19 0,-0.37 -0.01,-0.56c0.84,-0.6 1.56,-1.36 2.14,-2.23z" />
	</vector>

+0 −40

Original line number	Original line	Diff line number	Diff line
	@@ -320,46 +320,6 @@
	</LinearLayout>		</LinearLayout>
	</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		<TextView
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -123,7 +123,6 @@
	<attr name="iconAboutSourceCode" format="reference"/>		<attr name="iconAboutSourceCode" format="reference"/>
	<attr name="iconAboutLicense" format="reference"/>		<attr name="iconAboutLicense" format="reference"/>
	<attr name="iconAboutWebsite" format="reference"/>		<attr name="iconAboutWebsite" format="reference"/>
	<attr name="iconAboutTwitter" format="reference"/>
	<attr name="iconAboutFediverse" format="reference"/>		<attr name="iconAboutFediverse" format="reference"/>
	<attr name="iconUserForum" format="reference"/>		<attr name="iconUserForum" format="reference"/>
	<attr name="iconUserManual" format="reference"/>		<attr name="iconUserManual" format="reference"/>

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -9,6 +9,4 @@
	<string name="app_license_url" translatable="false">https://www.apache.org/licenses/LICENSE-2.0</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_handle" translatable="false">\@k9mail@fosstodon.org</string>
	<string name="fediverse_url" translatable="false">https://fosstodon.org/@k9mail</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>		</resources>