[Style] - Refactor: use common search styles where possible

art-institute-of-chicago · Oct 19, 2018 · 6e8eafe · 6e8eafe
1 parent 6c81686
commit 6e8eafe
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 77 deletions.
diff --git a/access_card/src/main/res/layout/fragment_validate_member_information.xml b/access_card/src/main/res/layout/fragment_validate_member_information.xml
@@ -27,14 +27,9 @@
                 android:background="?attr/colorPrimary">
 
                 <ImageView
-                    android:contentDescription="@string/search"
                     android:id="@+id/searchIcon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:layout_marginEnd="@dimen/marginTwenty"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/ic_search_24dp" />
+                    style="@style/Search.SubScreen"
+                    />
 
             </android.support.v7.widget.Toolbar>
         </android.support.design.widget.AppBarLayout>

diff --git a/audio/src/main/res/layout/fragment_audio_lookup.xml b/audio/src/main/res/layout/fragment_audio_lookup.xml
@@ -10,20 +10,13 @@
     >
 
     <ImageView
-        android:contentDescription="@string/search"
         android:id="@+id/searchIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
         android:layout_marginTop="11dp"
-        android:layout_marginEnd="@dimen/marginTwenty"
-        android:background="@drawable/ic_search_background"
-        android:scaleType="centerCrop"
-        android:src="@drawable/ic_search_24dp"
         app:layout_constrainedHeight="true"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        style="@style/Search.PrimaryScreen"
         />
 
 

diff --git a/events/src/main/res/layout/fragment_all_events.xml b/events/src/main/res/layout/fragment_all_events.xml
@@ -21,14 +21,8 @@
 
         <ImageView
             android:id="@+id/searchIcon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginEnd="@dimen/marginTwenty"
-            android:background="@null"
-            android:scaleType="centerCrop"
-            android:contentDescription="@string/search"
-            android:src="@drawable/ic_search_24dp" />
+            style="@style/Search.SubScreen"
+            />
 
     </android.support.v7.widget.Toolbar>
 

diff --git a/exhibitions/src/main/res/layout/fragment_all_exhibitions.xml b/exhibitions/src/main/res/layout/fragment_all_exhibitions.xml
@@ -21,14 +21,8 @@
 
         <ImageView
             android:id="@+id/searchIcon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginEnd="@dimen/marginTwenty"
-            android:background="@null"
-            android:scaleType="centerCrop"
-            android:contentDescription="@string/search"
-            android:src="@drawable/ic_search_24dp" />
+            style="@style/Search.SubScreen"
+            />
 
     </android.support.v7.widget.Toolbar>
 

diff --git a/info/src/main/res/layout/fragment_museum_information.xml b/info/src/main/res/layout/fragment_museum_information.xml
@@ -28,13 +28,8 @@
 
                 <ImageView
                     android:id="@+id/searchIcon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:layout_marginEnd="@dimen/marginTwenty"
-                    android:contentDescription="@string/search"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/ic_search_24dp" />
+                    style="@style/Search.SubScreen"
+                    />
 
             </android.support.v7.widget.Toolbar>
         </android.support.design.widget.AppBarLayout>

diff --git a/localization_ui/src/main/res/layout/fragment_language_settings.xml b/localization_ui/src/main/res/layout/fragment_language_settings.xml
@@ -21,13 +21,8 @@
 
             <ImageView
                 android:id="@+id/searchIcon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_marginEnd="@dimen/marginTwenty"
-                android:contentDescription="@string/search"
-                android:scaleType="centerCrop"
-                android:src="@drawable/ic_search_24dp" />
+                style="@style/Search.SubScreen"
+                />
 
         </android.support.v7.widget.Toolbar>
     </android.support.design.widget.AppBarLayout>

diff --git a/location_ui/src/main/res/layout/fragment_location_settings.xml b/location_ui/src/main/res/layout/fragment_location_settings.xml
@@ -24,13 +24,8 @@
 
             <ImageView
                 android:id="@+id/searchIcon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_marginEnd="@dimen/marginTwenty"
-                android:contentDescription="@string/search"
-                android:scaleType="centerCrop"
-                android:src="@drawable/ic_search_24dp" />
+                style="@style/Search.SubScreen"
+                />
 
         </android.support.v7.widget.Toolbar>
     </android.support.design.widget.AppBarLayout>
@@ -48,7 +43,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/appBar"
-        tools:text="Where Are You?" />
+        />
 
     <View
         android:id="@+id/divider"
@@ -74,7 +69,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/divider"
-        tools:text="We’d like to use your location to help you navigate the museum." />
+        />
 
     <Button
         android:id="@+id/locationSettingsButton"

diff --git a/map/src/main/res/layout/fragment_map.xml b/map/src/main/res/layout/fragment_map.xml
@@ -126,16 +126,11 @@
 
     <ImageView
         android:id="@+id/searchIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/marginTwenty"
         android:layout_marginTop="@dimen/statusBarHeightPlus10"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:background="@drawable/ic_search_background"
-        android:scaleType="centerCrop"
-        android:contentDescription="@string/search"
-        android:src="@drawable/ic_search_24dp"/>
+        style="@style/Search.PrimaryScreen"
+        />
 
     <FrameLayout
         android:id="@+id/infocontainer"

diff --git a/tours/src/main/res/layout/fragment_all_tours.xml b/tours/src/main/res/layout/fragment_all_tours.xml
@@ -21,14 +21,8 @@
 
         <ImageView
             android:id="@+id/searchIcon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginEnd="@dimen/marginTwenty"
-            android:background="@null"
-            android:scaleType="centerCrop"
-            android:contentDescription="@string/search"
-            android:src="@drawable/ic_search_24dp" />
+            style="@style/Search.SubScreen"
+            />
 
     </android.support.v7.widget.Toolbar>
 

diff --git a/ui/src/main/res/layout/view_app_bar_layout.xml b/ui/src/main/res/layout/view_app_bar_layout.xml
@@ -87,14 +87,8 @@
 
             <ImageView
                 android:id="@+id/searchIcon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_marginEnd="@dimen/marginTwenty"
-                android:background="@drawable/ic_search_background"
-                android:scaleType="centerCrop"
-                android:contentDescription="@string/search"
-                android:src="@drawable/ic_search_24dp" />
+                style="@style/Search.PrimaryScreen"
+                />
 
         </android.support.v7.widget.Toolbar>