mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Standardize includes of toolbar (#2646)

Browse source
This commit is contained in:
Adam Jones 2019-03-19 14:54:22 +00:00 • committed by neslihanturan
parent adf23c257f
commit fd6c4821aa
13 changed files with 17 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/res/layout/activity_about.xml
View file

@ -9,11 +9,7 @@
android:id="@+id/toolbarLayout"
android:layout_width="wrap_content"
android:layout_height="?attr/actionBarSize">
<include
android:id="@+id/toolbar"
layout="@layout/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" />
<include layout="@layout/toolbar"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"

6
app/src/main/res/layout/activity_achievements.xml
View file

@ -9,11 +9,7 @@
android:id="@+id/toolbarLayout"
android:layout_width="wrap_content"
android:layout_height="?attr/actionBarSize">
<include
android:id="@+id/toolbar"
layout="@layout/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<include layout="@layout/toolbar"/>
</LinearLayout>
<LinearLayout

7
app/src/main/res/layout/activity_bookmarks.xml
View file

@ -9,12 +9,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<include
android:id="@+id/toolbar"
layout="@layout/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_scrollFlags="scroll" />
<include layout="@layout/toolbar"/>
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_layout"

6
app/src/main/res/layout/activity_category_details.xml
View file

@ -15,11 +15,7 @@
android:layout_height="wrap_content"
android:background="@color/primaryDarkColor">
<include
android:id="@+id/toolbar"
layout="@layout/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<include layout="@layout/toolbar"/>
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_layout"

6
app/src/main/res/layout/activity_category_images.xml
View file

@ -8,11 +8,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<include
android:id="@+id/toolbar"
layout="@layout/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<include layout="@layout/toolbar"/>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"

6
app/src/main/res/layout/activity_contributions.xml
View file

@ -12,11 +12,7 @@
android:layout_height="match_parent"
android:gravity="center_horizontal"
>
<include
android:id="@+id/toolbar"
layout="@layout/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<include layout="@layout/toolbar"/>
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_layout"

6
app/src/main/res/layout/activity_explore.xml
View file

@ -15,11 +15,7 @@
android:layout_height="wrap_content"
android:background="@color/primaryDarkColor">
<include
android:id="@+id/toolbar"
layout="@layout/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<include layout="@layout/toolbar"/>
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_layout"

6
app/src/main/res/layout/activity_notification.xml
View file

@ -10,11 +10,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<include
android:id="@+id/toolbar"
layout="@layout/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<include layout="@layout/toolbar"/>
<RelativeLayout
android:id="@+id/container"

6
app/src/main/res/layout/activity_quiz.xml
View file

@ -11,11 +11,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<include
android:id="@+id/toolbar"
layout="@layout/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<include layout="@layout/toolbar"/>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"

6
app/src/main/res/layout/activity_quiz_result.xml
View file

@ -5,11 +5,7 @@
android:orientation="vertical"
android:layout_width="match_parent">
<include
android:id="@+id/toolbar"
layout="@layout/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<include layout="@layout/toolbar"/>
<androidx.cardview.widget.CardView
android:layout_height="match_parent"

8
app/src/main/res/layout/activity_search.xml
View file

@ -15,12 +15,8 @@
android:layout_height="wrap_content">
<!-- Toolbar for viewing media -->
<include
android:visibility="gone"
android:id="@+id/toolbar"
layout="@layout/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<include layout="@layout/toolbar"
android:visibility="gone" />
<!--Toolbar containing search bar -->
<androidx.appcompat.widget.Toolbar

6
app/src/main/res/layout/activity_settings.xml
View file

@ -10,11 +10,7 @@
android:id="@+id/toolbarLayout"
android:layout_width="wrap_content"
android:layout_height="?attr/actionBarSize">
<include
android:id="@+id/toolbar"
layout="@layout/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" />
<include layout="@layout/toolbar" />
</LinearLayout>
<RelativeLayout

12
app/src/main/res/layout/toolbar.xml
View file

@ -1,13 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.appcompat.widget.Toolbar
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/toolbar"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimaryDark"
android:fitsSystemWindows="true"
android:minHeight="?attr/actionBarSize"
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
android:background="?attr/colorPrimaryDark">
</androidx.appcompat.widget.Toolbar>
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />