Skip to content

Commit fd6c482

Browse files
domdomeggneslihanturan
domdomegg
authored and
neslihanturan
committed
Standardize includes of toolbar (commons-app#2646)
1 parent adf23c2 commit fd6c482

13 files changed

+17
-70
lines changed

‎app/src/main/res/layout/activity_about.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99
android:id="@+id/toolbarLayout"
1010
android:layout_width="wrap_content"
1111
android:layout_height="?attr/actionBarSize">
12-
<include
13-
android:id="@+id/toolbar"
14-
layout="@layout/toolbar"
15-
android:layout_width="match_parent"
16-
android:layout_height="?attr/actionBarSize" />
12+
<include layout="@layout/toolbar"/>
1713
</LinearLayout>
1814
<LinearLayout
1915
android:layout_width="wrap_content"

‎app/src/main/res/layout/activity_achievements.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99
android:id="@+id/toolbarLayout"
1010
android:layout_width="wrap_content"
1111
android:layout_height="?attr/actionBarSize">
12-
<include
13-
android:id="@+id/toolbar"
14-
layout="@layout/toolbar"
15-
android:layout_width="match_parent"
16-
android:layout_height="wrap_content" />
12+
<include layout="@layout/toolbar"/>
1713
</LinearLayout>
1814

1915
<LinearLayout

‎app/src/main/res/layout/activity_bookmarks.xml

+1-6
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,7 @@
99
android:layout_width="match_parent"
1010
android:layout_height="match_parent">
1111

12-
<include
13-
android:id="@+id/toolbar"
14-
layout="@layout/toolbar"
15-
android:layout_width="match_parent"
16-
android:layout_height="wrap_content"
17-
app:layout_scrollFlags="scroll" />
12+
<include layout="@layout/toolbar"/>
1813

1914
<com.google.android.material.tabs.TabLayout
2015
android:id="@+id/tab_layout"

‎app/src/main/res/layout/activity_category_details.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@
1515
android:layout_height="wrap_content"
1616
android:background="@color/primaryDarkColor">
1717

18-
<include
19-
android:id="@+id/toolbar"
20-
layout="@layout/toolbar"
21-
android:layout_width="match_parent"
22-
android:layout_height="wrap_content" />
18+
<include layout="@layout/toolbar"/>
2319

2420
<com.google.android.material.tabs.TabLayout
2521
android:id="@+id/tab_layout"

‎app/src/main/res/layout/activity_category_images.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@
88
<RelativeLayout
99
android:layout_width="match_parent"
1010
android:layout_height="match_parent">
11-
<include
12-
android:id="@+id/toolbar"
13-
layout="@layout/toolbar"
14-
android:layout_width="match_parent"
15-
android:layout_height="wrap_content" />
11+
<include layout="@layout/toolbar"/>
1612

1713
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
1814
android:layout_width="match_parent"

‎app/src/main/res/layout/activity_contributions.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@
1212
android:layout_height="match_parent"
1313
android:gravity="center_horizontal"
1414
>
15-
<include
16-
android:id="@+id/toolbar"
17-
layout="@layout/toolbar"
18-
android:layout_width="match_parent"
19-
android:layout_height="wrap_content" />
15+
<include layout="@layout/toolbar"/>
2016

2117
<com.google.android.material.tabs.TabLayout
2218
android:id="@+id/tab_layout"

‎app/src/main/res/layout/activity_explore.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@
1515
android:layout_height="wrap_content"
1616
android:background="@color/primaryDarkColor">
1717

18-
<include
19-
android:id="@+id/toolbar"
20-
layout="@layout/toolbar"
21-
android:layout_width="match_parent"
22-
android:layout_height="wrap_content" />
18+
<include layout="@layout/toolbar"/>
2319

2420
<com.google.android.material.tabs.TabLayout
2521
android:id="@+id/tab_layout"

‎app/src/main/res/layout/activity_notification.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@
1010
android:layout_width="match_parent"
1111
android:layout_height="match_parent">
1212

13-
<include
14-
android:id="@+id/toolbar"
15-
layout="@layout/toolbar"
16-
android:layout_width="match_parent"
17-
android:layout_height="wrap_content" />
13+
<include layout="@layout/toolbar"/>
1814

1915
<RelativeLayout
2016
android:id="@+id/container"

‎app/src/main/res/layout/activity_quiz.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@
1111
android:layout_height="match_parent"
1212
android:orientation="vertical">
1313

14-
<include
15-
android:id="@+id/toolbar"
16-
layout="@layout/toolbar"
17-
android:layout_width="match_parent"
18-
android:layout_height="wrap_content" />
14+
<include layout="@layout/toolbar"/>
1915

2016
<androidx.cardview.widget.CardView
2117
android:layout_width="match_parent"

‎app/src/main/res/layout/activity_quiz_result.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
android:orientation="vertical"
66
android:layout_width="match_parent">
77

8-
<include
9-
android:id="@+id/toolbar"
10-
layout="@layout/toolbar"
11-
android:layout_width="match_parent"
12-
android:layout_height="wrap_content" />
8+
<include layout="@layout/toolbar"/>
139

1410
<androidx.cardview.widget.CardView
1511
android:layout_height="match_parent"

‎app/src/main/res/layout/activity_search.xml

+2-6
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,8 @@
1515
android:layout_height="wrap_content">
1616

1717
<!-- Toolbar for viewing media -->
18-
<include
19-
android:visibility="gone"
20-
android:id="@+id/toolbar"
21-
layout="@layout/toolbar"
22-
android:layout_width="match_parent"
23-
android:layout_height="wrap_content" />
18+
<include layout="@layout/toolbar"
19+
android:visibility="gone" />
2420

2521
<!--Toolbar containing search bar -->
2622
<androidx.appcompat.widget.Toolbar

‎app/src/main/res/layout/activity_settings.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@
1010
android:id="@+id/toolbarLayout"
1111
android:layout_width="wrap_content"
1212
android:layout_height="?attr/actionBarSize">
13-
<include
14-
android:id="@+id/toolbar"
15-
layout="@layout/toolbar"
16-
android:layout_width="match_parent"
17-
android:layout_height="?attr/actionBarSize" />
13+
<include layout="@layout/toolbar" />
1814
</LinearLayout>
1915

2016
<RelativeLayout

‎app/src/main/res/layout/toolbar.xml

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<androidx.appcompat.widget.Toolbar
3-
xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
43
xmlns:app="http://schemas.android.com/apk/res-auto"
54
android:id="@+id/toolbar"
6-
android:layout_height="wrap_content"
75
android:layout_width="match_parent"
6+
android:layout_height="?attr/actionBarSize"
7+
android:background="?attr/colorPrimaryDark"
88
android:fitsSystemWindows="true"
9-
android:minHeight="?attr/actionBarSize"
10-
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
11-
android:background="?attr/colorPrimaryDark">
12-
13-
</androidx.appcompat.widget.Toolbar>
9+
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />

0 commit comments

Comments
 (0)