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

Fix #2186: Standardize tab theming across app, and fix related night mode issues (#2227)

Browse source
This commit is contained in:
Tim Borisenko 2019-03-15 12:48:18 -07:00 • committed by Adam Jones
parent 2dc2e32d87
commit b46ea0aba8
8 changed files with 37 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarksActivity.java
View file

@ -30,7 +30,7 @@ public class BookmarksActivity extends NavigationBaseActivity
private MediaDetailPagerFragment mediaDetails;
@BindView(R.id.viewPagerBookmarks)
ViewPager viewPager;
@BindView(R.id.tabLayoutBookmarks)
@BindView(R.id.tab_layout)
TabLayout tabLayout;
@Inject

2
app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsActivity.java
View file

@ -46,7 +46,7 @@ public class CategoryDetailsActivity extends NavigationBaseActivity
private MediaDetailPagerFragment mediaDetails;
private String categoryName;
@BindView(R.id.mediaContainer) FrameLayout mediaContainer;
@BindView(R.id.tabLayout) TabLayout tabLayout;
@BindView(R.id.tab_layout) TabLayout tabLayout;
@BindView(R.id.viewPager) ViewPager viewPager;
ViewPagerAdapter viewPagerAdapter;

2
app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java
View file

@ -42,7 +42,7 @@ public class SearchActivity extends NavigationBaseActivity implements MediaDetai
@BindView(R.id.searchHistoryContainer) FrameLayout searchHistoryContainer;
@BindView(R.id.mediaContainer) FrameLayout mediaContainer;
@BindView(R.id.searchBox) SearchView searchView;
@BindView(R.id.tabLayout) TabLayout tabLayout;
@BindView(R.id.tab_layout) TabLayout tabLayout;
@BindView(R.id.viewPager) ViewPager viewPager;
private SearchImageFragment searchImageFragment;

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

@ -17,12 +17,15 @@
app:layout_scrollFlags="scroll" />
<android.support.design.widget.TabLayout
android:id="@+id/tabLayoutBookmarks"
android:layout_width="0dp"
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/toolbar" />
android:background="?attr/tabBackground"
app:layout_constraintTop_toBottomOf="@id/toolbar"
app:tabIndicatorColor="?attr/tabIndicatorColor"
app:tabMode="fixed"
app:tabSelectedTextColor="?attr/tabSelectedTextColor"
app:tabTextColor="?attr/tabTextColor" />
<android.support.v4.view.ViewPager
android:id="@+id/viewPagerBookmarks"
@ -32,7 +35,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tabLayoutBookmarks" />
app:layout_constraintTop_toBottomOf="@id/tab_layout" />
<FrameLayout
android:id="@+id/fragmentContainer"

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

@ -21,13 +21,14 @@
android:layout_height="wrap_content" />
<android.support.design.widget.TabLayout
android:id="@+id/tabLayout"
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:tabTextAppearance="@android:style/TextAppearance.Widget.TabWidget"
android:background="?attr/tabBackground"
app:tabIndicatorColor="?attr/tabIndicatorColor"
app:tabSelectedTextColor="?attr/tabSelectedTextColor"
app:tabTextColor="?attr/tabTextColor"
app:tabMode="scrollable"
app:tabSelectedTextColor="@color/white"
app:tabTextColor="@color/opak_middle_grey"
android:layout_below="@id/toolbar"
/>
</android.support.design.widget.AppBarLayout>

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

@ -22,15 +22,12 @@
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:tabMaxWidth="0dp"
app:tabGravity="fill"
app:tabMode="fixed"
android:layout_below="@+id/toolbar"
android:elevation="6dp"
android:minHeight="?attr/actionBarSize"
app:tabIndicatorColor="@android:color/white"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
android:background="?attr/mainTabBackground"/>
android:background="?attr/tabBackground"
app:tabIndicatorColor="?attr/tabIndicatorColor"
app:tabSelectedTextColor="?attr/tabSelectedTextColor"
app:tabTextColor="?attr/tabTextColor"
android:layout_below="@id/toolbar"
app:tabMode="fixed" />
<FrameLayout android:layout_width="match_parent"
android:layout_height="match_parent"

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

@ -50,16 +50,16 @@
/>
</android.support.v7.widget.Toolbar>
<android.support.design.widget.TabLayout
android:id="@+id/tabLayout"
android:visibility="gone"
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:tabTextAppearance="@android:style/TextAppearance.Widget.TabWidget"
android:background="@color/item_white_background"
android:background="?attr/tabBackground"
app:tabIndicatorColor="?attr/tabIndicatorColor"
app:tabSelectedTextColor="?attr/tabSelectedTextColor"
app:tabTextColor="?attr/tabTextColor"
app:tabMode="scrollable"
app:tabSelectedTextColor="@color/primaryColor"
app:tabTextColor="@color/button_background_dark"
android:layout_below="@id/toolbar_search"
android:visibility="gone"
/>
</android.support.design.widget.AppBarLayout>
<FrameLayout

10
app/src/main/res/values/styles.xml
View file

@ -2,7 +2,10 @@
<style name="DarkAppTheme" parent="Theme.AppCompat.NoActionBar">
<item name="contributionsListBackground">@color/contributionListDarkBackground</item>
<item name="mainTabBackground">@color/contributionListDarkBackground</item>
<item name="tabBackground">@color/contributionListDarkBackground</item>
<item name="tabIndicatorColor">@color/white</item>
<item name="tabSelectedTextColor">@color/white</item>
<item name="tabTextColor">@color/white</item>
<item name="mainBackground">@color/main_background_dark</item>
<item name="achievementBackground">@color/achievement_background_dark</item>
<item name="drawerHeaderBackground">@color/drawerHeader_background_dark</item>
@ -33,7 +36,10 @@
<style name="LightAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="contributionsListBackground">@color/white</item>
<item name="mainTabBackground">@color/primaryColor</item>
<item name="tabBackground">@color/primaryColor</item>
<item name="tabIndicatorColor">@color/white</item>
<item name="tabSelectedTextColor">@color/white</item>
<item name="tabTextColor">@color/white</item>
<item name="mainBackground">@color/main_background_light</item>
<item name="achievementBackground">@color/achievement_background_light</item>
<item name="drawerHeaderBackground">@color/drawerHeader_background_light</item>