Skip to content
This repository has been archived by the owner on Sep 8, 2019. It is now read-only.

Commit

Permalink
- update v1.6.2 Beta
Browse files Browse the repository at this point in the history
  • Loading branch information
@kollerlukas
kollerlukas committed Aug 28, 2017
1 parent 49adcfd commit 91813ac
Show file tree
Hide file tree
Showing 5 changed files with 73 additions and 85 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
applicationId "us.koller.cameraroll"
minSdkVersion 19
targetSdkVersion 26
versionCode 23
versionName "v1.6.1 Beta"
versionCode 24
versionName "v1.6.2 Beta"
vectorDrawables.useSupportLibrary = true
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
Expand Down
Binary file modified app/release/app-release.apk
View file
Binary file not shown.
8 changes: 0 additions & 8 deletions app/src/main/java/us/koller/cameraroll/data/fileOperations/Delete.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import android.content.Intent;
import android.net.Uri;
import android.support.v4.provider.DocumentFile;
import android.util.Log;

import java.io.File;

Expand Down Expand Up @@ -42,10 +41,8 @@ public void execute(Intent workIntent) {
return;
}
result = deleteFileOnRemovableStorage(getApplicationContext(), treeUri, files[i].getPath());
Log.d("Delete", "execute: deleteFileOnRemovableStorage()");
} else {
result = deleteFile(files[i].getPath());
Log.d("Delete", "execute: deleteFile()");
}

if (result) {
Expand All @@ -68,7 +65,6 @@ public int getType() {

public boolean deleteFile(String path) {
boolean success;
Log.d("Delete", "deleteFile: java.io.File");
File file = new File(path);
if (file.isDirectory()) {
File[] files = file.listFiles();
Expand All @@ -85,12 +81,8 @@ private boolean deleteFileOnRemovableStorage(Context context, Uri treeUri, Strin
boolean success = false;
DocumentFile file = StorageUtil.parseDocumentFile(context, treeUri, new File(path));
if (file != null) {
Log.d("Delete", "execute: file is on removable storage" + ", canWrite(): " + String.valueOf(file.canWrite()));
success = file.delete();
} else {
Log.d("Delete", "execute: file is on removable storage" + ", file = null");
}

//remove from MediaStore
addPathToScan(path);
return success;
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/us/koller/cameraroll/data/fileOperations/FileOperation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,6 @@ public static void scanPaths(final Context context, final String[] paths, final
@Override
public void onScanCompleted(String path, Uri uri) {
Log.d("FileOperation", "onScanCompleted() called with: path = [" + path + "]");

pathsScanned++;
if (callback != null && pathsScanned == paths.length) {
new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
Expand Down
145 changes: 71 additions & 74 deletions app/src/main/res/values-fr/strings_translatable.xml
View file
Original file line number Diff line number Diff line change
@@ -1,108 +1,110 @@
<resources>
<!--TODO update (Translator pleae remove this when updated)-->
<!--translatable-->
<!--error messages-->
<string name="read_permission_denied">Camera Roll requiert la permission Voir le contenu de la mémoire USB pour récupérer vos photos.</string>

<string name="grant_removable_storage_permission">Accorder la permission Stockage amovible</string>
<string name="grant_removable_storage_permission_message">Veuillez sélectionner la racine du dossier de votre appareil de stockage amovible (ex : SD Card) sur le prochain écran.</string>
<!--general-->
<string name="photo">Photo</string>
<string name="raw_image">RAW Image</string>
<string name="gif">Gif</string>
<string name="video">Video</string>
<string name="pick_photo">Prendre une image</string>
<string name="pick_photos">Prendre des images</string>
<string name="loading">Chargement…</string>
<string name="loading_failed">Échec du chargement</string>
<string name="ok">OK</string>
<string name="cancel">Annuler</string>
<string name="no">Non</string>
<string name="undo">Annuler</string>
<string name="done">Fait</string>
<string name="retry">Réessayer</string>
<string name="excluded">Exclu</string>
<string name="error">Erreur</string>
<string name="selected_count">%1$d selected</string>
<string name="file_op_channel_name">File Operations</string>
<string name="file_op_channel_description">Shows the current state of a file operation.</string>
<!--MainActivity-->
<string name="refresh">Actualiser</string>
<string name="sort_by">Trier par…</string>
<string name="by_name">Nome</string>
<string name="by_size">Taille</string>
<string name="by_date">Date</string>
<string name="hidden_folders">Dossiers cachés</string>
<string name="file_explorer">Gestionnaire de fichiers</string>
<string name="about">À propos</string>
<string name="settings">Paramètres</string>

<string name="camera_shortcut">Raccourci Appareil photo</string>
<string name="item_count">%1$d Item</string>
<string name="items_count">%1$d Items</string>
<!--AlbumActivity-->
<string name="exclude">Exclure</string>
<string name="pin_album">Épingler album</string>
<string name="file_deleted">%1$d file deleted</string>
<string name="files_deleted">%1$d files deleted</string>
<string name="select_all">Select All</string>
<!--ItemActivity-->
<string name="set_as">Définir en tant que…</string>
<string name="open_with">Ouvrir avec…</string>
<string name="open_with_error">No App found to view your %1$s</string>
<string name="print">Imprimer</string>
<string name="info">Info</string>
<string name="share">Partager</string>
<string name="share_photo">Partager Photo</string>
<string name="share_item">Share %1$s</string>
<string name="share_error">No App found to share your %1$s</string>
<string name="edit">Modifier</string>
<string name="print">Imprimer</string>

<string name="edit_item">Edit %1$s</string>
<string name="edit_error">No App found to edit your %1$s</string>
<string name="delete">Supprimer</string>
<string name="photo_deleted">Photo supprimée</string>
<string name="photos_deleted">Photos supprimées</string>
<string name="successfully_deleted">"supprimé avec succès"</string>

<string name="delete_item">Delete %1$s</string>
<string name="delete_files">Delete %1$d files</string>
<string name="move">Déplacer</string>
<string name="move_item_to">Move %1$d Item to:</string>
<string name="move_items_to">Move %1$d Items to:</string>
<string name="move_error">Moving files to/from removable Storage doesn\'t work. Please just copy and delete the file</string>
<string name="copy">Copier</string>
<string name="copy_item_to">Copy %1$d Item to:</string>
<string name="copy_items_to">Copy %1$d Items to:</string>
<string name="create">Créer</string>
<string name="new_folder">Nouveau dossier</string>
<string name="rename">Renommer</string>
<string name="paste">Coller</string>
<string name="to">"vers"</string>
<string name="successfully_moved">"déplacé avec succès"</string>
<string name="successfully_copied">"docpié avec succès"</string>
<string name="successfully_created_new_folder">Nouveau dossier créé avec succès</string>
<string name="successfully_renamed_file">Fichier renommé avec succès</string>

<string name="pick_photo">Prendre une image</string>
<string name="pick_photos">Prendre des images</string>

<string name="item">"élément"</string>
<string name="items">"éléments"</string>
<string name="files">Fichiers</string>
<string name="file">Fichier</string>

<string name="loading">Chargement…</string>
<string name="loading_failed">Échec du chargement</string>

<string name="ok">OK</string>
<string name="cancel">Annuler</string>
<string name="no">Non</string>

<string name="undo">Annuler</string>
<string name="done">Fait</string>
<string name="retry">Réessayer</string>

<string name="error">Erreur</string>

<string name="photo">Photo</string>

<!--FileExplorerActivity-->
<string name="no_files">AUCUN FICHIER</string>
<string name="storage">Stockage</string>

<string name="exclude">Exclure</string>
<string name="excluded">Exclu</string>

<string name="copy_file">Copy %1$d file</string>
<string name="copy_files">Copy %1$d files</string>
<string name="move_file">Move %1$d file</string>
<string name="move_files">Move %1$d files</string>
<string name="delete_file">Delete %1$d file</string>
<!--SettingsActivity-->
<string name="appearance">Apparence</string>
<string name="theme">Thème</string>
<string name="style">Style</string>
<string name="column_count">Nombre de colonnes</string>
<string name="other">Autres</string>

<string name="media_retriever">MediaRetriever</string>
<string name="media_retriever_summary">Rechercher manuellement des medias sur le stockage au lieu d\'utiliser l\'API MediaStore. Ceci peut aider si des fichiers sont manquants.</string>

<string name="use_8_bit_color">Couleurs 8-Bit</string>
<string name="use_8_bit_color_summary">Utiliser des couleurs 8-Bit lors de l\'affichage des images. Les images peuvent mettre plus de temps à charger. Cela accroît également la quantité de mémoire lorsque l\'application est utilisée.</string>

<string name="camera_shortcut">Raccourci Appareil photo</string>

<string name="edit_space">"Modifier "</string>
<string name="copied_to_clipboard">Copié dans le presse-papiers</string>
<!--EditImageActivity-->
<string name="rotate">tourner</string>
<string name="restore">Restore</string>
<string name="editing_file_format_not_supported">This file format is not supported for editing</string>
<string name="success">Success!</string>
<!--SetWallpaperActivity-->
<string name="wallpaper">Wallpaper</string>
<string name="set_wallpaper">Set Wallpaper</string>
<string name="wallpaper_file_format_not_supported">This file format is not supported for wallpapers</string>
<!--ExifEditorActivity-->
<string name="exif_editor">Éditeur Exif</string>
<string name="edit_exif">Modifier Exif</string>
<string name="save">Enregistré</string>
<string name="changes_saved">Modifications enregistrées</string>

<!--ImageView ContentDescription-->
<string name="image">Image</string>

<string name="play_pause"><![CDATA[Play & Pause Button]]></string>
<string name="minus">Moins</string>
<string name="plus">Plus</string>
<string name="by_name">Nome</string>
<string name="by_size">Taille</string>
<string name="by_date">Date</string><!--Last Modified-->
<string name="pin_album">Épingler album</string>
<string name="grant_removable_storage_permission">Accorder la permission Stockage amovible</string>
<string name="grant_removable_storage_permission_message">Veuillez sélectionner la racine du dossier de votre appareil de stockage amovible (ex : SD Card) sur le prochain écran.</string>
<string name="open_with">Ouvrir avec…</string>
<string name="rotate">tourner</string>

<!--need to be translated-->
<string name="wallpaper">Wallpaper</string>
<string name="set_wallpaper">Set Wallpaper</string>

<!--ExcludedPathsActivity-->
<string name="excluded_paths">Excluded Paths</string>
<!--info Dialog Strings-->
<string name="info_filename">Filename: </string>
<string name="info_filepath">Filepath: </string>
Expand All @@ -116,10 +118,5 @@
<string name="info_aperture">Aperture: </string>
<string name="info_iso">ISO: </string>
<string name="info_frame_rate">Frame rate: </string>

<string name="success">Success!</string>
<string name="wallpaper_file_format_not_supported">This file format is not supported for wallpapers</string>
<string name="editing_file_format_not_supported">This file format is not supported for editing</string>
<string name="restore">Restore</string>
<string name="move_error">Moving files to/from removable Storage doesn\'t work. Please just copy and delete the file</string>
<string name="copied_to_clipboard">Copié dans le presse-papiers</string>
</resources>

0 comments on commit 91813ac

Please sign in to comment.