Merge pull request #3 from dejandobnikar/feature/outputFilename

Feature/output filename
hkk595 · Jan 9, 2018 · 494f008 · 494f008
2 parents a933b52 + 3d260e4
commit 494f008
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 8 deletions.
diff --git a/app/src/main/java/me/echodev/resizer/Resizer.java b/app/src/main/java/me/echodev/resizer/Resizer.java
@@ -6,6 +6,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Locale;
 import java.util.concurrent.Callable;
 
 import io.reactivex.Flowable;
@@ -19,13 +20,15 @@ public class Resizer {
  private int targetLength, quality;
  private Bitmap.CompressFormat compressFormat;
  private String outputDirPath;
+ private String outputFilename;
  private File sourceImage;
 
  public Resizer(Context context) {
  targetLength = 1080;
  quality = 80;
  compressFormat = Bitmap.CompressFormat.JPEG;
  outputDirPath = context.getExternalFilesDir(Environment.DIRECTORY_PICTURES).getAbsolutePath();
+ outputFilename = null;
  }
 
  public Resizer setTargetLength(int targetLength) {
@@ -53,6 +56,35 @@ public Resizer setOutputFormat(String outputFormat) {
  return this;
  }
 
+ public Resizer setOutputFormat(Bitmap.CompressFormat compressFormat) {
+ if (compressFormat == null) {
+ throw new NullPointerException("compressFormat null");
+ }
+
+ this.compressFormat = compressFormat;
+ return this;
+ }
+
+ /** Set output file name.
+ * @param filename name of the output file, without file extension
+ * */
+ public Resizer setOutputFilename(String filename) {
+
+ if (filename == null) {
+ throw new NullPointerException("filename null");
+ }
+
+ if (filename.toLowerCase(Locale.US).endsWith(".jpg")
+ || filename.toLowerCase(Locale.US).endsWith(".jpeg")
+ || filename.toLowerCase(Locale.US).endsWith(".png")
+ || filename.toLowerCase(Locale.US).endsWith(".webp")) {
+ throw new IllegalStateException("Filename should be provided without extension. See setOutputFormat(String).");
+ }
+
+ this.outputFilename = filename;
+ return this;
+ }
+
  public Resizer setOutputDirPath(String outputDirPath) {
  this.outputDirPath = outputDirPath;
  return this;
@@ -64,7 +96,8 @@ public Resizer setSourceImage(File sourceImage) {
  }
 
  public File getResizedFile() throws IOException {
- return ImageUtils.getScaledImage(targetLength, quality, compressFormat, outputDirPath, sourceImage);
+ return ImageUtils.getScaledImage(targetLength, quality, compressFormat, outputDirPath, outputFilename,
+ sourceImage);
  }
 
  public Bitmap getResizedBitmap() throws IOException {

diff --git a/app/src/main/java/me/echodev/resizer/util/FileUtils.java b/app/src/main/java/me/echodev/resizer/util/FileUtils.java
@@ -11,16 +11,20 @@
  */
 
 public class FileUtils {
- public static String getOutputFilePath(Bitmap.CompressFormat compressFormat, String outputDirPath, File sourceImage) {
+ public static String getOutputFilePath(Bitmap.CompressFormat compressFormat, String outputDirPath, String outputFilename, File sourceImage) {
  String originalFileName = sourceImage.getName();
  String targetFileName;
  String targetFileExtension = "." + compressFormat.name().toLowerCase().replace("jpeg", "jpg");
 
- int extensionIndex = originalFileName.lastIndexOf('.');
- if (extensionIndex == -1) {
- targetFileName = originalFileName + targetFileExtension;
+ if (outputFilename == null) {
+ int extensionIndex = originalFileName.lastIndexOf('.');
+ if (extensionIndex == -1) {
+ targetFileName = originalFileName + targetFileExtension;
+ } else {
+ targetFileName = originalFileName.substring(0, extensionIndex) + targetFileExtension;
+ }
  } else {
- targetFileName = originalFileName.substring(0, extensionIndex) + targetFileExtension;
+ targetFileName = outputFilename + targetFileExtension;
  }
 
  return outputDirPath + File.separator + targetFileName;

diff --git a/app/src/main/java/me/echodev/resizer/util/ImageUtils.java b/app/src/main/java/me/echodev/resizer/util/ImageUtils.java
@@ -11,14 +11,15 @@
  */
 
 public class ImageUtils {
- public static File getScaledImage(int targetLength, int quality, Bitmap.CompressFormat compressFormat, String outputDirPath, File sourceImage) throws IOException {
+ public static File getScaledImage(int targetLength, int quality, Bitmap.CompressFormat compressFormat,
+ String outputDirPath, String outputFilename, File sourceImage) throws IOException {
  File directory = new File(outputDirPath);
  if (!directory.exists()) {
  directory.mkdirs();
  }
 
  // Prepare the new file name and path
- String outputFilePath = FileUtils.getOutputFilePath(compressFormat, outputDirPath, sourceImage);
+ String outputFilePath = FileUtils.getOutputFilePath(compressFormat, outputDirPath, outputFilename, sourceImage);
 
  // Write the resized image to the new file
  Bitmap scaledBitmap = getScaledBitmap(targetLength, sourceImage);