BearND has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223235
Change subject: Hygiene: Remove useless parent layout in featured page widget
......................................................................
Hygiene: Remove useless parent layout in featured page widget
Lint warning:
../../res/layout/widget_featured_page.xml:25: This LinearLayout layout or its
FrameLayout parent is useless; transfer the background attribute to the other
view
Change-Id: Ie3fc706168b8cde9aea21766290ed8aef7aa13b5
---
M wikipedia/res/layout/activity_page.xml
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
M wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
3 files changed, 32 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/35/223235/1
diff --git a/wikipedia/res/layout/activity_page.xml
b/wikipedia/res/layout/activity_page.xml
index 7e9f29f..ca4ea9a 100644
--- a/wikipedia/res/layout/activity_page.xml
+++ b/wikipedia/res/layout/activity_page.xml
@@ -70,30 +70,32 @@
android:id="@+id/main_toolbar_inner_container"
android:layout_width="match_parent"
android:layout_height="match_parent">
- <LinearLayout
- android:id="@+id/main_search_bar"
- android:layout_width="match_parent"
- android:layout_height="36dp"
- android:orientation="horizontal"
- android:layout_gravity="center_vertical"
- android:layout_marginLeft="4dp"
- android:layout_marginRight="4dp"
- android:paddingLeft="6dp"
- android:paddingRight="6dp">
- <ImageView
- android:id="@+id/main_search_bar_icon"
- android:layout_width="24dp"
- android:layout_height="24dp"
- android:layout_gravity="center_vertical"
-
android:contentDescription="@string/search_hint"
- android:src="@drawable/ic_search"/>
+ <!--<LinearLayout-->
+ <!--android:id="@+id/main_search_bar"-->
+ <!--android:layout_width="match_parent"-->
+ <!--android:layout_height="36dp"-->
+ <!--android:orientation="horizontal"-->
+ <!--android:layout_gravity="center_vertical"-->
+ <!--android:layout_marginLeft="4dp"-->
+ <!--android:layout_marginRight="4dp"-->
+ <!--android:paddingLeft="6dp"-->
+ <!--android:paddingRight="6dp">-->
+ <!--<ImageView-->
+
<!--android:id="@+id/main_search_bar_icon"-->
+ <!--android:layout_width="24dp"-->
+ <!--android:layout_height="24dp"-->
+
<!--android:layout_gravity="center_vertical"-->
+
<!--android:contentDescription="@string/search_hint"-->
+ <!--android:src="@drawable/ic_search"/>-->
<TextView
android:id="@+id/main_search_bar_text"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:paddingLeft="4dp"
- android:paddingRight="4dp"
- android:gravity="center"
+ android:layout_width="match_parent"
+ android:layout_height="36dp"
+ android:layout_marginLeft="4dp"
+ android:layout_marginRight="4dp"
+ android:paddingLeft="10dp"
+ android:paddingRight="10dp"
+ android:gravity="center_vertical"
android:text="@string/search_hint"
android:textColor="@android:color/white"
android:textSize="@dimen/searchTextSize"
@@ -103,8 +105,11 @@
android:shadowDx="1"
android:shadowDy="1"
android:shadowRadius="2"
- android:layout_gravity="center_vertical"/>
- </LinearLayout>
+ android:layout_gravity="center_vertical"
+ android:drawableLeft="@drawable/ic_search"
+ android:drawableStart="@drawable/ic_search"
+ />
+ <!--</LinearLayout>-->
<LinearLayout
android:id="@+id/search_bar_enabled"
android:layout_width="match_parent"
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index 0224da4..5d58405 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -175,7 +175,7 @@
progressBar.setMax(PROGRESS_BAR_MAX_VALUE);
updateProgressBar(false, true, 0);
- findViewById(R.id.main_search_bar).setOnClickListener(new
View.OnClickListener() {
+ searchHintText.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
searchFragment.openSearch();
diff --git
a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
index a2f9791..384a39d 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
@@ -284,7 +284,7 @@
private void setSearchViewEnabled(boolean enabled) {
LinearLayout enabledSearchBar = (LinearLayout)
getActivity().findViewById(R.id.search_bar_enabled);
- View searchButton = getActivity().findViewById(R.id.main_search_bar);
+ TextView searchButton = (TextView)
getActivity().findViewById(R.id.main_search_bar_text);
langButton = (Button)
getActivity().findViewById(R.id.search_lang_button);
if (enabled) {
@@ -319,8 +319,7 @@
.findViewById(android.support.v7.appcompat.R.id.search_src_text);
// make the text size be the same as the size of the search
field
// placeholder in the main activity
- searchEditText.setTextSize(TypedValue.COMPLEX_UNIT_PX,
((TextView) getActivity()
-
.findViewById(R.id.main_search_bar_text)).getTextSize());
+ searchEditText.setTextSize(TypedValue.COMPLEX_UNIT_PX,
searchButton.getTextSize());
// reset its background
searchEditText.setBackgroundColor(Color.TRANSPARENT);
// make the search frame match_parent
--
To view, visit https://gerrit.wikimedia.org/r/223235
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3fc706168b8cde9aea21766290ed8aef7aa13b5
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND <bsitzm...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
