Merge pull request #3854 from williamvds/aboutFontFix (33c3d33a) · Commits · e / os / Mail

app/ui/src/main/res/layout/about.xml

+37 −36

Original line number	Diff line number	Diff line
		@@ -31,23 +31,24 @@
		android:gravity="center_vertical"
		android:text="@string/about_title"
		android:textColor="?android:attr/textColorPrimary"
		android:textSize="34sp"/>
		android:textAppearance="?android:attr/textAppearanceLarge" />

		<LinearLayout
		android:id="@+id/versionLayout"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingTop="16dp"
		android:paddingBottom="16dp"
		android:paddingTop="8dp"
		android:paddingBottom="8dp"
		android:paddingLeft="16dp"
		android:paddingRight="16dp"
		android:gravity="center_vertical"
		android:clickable="true"
		android:focusable="true"
		android:background="?attr/selectableItemBackground">
		<ImageView
		android:src="?attr/iconSettingsAbout"
		android:layout_width="28dp"
		android:layout_height="28dp"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:layout_gravity="center" />

		<LinearLayout
		@@ -60,15 +61,12 @@
		android:text="@string/version"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textColor="?android:attr/textColorPrimary"
		android:textAppearance="?android:attr/textAppearanceMedium" />

		android:textColor="?android:attr/textColorPrimary" />
		<TextView
		android:id="@+id/version"
		android:text="Version"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textAppearance="?android:attr/textAppearanceMedium" />
		android:layout_height="wrap_content" />
		</LinearLayout>
		</LinearLayout>

		@@ -76,17 +74,18 @@
		android:id="@+id/authorsLayout"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingTop="16dp"
		android:paddingBottom="16dp"
		android:paddingTop="8dp"
		android:paddingBottom="8dp"
		android:paddingLeft="16dp"
		android:paddingRight="16dp"
		android:gravity="center_vertical"
		android:clickable="true"
		android:focusable="true"
		android:background="?attr/selectableItemBackground">
		<ImageView
		android:src="?attr/iconAboutAuthors"
		android:layout_width="28dp"
		android:layout_height="28dp"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:layout_gravity="center" />

		<LinearLayout
		@@ -96,17 +95,15 @@
		android:orientation="vertical">

		<TextView
		android:text="Authors"
		android:text="@string/authors"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textColor="?android:attr/textColorPrimary"
		android:textAppearance="?android:attr/textAppearanceMedium" />
		android:textColor="?android:attr/textColorPrimary" />

		<TextView
		android:text="@string/app_authors"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textAppearance="?android:attr/textAppearanceMedium" />
		android:layout_height="wrap_content" />
		</LinearLayout>
		</LinearLayout>

		@@ -114,17 +111,18 @@
		android:id="@+id/licenseLayout"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingTop="16dp"
		android:paddingBottom="16dp"
		android:paddingTop="8dp"
		android:paddingBottom="8dp"
		android:paddingLeft="16dp"
		android:paddingRight="16dp"
		android:gravity="center_vertical"
		android:clickable="true"
		android:focusable="true"
		android:background="?attr/selectableItemBackground">
		<ImageView
		android:src="?attr/iconAboutLicense"
		android:layout_width="28dp"
		android:layout_height="28dp"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:layout_gravity="center" />

		<LinearLayout
		@@ -133,30 +131,30 @@
		android:paddingLeft="30dp"
		android:orientation="vertical">
		<TextView
		android:text="License"
		android:text="@string/license"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textColor="?android:attr/textColorPrimary"
		android:textAppearance="?android:attr/textAppearanceMedium" />
		android:textColor="?android:attr/textColorPrimary" />

		<TextView
		android:text="@string/app_license"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textAppearance="?android:attr/textAppearanceMedium" />
		android:layout_height="wrap_content" />
		</LinearLayout>
		</LinearLayout>

		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingTop="16dp"
		android:layout_marginTop="16dp"
		android:layout_gravity="center">
		<Button
		android:id="@+id/source"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginRight="10dp"
		android:layout_marginLeft="8dp"
		android:layout_gravity="center_vertical"
		android:padding="8dp"
		android:background="?android:attr/selectableItemBackground"
		android:text="@string/source_code"
		android:textAllCaps="true" />
		@@ -165,7 +163,9 @@
		android:id="@+id/changelog"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginRight="10dp"
		android:layout_marginLeft="8dp"
		android:layout_gravity="center_vertical"
		android:padding="8dp"
		android:background="?android:attr/selectableItemBackground"
		android:text="@string/changelog_full_title"
		android:textAllCaps="true" />
		@@ -174,6 +174,10 @@
		android:id="@+id/revisions"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginLeft="8dp"
		android:layout_marginRight="8dp"
		android:layout_gravity="center_vertical"
		android:padding="8dp"
		android:background="?android:attr/selectableItemBackground"
		android:text="@string/app_revision"
		android:textAllCaps="true" />
		@@ -183,10 +187,7 @@
		android:id="@+id/copyright"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingTop="16dp"
		android:paddingBottom="16dp"
		android:paddingLeft="16dp"
		android:paddingRight="16dp"
		android:padding="16dp"
		android:gravity="center_vertical"
		android:textAppearance="?android:attr/textAppearanceSmall" />

		@@ -204,7 +205,7 @@
		android:gravity="center_vertical"
		android:text="@string/about_libraries"
		android:textColor="?android:attr/textColorPrimary"
		android:textSize="34sp"/>
		android:textAppearance="?android:attr/textAppearanceLarge" />

		<android.support.v7.widget.RecyclerView
		android:id="@+id/libraries"

app/ui/src/main/res/layout/about_library.xml

+2 −4

Original line number	Diff line number	Diff line
		@@ -16,8 +16,7 @@
		android:layout_height="wrap_content"
		android:gravity="center_vertical"
		android:text="Test"
		android:textColor="?android:attr/textColorPrimary"
		android:textAppearance="?android:attr/textAppearanceMedium" />
		android:textColor="?android:attr/textColorPrimary" />

		<TextView
		android:id="@+id/license"
		@@ -28,6 +27,5 @@
		android:ellipsize="end"
		android:maxLines="1"
		android:text="Test"
		android:textColor="?android:attr/textColorSecondary"
		android:textAppearance="?android:attr/textAppearanceMedium" />
		android:textColor="?android:attr/textColorSecondary" />
		</LinearLayout>

app/ui/src/main/res/values-bg/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ K-9 Mail е мощен, безплатен имейл клиент за Андр
		<string name="import_dialog_error_message">Моля инсталирайте файлов менажер за да продължите с внасянето.</string>
		<string name="open_market">Отвори Play магазина</string>
		<!--=== General strings ==================================================================-->
		<string name="app_authors_fmt">Автори: <xliff:g id="app_authors">%s</xliff:g></string>
		<string name="authors">Автори</string>
		<string name="app_revision">Информация за версиите</string>
		<string name="app_libraries">Използваме следните библиотеки от трети страни: <xliff:g id="app_libraries_list">%s</xliff:g></string>
		<string name="read_messages_label">Прочитане на имейли</string>

app/ui/src/main/res/values-br/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ Danevellit beugoù, kenlabourit war keweriusterioù nevez ha savit goulennoù wa
		<string name="import_dialog_error_message">Staliit un ardoer restroù evit kenderc’hel gant an enporzhiañ.</string>
		<string name="open_market">Digeriñ ar Play Store</string>
		<!--=== General strings ==================================================================-->
		<string name="app_authors_fmt">Aozerien: <xliff:g id="app_authors">%s</xliff:g></string>
		<string name="authors">Aozerien</string>
		<string name="app_revision">TItouroù an handelv</string>
		<string name="app_libraries">Arverañ a reomp al levraouegoù da-heul: <xliff:g id="app_libraries_list">%s</xliff:g></string>
		<string name="read_messages_label">Lenn ar posteloù</string>

app/ui/src/main/res/values-ca/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ Si us plau, envieu informes d\'errors, contribuïu-hi amb noves millores i feu p
		<string name="import_dialog_error_message">Si us plau, instal·leu un gestor de fitxers per continuar aquesta importació.</string>
		<string name="open_market">Obre la Play Store</string>
		<!--=== General strings ==================================================================-->
		<string name="app_authors_fmt">Autors: <xliff:g id="app_authors">%s</xliff:g></string>
		<string name="authors">Autors</string>
		<string name="app_revision">Informació de la revisió</string>
		<string name="app_libraries">Fem servir les següents biblioteques de tercers: <xliff:g id="app_libraries_list">%s</xliff:g></string>
		<string name="read_messages_label">Llegeix els correus</string>