diff --git a/app/src/main/java/de/k3b/android/androFotoFinder/Global.java b/app/src/main/java/de/k3b/android/androFotoFinder/Global.java index 555824ef..15992f94 100644 --- a/app/src/main/java/de/k3b/android/androFotoFinder/Global.java +++ b/app/src/main/java/de/k3b/android/androFotoFinder/Global.java @@ -153,8 +153,8 @@ public static void fixMenu(Context context, Menu menu) { R.id.cmd_more, R.id.cmd_show_geo, R.id.cmd_gallery, - R.id.cmd_unlock2, - R.id.cmd_lock, + R.id.cmd_app_unpin2, + R.id.cmd_app_pin, R.id.cmd_show_geo_as ); } diff --git a/app/src/main/java/de/k3b/android/androFotoFinder/LockScreen.java b/app/src/main/java/de/k3b/android/androFotoFinder/LockScreen.java index c28b8bd2..7188a49f 100644 --- a/app/src/main/java/de/k3b/android/androFotoFinder/LockScreen.java +++ b/app/src/main/java/de/k3b/android/androFotoFinder/LockScreen.java @@ -40,7 +40,7 @@ public class LockScreen { public static boolean onOptionsItemSelected(Activity parent, MenuItem item) { switch (item.getItemId()) { - case R.id.cmd_lock: + case R.id.cmd_app_pin: if (!isLocked(parent)) { if (OS_APPLOCK_ENABLED) { parent.startLockTask(); @@ -50,7 +50,7 @@ public static boolean onOptionsItemSelected(Activity parent, MenuItem item) { } } return true; - case R.id.cmd_unlock2: + case R.id.cmd_app_unpin2: // only for old android (< 5.0). Else use app-pinning-end Global.locked = false; SettingsActivity.global2Prefs(parent.getApplication()); @@ -74,8 +74,8 @@ public static boolean isLocked(Context ctx) { public static void fixMenu(Menu menu) { if ((menu != null) && OS_APPLOCK_ENABLED) { - MenuItem unlock = menu.findItem(R.id.cmd_unlock2); - if (unlock != null) menu.removeItem(R.id.cmd_unlock2); + MenuItem unlock = menu.findItem(R.id.cmd_app_unpin2); + if (unlock != null) menu.removeItem(R.id.cmd_app_unpin2); } } } diff --git a/app/src/main/java/de/k3b/android/androFotoFinder/PhotoAutoprocessingEditActivity.java b/app/src/main/java/de/k3b/android/androFotoFinder/PhotoAutoprocessingEditActivity.java index d16c6639..694464a0 100644 --- a/app/src/main/java/de/k3b/android/androFotoFinder/PhotoAutoprocessingEditActivity.java +++ b/app/src/main/java/de/k3b/android/androFotoFinder/PhotoAutoprocessingEditActivity.java @@ -567,7 +567,7 @@ public String get(MediaUtil.FieldID id) { case rating: return getString2(R.string.lbl_rating); case visibility: - return getString2(R.string.lbl_security); + return getString2(R.string.lbl_image_visibility); case tags: return getString2(R.string.lbl_tag); case path: diff --git a/app/src/main/res/layout/activity_exif_edit.xml b/app/src/main/res/layout/activity_exif_edit.xml index de4a3189..04faf107 100644 --- a/app/src/main/res/layout/activity_exif_edit.xml +++ b/app/src/main/res/layout/activity_exif_edit.xml @@ -219,7 +219,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" - android:text="@string/lbl_security" + android:text="@string/lbl_image_visibility" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:layout_below="@+id/line_date" diff --git a/app/src/main/res/menu/menu_gallery_locked.xml b/app/src/main/res/menu/menu_gallery_locked.xml index d68b0c8f..8f8c47ac 100644 --- a/app/src/main/res/menu/menu_gallery_locked.xml +++ b/app/src/main/res/menu/menu_gallery_locked.xml @@ -23,8 +23,8 @@ - - - diff --git a/app/src/main/res/menu/menu_gallery_pick_locked.xml b/app/src/main/res/menu/menu_gallery_pick_locked.xml new file mode 100644 index 00000000..bc854707 --- /dev/null +++ b/app/src/main/res/menu/menu_gallery_pick_locked.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/menu_image_detail.xml b/app/src/main/res/menu/menu_image_detail.xml index 106c7939..0f4b8925 100644 --- a/app/src/main/res/menu/menu_image_detail.xml +++ b/app/src/main/res/menu/menu_image_detail.xml @@ -56,8 +56,8 @@ android:orderInCategory="1001" android:showAsAction="never" /> - diff --git a/app/src/main/res/menu/menu_image_detail_locked.xml b/app/src/main/res/menu/menu_image_detail_locked.xml index 70c0c35a..d9f6f312 100644 --- a/app/src/main/res/menu/menu_image_detail_locked.xml +++ b/app/src/main/res/menu/menu_image_detail_locked.xml @@ -24,8 +24,8 @@ tools:context=".imagedetail.ImageDetailActivityViewPager"> - - "%1$s %2$d Photos\n\talt %3$s (%4$s), …\nneu %5$s\n\t%6$s" - + Größe der Datei Bildbreite - - Sichbarkeit + + Sichbarkeit - App Geschützt/Fixiert - Schutz/Fixierung aufheben + App Geschützt/Fixiert + Schutz/Fixierung aufheben diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 08067358..adbf0d39 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -231,16 +231,16 @@ You can undo hiding by calling the mediascanner from gallery-menu." 1708NewName0001.jpg --> "%1$s %2$d Photos\n\t%3$s (%4$s), …\nTo %5$s\n\t%6$s" - + Size Width - - Security + + Visibility - Protect (App Pinning) - Unprotect (unpin app) + App protected/pinned + App unprotect/unpinned diff --git a/fastlane/metadata/android/en-US/changelogs/35.txt b/fastlane/metadata/android/en-US/changelogs/35.txt index 33eafd08..4d60a213 100644 --- a/fastlane/metadata/android/en-US/changelogs/35.txt +++ b/fastlane/metadata/android/en-US/changelogs/35.txt @@ -1,4 +1,4 @@ -* NEW: Protect-mode (Extended App Pinning): Allow to savley hand over your phone to someone else and allow him/her only to view those images that you have chosen before. Dangerous commands (edit, copy, delete, rootfilter, settings, ...) are not available while "App Pinning" is active. +* NEW: Mode (App protected/pinned(Extended App Pinning)): Allow to savley hand over your phone to someone else and allow him/her to view only those images that you have chosen before. Dangerous commands (edit, copy, delete, rootfilter, settings, ...) are not available while "App Pinning" is active. * NEW: Folder-rule-based autoprocessing for copy/move photo(s) with rename-file-pattern and auto-apply userdefined exif. Example: If you move IMG_20171221_085715.jpg to folder .../holiday/2017krete/ it will be automatically renamed to 17krete022.jpg and gets tags holiday, greece, krete if you define a rule for that folder. * NEW: Mark images as "PRIVATE" and allow filtering include/exclude "PRIVATE" * Gallery view: Added sort by (image-)width, (file-)size