jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/394454 )
Change subject: Update text colors in About activity. ...................................................................... Update text colors in About activity. Bug: T181640 Change-Id: Ib9ce17b368aa6bfca0632940cd8b81a259ce6114 --- M app/src/main/res/layout/activity_about.xml 1 file changed, 110 insertions(+), 115 deletions(-) Approvals: Dbrant: Looks good to me, approved jenkins-bot: Verified diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 0b1532e..d1b595b 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -1,141 +1,136 @@ <?xml version="1.0" encoding="utf-8"?> <ScrollView - xmlns:android="http://schemas.android.com/apk/res/android"; - xmlns:app="http://schemas.android.com/apk/res-auto"; - xmlns:tools="http://schemas.android.com/tools"; - android:id="@+id/about_scrollview" - android:layout_width="match_parent" - android:layout_height="match_parent"> + xmlns:android="http://schemas.android.com/apk/res/android"; + xmlns:app="http://schemas.android.com/apk/res-auto"; + xmlns:tools="http://schemas.android.com/tools"; + android:id="@+id/about_scrollview" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <LinearLayout - android:id="@+id/about_container" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="24dp" - android:gravity="center" - > + android:id="@+id/about_container" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="24dp" + android:gravity="center"> + <ImageView android:id="@+id/about_logo_image" android:layout_width="48dp" android:layout_height="48dp" android:src="@drawable/w_nav_mark" android:tint="?attr/primary_text_color" - android:contentDescription="@null" + android:contentDescription="@null" /> - /> - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center_vertical" - android:layout_marginBottom="8dp" - android:orientation="vertical"> - <ImageView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:src="@drawable/wp_wordmark" - android:tint="@color/base30" - android:contentDescription="@null" - /> - <TextView android:id="@+id/about_version_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - tools:text="2.x-sample-version" - style="?android:textAppearanceSmall" - android:textIsSelectable="true" - android:textColor="#888" - /> - </LinearLayout> + <ImageView + android:layout_width="128dp" + android:layout_height="wrap_content" + android:src="@drawable/wp_wordmark" + android:tint="?attr/primary_text_color" + android:contentDescription="@null" /> + + <TextView android:id="@+id/about_version_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + tools:text="2.x-sample-version" + style="?android:textAppearanceSmall" + android:textIsSelectable="true" + android:textColor="?attr/primary_text_color" /> <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" - style="?android:textAppearanceSmall" - android:text="@string/about_contributors_heading" /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + style="?android:textAppearanceSmall" + android:textColor="?attr/primary_text_color" + android:text="@string/about_contributors_heading" /> + <org.wikipedia.views.AppTextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layoutDirection="ltr" - android:text="@string/contributors_list" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textIsSelectable="true" - android:lineSpacingMultiplier="1.2" - android:textColor="#555" - android:layout_marginBottom="8dp" - /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layoutDirection="ltr" + android:text="@string/contributors_list" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textIsSelectable="true" + android:lineSpacingMultiplier="1.2" + android:textColor="?attr/secondary_text_color" + android:layout_marginBottom="8dp" /> <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" - style="?android:textAppearanceSmall" - android:text="@string/about_translators_heading" /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + style="?android:textAppearanceSmall" + android:textColor="?attr/primary_text_color" + android:text="@string/about_translators_heading" /> + <org.wikipedia.views.AppTextView - android:id="@+id/about_translators" - android:layout_width="match_parent" - android:layout_height="wrap_content" - style="@style/RtlAwareTextView" - android:text="@string/about_translators_translatewiki" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textIsSelectable="true" - android:lineSpacingMultiplier="1.2" - android:textColor="#555" - android:layout_marginBottom="8dp" - /> + android:id="@+id/about_translators" + android:layout_width="match_parent" + android:layout_height="wrap_content" + style="@style/RtlAwareTextView" + android:text="@string/about_translators_translatewiki" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textIsSelectable="true" + android:lineSpacingMultiplier="1.2" + android:textColor="?attr/secondary_text_color" + android:layout_marginBottom="8dp" /> <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - style="?android:textAppearanceSmall" - android:text="@string/about_libraries_heading" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + style="?android:textAppearanceSmall" + android:textColor="?attr/primary_text_color" + android:text="@string/about_libraries_heading" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" /> + <org.wikipedia.views.AppTextView - android:id="@+id/activity_about_libraries" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layoutDirection="ltr" - android:text="@string/libraries_list" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textIsSelectable="true" - android:lineSpacingMultiplier="1.2" - android:textColor="#555" - android:layout_marginBottom="8dp" - /> + android:id="@+id/activity_about_libraries" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layoutDirection="ltr" + android:text="@string/libraries_list" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textIsSelectable="true" + android:lineSpacingMultiplier="1.2" + android:textColor="?attr/secondary_text_color" + android:layout_marginBottom="8dp" /> <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - style="?android:textAppearanceSmall" - android:text="@string/about_app_license_heading" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + style="?android:textAppearanceSmall" + android:textColor="?attr/primary_text_color" + android:text="@string/about_app_license_heading" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" /> + <org.wikipedia.views.AppTextView - android:id="@+id/about_app_license" - android:layout_width="match_parent" - android:layout_height="wrap_content" - style="@style/RtlAwareTextView" - android:text="@string/about_app_license" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textIsSelectable="true" - android:lineSpacingMultiplier="1.2" - android:textColor="#555" - android:layout_marginBottom="8dp" - /> + android:id="@+id/about_app_license" + android:layout_width="match_parent" + android:layout_height="wrap_content" + style="@style/RtlAwareTextView" + android:text="@string/about_app_license" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textIsSelectable="true" + android:lineSpacingMultiplier="1.2" + android:textColor="?attr/secondary_text_color" + android:layout_marginBottom="8dp" /> <TextView - android:id="@+id/send_feedback_text" - android:layout_width="match_parent" - android:layout_height="wrap_content" - tools:text="@string/send_feedback" - style="?android:textAppearanceMedium" - android:textColor="#555" - android:layout_marginTop="32dp" - android:layout_marginBottom="8dp" - /> + android:id="@+id/send_feedback_text" + android:layout_width="match_parent" + android:layout_height="wrap_content" + tools:text="@string/send_feedback" + style="?android:textAppearanceMedium" + android:layout_marginTop="32dp" + android:layout_marginBottom="8dp" /> <View android:layout_width="match_parent" @@ -150,7 +145,7 @@ android:layout_margin="12dp" android:padding="4dp" app:srcCompat="@drawable/ic_wmf_logo" - android:tint="@color/base30" + android:tint="?attr/secondary_text_color" android:contentDescription="@null" /> <org.wikipedia.views.AppTextView @@ -161,7 +156,7 @@ style="?android:textAppearanceSmall" android:textIsSelectable="true" android:layout_weight="1" - android:textColor="#555" /> + android:textColor="?attr/secondary_text_color" /> </LinearLayout> </ScrollView> -- To view, visit https://gerrit.wikimedia.org/r/394454 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib9ce17b368aa6bfca0632940cd8b81a259ce6114 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant <[email protected]> Gerrit-Reviewer: Brion VIBBER <[email protected]> Gerrit-Reviewer: Cooltey <[email protected]> Gerrit-Reviewer: Dbrant <[email protected]> Gerrit-Reviewer: Sharvaniharan <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
