diff --git a/CHANGELOG.md b/CHANGELOG.md index 030b713fd..7ae3f8038 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### v1.2.6 +### v1.2.7 - Dont include assets at buildtime (fixes #30) - Download assets at runtime (github assets) - Allows updating assets diff --git a/README.md b/README.md index 68ecf3b7d..b3c053448 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ # MemeTastic -Simple Meme Creator which allows to download most common templates. Completly ad-free, -and adds no watermarks. Memes can be created from templates downloaded from the MemeTastic archive, +Simple Meme Creator. Completly ad-free, and adds no watermarks. +Memes can be created from templates downloaded from the MemeTastic archive, from pictures shared into the app and pictures from gallery & camera.
diff --git a/app/src/main/java/io/github/gsantner/memetastic/data/MemeEditorElements.java b/app/src/main/java/io/github/gsantner/memetastic/data/MemeEditorElements.java index 4a026f1a9..46e6e2a8d 100644 --- a/app/src/main/java/io/github/gsantner/memetastic/data/MemeEditorElements.java +++ b/app/src/main/java/io/github/gsantner/memetastic/data/MemeEditorElements.java @@ -59,7 +59,7 @@ public void setFontToAll(MemeData.Font font) { } } - public static class EditorCaption { + public static class EditorCaption implements Serializable { private MemeConfig.Caption _captionConf; private MemeData.Font _font = null; // !serializable @@ -163,7 +163,7 @@ public void setImgText(MemeConfig.Caption captionConf) { } - public static class EditorImage { + public static class EditorImage implements Serializable { private Bitmap _image = null; private Bitmap _displayImage = null; private int _rotationDeg = 0; diff --git a/app/src/main/java/io/github/gsantner/memetastic/util/ContextUtils.java b/app/src/main/java/io/github/gsantner/memetastic/util/ContextUtils.java index 485fbf300..ed9780853 100644 --- a/app/src/main/java/io/github/gsantner/memetastic/util/ContextUtils.java +++ b/app/src/main/java/io/github/gsantner/memetastic/util/ContextUtils.java @@ -25,8 +25,8 @@ public static ContextUtils get() { public static void checkForAssetUpdates(Context context) { new MigrationThread(context).start(); - Date fiveDaysAgo = new Date(System.currentTimeMillis() - 5 * 1000 * 60 * 60 * 24); - if (AppSettings.get().getLastAssetArchiveCheckDate().before(fiveDaysAgo)) { + Date sevenDaysAgo = new Date(System.currentTimeMillis() - 7 * 1000 * 60 * 60 * 24); + if (AppSettings.get().getLastAssetArchiveCheckDate().before(sevenDaysAgo)) { new AssetUpdater.UpdateThread(context, false).start(); } } diff --git a/app/src/main/java/net/gsantner/opoc/util/ContextUtils.java b/app/src/main/java/net/gsantner/opoc/util/ContextUtils.java index 8605ed208..76eeaf84f 100644 --- a/app/src/main/java/net/gsantner/opoc/util/ContextUtils.java +++ b/app/src/main/java/net/gsantner/opoc/util/ContextUtils.java @@ -388,7 +388,7 @@ public Bitmap loadImageFromFilesystem(File imagePath, int maxDimen) { * @return the scaling factor that needs to be applied to the bitmap */ public int calculateInSampleSize(BitmapFactory.Options options, int maxDimen) { - // Raw height and width of conf + // Raw height and width of image int height = options.outHeight; int width = options.outWidth; int inSampleSize = 1; @@ -429,7 +429,7 @@ public File writeImageToFile(File imageFile, Bitmap image, CompressFormat format if (folder.exists() || folder.mkdirs()) { FileOutputStream stream = null; try { - stream = new FileOutputStream(imageFile); // overwrites this conf every time + stream = new FileOutputStream(imageFile); // overwrites this image every time image.compress(format, quality, stream); return imageFile; } catch (FileNotFoundException ignored) { diff --git a/app/src/main/java/net/gsantner/opoc/util/ZipUtils.java b/app/src/main/java/net/gsantner/opoc/util/ZipUtils.java index 2dc8ee22d..354c43029 100644 --- a/app/src/main/java/net/gsantner/opoc/util/ZipUtils.java +++ b/app/src/main/java/net/gsantner/opoc/util/ZipUtils.java @@ -83,7 +83,7 @@ public static boolean unzip(final InputStream input, final File destRootFolder, } // TODO Maybe there's a way to avoid reading the zip twice, - // but ZipEntry.getSize() may return -1 so we can't just cace the ZipEntries + // but ZipEntry.getSize() may return -1 so we can't just cache the ZipEntries private static long getZipLength(final File zipFile) { int count; long totalSize = 0; diff --git a/metadata b/metadata index fff7d9cc3..0c67246f6 160000 --- a/metadata +++ b/metadata @@ -1 +1 @@ -Subproject commit fff7d9cc36007767e3fdfdf09a746bcbb9a8e0f5 +Subproject commit 0c67246f6e4f2a008eedbed8d556236d5e845102