diff --git a/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java b/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java index db1a5a90e..17d64ed10 100644 --- a/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java +++ b/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java @@ -210,9 +210,10 @@ public class MainActivity extends SimpleActivity final Directory directory = directories.get(fileDir); final int newImageCnt = directory.getMediaCnt() + 1; directory.setMediaCnt(newImageCnt); + directory.addSize(file.length()); } else if (!mToBeDeleted.contains(fileDir)) { final String dirName = Utils.getFilename(fileDir); - directories.put(fileDir, new Directory(fileDir, path, dirName, 1, timestamp)); + directories.put(fileDir, new Directory(fileDir, path, dirName, 1, timestamp, file.length())); } } while (cursor.moveToNext()); cursor.close(); diff --git a/app/src/main/java/com/simplemobiletools/gallery/models/Directory.java b/app/src/main/java/com/simplemobiletools/gallery/models/Directory.java index 9f8c155f1..14aafe3de 100644 --- a/app/src/main/java/com/simplemobiletools/gallery/models/Directory.java +++ b/app/src/main/java/com/simplemobiletools/gallery/models/Directory.java @@ -1,50 +1,60 @@ package com.simplemobiletools.gallery.models; public class Directory implements Comparable { - private final String path; - private final String thumbnail; - private final String name; - private final long timestamp; - private int mediaCnt; + private final String mPath; + private final String mThumbnail; + private final String mName; + private final long mTimestamp; + private int mMediaCnt; + private long mBytes; - public Directory(String path, String thumbnail, String name, int mediaCnt, long timestamp) { - this.path = path; - this.thumbnail = thumbnail; - this.name = name; - this.mediaCnt = mediaCnt; - this.timestamp = timestamp; + public Directory(String path, String thumbnail, String name, int mediaCnt, long timestamp, long size) { + mPath = path; + mThumbnail = thumbnail; + mName = name; + mMediaCnt = mediaCnt; + mTimestamp = timestamp; + mBytes = size; } public String getPath() { - return path; + return mPath; } public String getThumbnail() { - return thumbnail; + return mThumbnail; } public String getName() { - return name; + return mName; } public int getMediaCnt() { - return mediaCnt; + return mMediaCnt; } public void setMediaCnt(int cnt) { - mediaCnt = cnt; + mMediaCnt = cnt; } public long getTimestamp() { - return timestamp; + return mTimestamp; + } + + public long getSize() { + return mBytes; + } + + public void addSize(long bytes) { + mBytes += bytes; } @Override public int compareTo(Object object) { final Directory directory = (Directory) object; - if (this.timestamp < directory.getTimestamp()) { + if (mTimestamp < directory.getTimestamp()) { return 1; - } else if (this.timestamp > directory.getTimestamp()) { + } else if (mTimestamp > directory.getTimestamp()) { return -1; } return 0; diff --git a/app/src/main/java/com/simplemobiletools/gallery/models/Medium.java b/app/src/main/java/com/simplemobiletools/gallery/models/Medium.java index d875ce946..c443536ff 100644 --- a/app/src/main/java/com/simplemobiletools/gallery/models/Medium.java +++ b/app/src/main/java/com/simplemobiletools/gallery/models/Medium.java @@ -4,26 +4,26 @@ import java.io.Serializable; public class Medium implements Serializable, Comparable { private static final long serialVersionUID = -6543139465975455L; - private final String path; - private final boolean isVideo; - private final long timestamp; + private final String mPath; + private final boolean mIsVideo; + private final long mTimestamp; public Medium(String path, boolean isVideo, long timestamp) { - this.path = path; - this.isVideo = isVideo; - this.timestamp = timestamp; + mPath = path; + mIsVideo = isVideo; + mTimestamp = timestamp; } public String getPath() { - return path; + return mPath; } public boolean getIsVideo() { - return isVideo; + return mIsVideo; } public long getTimestamp() { - return timestamp; + return mTimestamp; } public boolean isGif() { @@ -33,9 +33,9 @@ public class Medium implements Serializable, Comparable { @Override public int compareTo(Object object) { final Medium medium = (Medium) object; - if (this.timestamp < medium.getTimestamp()) { + if (mTimestamp < medium.getTimestamp()) { return 1; - } else if (this.timestamp > medium.getTimestamp()) { + } else if (mTimestamp > medium.getTimestamp()) { return -1; } return 0; diff --git a/app/src/main/res/mipmap-hdpi/sort.png b/app/src/main/res/mipmap-hdpi/sort.png new file mode 100644 index 000000000..c62475e1f Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/sort.png differ diff --git a/app/src/main/res/mipmap-mdpi/sort.png b/app/src/main/res/mipmap-mdpi/sort.png new file mode 100644 index 000000000..552bb7c33 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/sort.png differ diff --git a/app/src/main/res/mipmap-xhdpi/sort.png b/app/src/main/res/mipmap-xhdpi/sort.png new file mode 100644 index 000000000..1f9dccfd8 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/sort.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/sort.png b/app/src/main/res/mipmap-xxhdpi/sort.png new file mode 100644 index 000000000..42cf9765f Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/sort.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/sort.png b/app/src/main/res/mipmap-xxxhdpi/sort.png new file mode 100644 index 000000000..f2454f114 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/sort.png differ diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 73c48a107..34d383b94 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -20,6 +20,12 @@ Impostazione sfondo Apri fotocamera Riscontrato un errore sconosciuto + Sort by + Name + Size + Date + Ascending + Descending 1 cartella eliminata diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 9f0df7ada..f21a4df01 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -20,6 +20,12 @@ 壁紙の設定 カメラを開く 不明なエラーが発生しました + Sort by + Name + Size + Date + Ascending + Descending 1 フォルダーを削除しました diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index b72801714..9a23192db 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -20,6 +20,12 @@ Inställningar för bakgrundsbild Starta kameran Ett okänt fel har uppstått + Sort by + Name + Size + Date + Ascending + Descending 1 mapp borttagen diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ba4cd6245..839595de3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -20,6 +20,12 @@ Setting wallpaper Open camera An unknown error occurred + Sort by + Name + Size + Date + Ascending + Descending 1 folder deleted