Skip to content

Commit 58408cf

Browse files
authored
Fixes commons-app#4297 - UI Issue: After changing the system theme from settings (commons-app#4332)
* fix UI issue after theme change * removed unnecessary changes Co-authored-by: Pratham2305 <Pratham2305@users.noreply.github.com>
1 parent 153e572 commit 58408cf

File tree

7 files changed

+19
-3
lines changed

7 files changed

+19
-3
lines changed

app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarkFragment.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import com.google.android.material.tabs.TabLayout;
1414

15+
import fr.free.nrw.commons.contributions.MainActivity;
1516
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
1617
import fr.free.nrw.commons.explore.ParentViewPager;
1718
import fr.free.nrw.commons.kvstore.JsonKvStore;
@@ -78,6 +79,10 @@ public View onCreateView(@NonNull final LayoutInflater inflater,
7879
applicationKvStore.getBoolean("login_skipped"));
7980
viewPager.setAdapter(adapter);
8081
tabLayout.setupWithViewPager(viewPager);
82+
83+
((MainActivity)getActivity()).showTabs();
84+
((BaseActivity) getActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(false);
85+
8186
setupTabLayout();
8287
return view;
8388
}

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,9 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
148148
if(shouldShowMediaDetailsFragment){
149149
showMediaDetailPagerFragment();
150150
}else{
151+
if (mediaDetailPagerFragment != null) {
152+
removeFragment(mediaDetailPagerFragment);
153+
}
151154
showContributionsListFragment();
152155
}
153156

app/src/main/java/fr/free/nrw/commons/explore/ExploreFragment.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import com.google.android.material.tabs.TabLayout;
1616
import fr.free.nrw.commons.R;
1717
import fr.free.nrw.commons.ViewPagerAdapter;
18+
import fr.free.nrw.commons.contributions.MainActivity;
1819
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
1920
import fr.free.nrw.commons.theme.BaseActivity;
2021
import fr.free.nrw.commons.utils.ActivityUtils;
@@ -87,6 +88,9 @@ public void setTabs() {
8788
fragmentList.add(mobileRootFragment);
8889
titleList.add(getString(R.string.explore_tab_title_mobile).toUpperCase());
8990

91+
((MainActivity)getActivity()).showTabs();
92+
((BaseActivity) getActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(false);
93+
9094
viewPagerAdapter.setTabData(fragmentList, titleList);
9195
viewPagerAdapter.notifyDataSetChanged();
9296
}

app/src/main/res/layout/fragment_bookmarks.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
android:id="@+id/viewPagerBookmarks"
3535
android:layout_width="match_parent"
3636
android:layout_height="match_parent"
37-
android:layout_below="@id/toolbar_layout" />
37+
android:layout_below="@id/toolbar_layout"
38+
android:background="?attr/mainBackground" />
3839

3940
</RelativeLayout>

app/src/main/res/layout/fragment_explore.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,6 @@
3434
android:id="@+id/viewPager"
3535
android:layout_width="match_parent"
3636
android:layout_height="match_parent"
37-
android:layout_below="@id/toolbar_layout" />
37+
android:layout_below="@id/toolbar_layout"
38+
android:background="?attr/mainBackground"/>
3839
</RelativeLayout>

app/src/main/res/layout/fragment_search_paginated.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
android:layout_width="match_parent"
44
android:layout_height="match_parent"
55
android:orientation="vertical"
6-
android:paddingTop="@dimen/tiny_gap">
6+
android:paddingTop="@dimen/tiny_gap"
7+
android:background="?attr/mainBackground">
78

89
<TextView
910
android:id="@+id/contentNotFound"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
android:layout_height="?attr/actionBarSize"
77
android:fitsSystemWindows="true"
88
app:titleTextColor="?attr/toolbar_text_color"
9+
android:background="?attr/mainBackground"
910
/>

0 commit comments

Comments
 (0)