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

Never show file extension in display title of images

Browse source
This commit is contained in:
YuviPanda 2013-03-13 01:55:32 +05:30
parent 625339cb51
commit bee70b58ab
4 changed files with 17 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

20
commons/src/main/java/org/wikimedia/commons/Media.java
View file

@ -7,6 +7,8 @@ import org.wikimedia.commons.contributions.Contribution;
import java.io.Serializable;
import java.util.Date;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class Media implements Parcelable {
@ -23,6 +25,19 @@ public class Media implements Parcelable {
protected Media() {
}
public static Pattern displayTitlePattern = Pattern.compile("(.*)(\\.\\w+)", Pattern.CASE_INSENSITIVE);
public String getDisplayTitle() {
// FIXME: Gross hack bercause my regex skills suck maybe or I am too lazy who knows
String title = filename.replaceFirst("^File:", "");
Matcher matcher = displayTitlePattern.matcher(title);
if(matcher.matches()) {
return matcher.group(1);
} else {
return title;
}
}
public String getDescriptionUrl() {
// HACK! Geez
return CommonsApplication.HOME_URL + "File:" + Utils.urlEncode(getFilename().replace("File:", "").replace(" ", "_"));
@ -64,11 +79,6 @@ public class Media implements Parcelable {
return Utils.makeThumbUrl(imageUrl, filename, width);
}
public String getDisplayTitle() {
return Utils.displayTitleFromTitle(filename);
}
protected Uri localUri;
protected String imageUrl;
protected String filename;

11
commons/src/main/java/org/wikimedia/commons/Utils.java
View file

@ -78,17 +78,6 @@ public class Utils {
}
}
public static Pattern displayTitlePattern = Pattern.compile("\\w+:(.*)(\\.\\w+)", Pattern.CASE_INSENSITIVE);
public static String displayTitleFromTitle(String title) {
// FIXME: This does not work for pages without an extension!
Matcher matcher = displayTitlePattern.matcher(title);
if(matcher.matches()) {
return matcher.group(1);
} else {
return title;
}
}
private static final URLCodec urlCodec = new URLCodec();
public static String urlEncode(String url) {

3
commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java
View file

@ -30,7 +30,6 @@ import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
import org.wikimedia.commons.R;
import org.wikimedia.commons.ShareActivity;
import org.wikimedia.commons.UploadService;
import org.wikimedia.commons.Utils;
import java.io.File;
import java.io.IOException;
@ -119,7 +118,7 @@ public class ContributionsListFragment extends SherlockFragment {
views.imageView.setBackgroundDrawable(null);
}
views.titleView.setText(Utils.displayTitleFromTitle(contribution.getFilename()));
views.titleView.setText(contribution.getDisplayTitle());
views.seqNumView.setText(String.valueOf(cursor.getPosition() + 1));
views.seqNumView.setVisibility(View.VISIBLE);

4
commons/src/main/java/org/wikimedia/commons/media/MediaDetailFragment.java
View file

@ -15,11 +15,9 @@ import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.assist.FailReason;
import com.nostra13.universalimageloader.core.assist.ImageLoadingListener;
import com.nostra13.universalimageloader.core.assist.ImageScaleType;
import com.nostra13.universalimageloader.core.assist.SimpleImageLoadingListener;
import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
import org.wikimedia.commons.Media;
import org.wikimedia.commons.R;
import org.wikimedia.commons.Utils;
public class MediaDetailFragment extends SherlockFragment {
@ -83,7 +81,7 @@ public class MediaDetailFragment extends SherlockFragment {
}
});
title.setText(Utils.displayTitleFromTitle(media.getFilename()));
title.setText(media.getDisplayTitle());
return view;
}