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

Merge pull request #418 from maskaravivek/mobileView

Browse source 
Fixes #417: Open mobile view of Commons
This commit is contained in:
Josephine Lim 2017-03-10 16:36:54 +10:00 • committed by GitHub
commit a611cd0d73
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -59,6 +59,7 @@ public class CommonsApplication extends Application {
public static final String API_URL = "https://commons.wikimedia.org/w/api.php"; public static final String API_URL = "https://commons.wikimedia.org/w/api.php";
public static final String IMAGE_URL_BASE = "https://upload.wikimedia.org/wikipedia/commons"; public static final String IMAGE_URL_BASE = "https://upload.wikimedia.org/wikipedia/commons";
public static final String HOME_URL = "https://commons.wikimedia.org/wiki/"; public static final String HOME_URL = "https://commons.wikimedia.org/wiki/";
public static final String MOBILE_HOME_URL = "https://commons.m.wikimedia.org/wiki/";
public static final String EVENTLOG_URL = "https://www.wikimedia.org/beacon/event"; public static final String EVENTLOG_URL = "https://www.wikimedia.org/beacon/event";
public static final String EVENTLOG_WIKI = "commonswiki"; public static final String EVENTLOG_WIKI = "commonswiki";

4
app/src/main/java/fr/free/nrw/commons/Media.java
View file

@ -61,6 +61,10 @@ public class Media implements Parcelable {
return CommonsApplication.HOME_URL + "File:" + Utils.urlEncode(getFilename().replace("File:", "").replace(" ", "_")); return CommonsApplication.HOME_URL + "File:" + Utils.urlEncode(getFilename().replace("File:", "").replace(" ", "_"));
} }
public String getMobileDescriptionUrl() {
return CommonsApplication.MOBILE_HOME_URL + "File:" + Utils.urlEncode(getFilename().replace("File:", "").replace(" ", "_"));
}
public Uri getLocalUri() { public Uri getLocalUri() {
return localUri; return localUri;
} }

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

@ -143,7 +143,7 @@ public class MediaDetailPagerFragment extends Fragment implements ViewPager.OnPa
// View in browser // View in browser
Intent viewIntent = new Intent(); Intent viewIntent = new Intent();
viewIntent.setAction(Intent.ACTION_VIEW); viewIntent.setAction(Intent.ACTION_VIEW);
viewIntent.setData(Uri.parse(m.getDescriptionUrl())); viewIntent.setData(Uri.parse(m.getMobileDescriptionUrl()));
startActivity(viewIntent); startActivity(viewIntent);
return true; return true;
case R.id.menu_download_current_image: case R.id.menu_download_current_image: