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

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

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

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>

2
app/src/main/res/values/attrs.xml
View file

@ -51,6 +51,8 @@
<attr name="custom_selector_done" format="reference"/> <attr name="custom_selector_done" format="reference"/>
<attr name="custom_selector_back" format="reference"/> <attr name="custom_selector_back" format="reference"/>
<attr name="caption_description_text_color" format="reference" /> <attr name="caption_description_text_color" format="reference" />
<attr name="custom_selector_done" format="reference"/>
<attr name="custom_selector_back" format="reference"/>
<declare-styleable name="Badge"> <declare-styleable name="Badge">
<attr name="boundary" format="color"/> <attr name="boundary" format="color"/>

15
app/src/main/res/values/strings.xml
View file

@ -640,13 +640,6 @@ Upload your first media by tapping on the add button.</string>
The shadow of the image view of the location picker</string> The shadow of the image view of the location picker</string>
<string name="image_location">Image Location</string> <string name="image_location">Image Location</string>
<string name="check_whether_location_is_correct">Check whether location is correct</string> <string name="check_whether_location_is_correct">Check whether location is correct</string>
<string name="place_state_wlm">WLM</string>
<string name="wlm_upload_info">You are contributing to Wiki Loves Monuments Campaign. Related templates will be added accordingly.</string>
<string name="display_monuments">Display monuments</string>
<string name="wlm_month_message">It\'s Wiki Loves Monuments month!</string>
<string name="learn_more">LEARN MORE</string>
<string name="wlm_campaign_title">Wiki Loves Monuments</string>
<string name="wlm_campaign_description">Wiki Loves Monuments is an international photo contest for monuments organised by Wikimedia</string>
<string name="custom_selector_title">Custom Selector</string> <string name="custom_selector_title">Custom Selector</string>
<string name="custom_selector_empty_text">No Images</string> <string name="custom_selector_empty_text">No Images</string>
<string name="done">Done</string> <string name="done">Done</string>
@ -656,5 +649,11 @@ Upload your first media by tapping on the add button.</string>
<string name="custom_selector_info_text2">Unlike the picture on the left, the picture on the right has the Commons logo indicating it is already uploaded.</string> <string name="custom_selector_info_text2">Unlike the picture on the left, the picture on the right has the Commons logo indicating it is already uploaded.</string>
<string name="welcome_custom_selector_ok">Awesome</string> <string name="welcome_custom_selector_ok">Awesome</string>
<string name="custom_selector_already_uploaded_image_text">This image has already been uploaded to Commons.</string> <string name="custom_selector_already_uploaded_image_text">This image has already been uploaded to Commons.</string>
<string name="place_state_wlm">WLM</string>
<string name="wlm_upload_info">You are contributing to Wiki Loves Monuments Campaign. Related templates will be added accordingly.</string>
<string name="display_monuments">Display monuments</string>
<string name="wlm_month_message">It\'s Wiki Loves Monuments month!</string>
<string name="learn_more">LEARN MORE</string>
<string name="wlm_campaign_title">Wiki Loves Monuments</string>
<string name="wlm_campaign_description">Wiki Loves Monuments is an international photo contest for monuments organised by Wikimedia</string>
</resources> </resources>