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

Merge branch 'gsoc21-custom-picture-selector' into master-update

Browse source
This commit is contained in:
Aditya-Srivastav 2021-08-09 16:45:26 +05:30 • committed by GitHub
commit 3c18b1e9d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

36
app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
View file

@ -57,25 +57,25 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment impl
private static final String RV_STATE = "rv_scroll_state"; private static final String RV_STATE = "rv_scroll_state";
@BindView(R.id.contributionsList) @BindView(R.id.contributionsList)
RecyclerView rvContributionsList; RecyclerView rvContributionsList;
@BindView(R.id.loadingContributionsProgressBar) @BindView(R.id.loadingContributionsProgressBar)
ProgressBar progressBar; ProgressBar progressBar;
@BindView(R.id.fab_plus) @BindView(R.id.fab_plus)
FloatingActionButton fabPlus; FloatingActionButton fabPlus;
@BindView(R.id.fab_camera) @BindView(R.id.fab_camera)
FloatingActionButton fabCamera; FloatingActionButton fabCamera;
@BindView(R.id.fab_gallery) @BindView(R.id.fab_gallery)
FloatingActionButton fabGallery; FloatingActionButton fabGallery;
@BindView(R.id.noContributionsYet) @BindView(R.id.noContributionsYet)
TextView noContributionsYet; TextView noContributionsYet;
@BindView(R.id.fab_layout) @BindView(R.id.fab_layout)
LinearLayout fab_layout; LinearLayout fab_layout;
@BindView(R.id.fab_custom_gallery) @BindView(R.id.fab_custom_gallery)
FloatingActionButton fabCustomGallery; FloatingActionButton fabCustomGallery;
@Inject @Inject
SystemThemeUtils systemThemeUtils; SystemThemeUtils systemThemeUtils;
@Inject @Inject
ContributionController controller; ContributionController controller;

1
app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
View file

@ -102,6 +102,7 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple
pager.addOnPageChangeListener(this); pager.addOnPageChangeListener(this);
adapter = new MediaDetailAdapter(getChildFragmentManager()); adapter = new MediaDetailAdapter(getChildFragmentManager());
((BaseActivity)getActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(true);
if (getActivity() != null) { if (getActivity() != null) {
final ActionBar actionBar = ((AppCompatActivity) getActivity()).getSupportActionBar(); final ActionBar actionBar = ((AppCompatActivity) getActivity()).getSupportActionBar();

1
app/src/main/res/layout/bottom_container_location_picker.xml
View file

@ -77,5 +77,4 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>