From 9ab2f280e079c19a1a8ecb465f87a61042452e90 Mon Sep 17 00:00:00 2001 From: Catfriend1 Date: Wed, 6 Mar 2019 00:58:34 +0100 Subject: [PATCH] Add "folder is unshared" status label (fixes #347) (#351) * res/colors: Add text_orange * strings: Add state_unshared * Imported de translation * Add "folder is unshared" status label (fixes #347) --- .../nutomic/syncthingandroid/views/FoldersAdapter.java | 10 ++++++++-- app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/strings.xml | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/nutomic/syncthingandroid/views/FoldersAdapter.java b/app/src/main/java/com/nutomic/syncthingandroid/views/FoldersAdapter.java index e76fc21d7..21d019352 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/views/FoldersAdapter.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/views/FoldersAdapter.java @@ -105,8 +105,14 @@ private void updateFolderStatusView(ItemFolderListBinding binding, Folder folder } else { switch(folderStatus.state) { case "idle": - binding.state.setText(mContext.getString(R.string.state_idle)); - binding.state.setTextColor(ContextCompat.getColor(mContext, R.color.text_green)); + if (folder.getDeviceCount() <= 1) { + // Special case: The folder is IDLE and UNSHARED. + binding.state.setText(mContext.getString(R.string.state_unshared)); + binding.state.setTextColor(ContextCompat.getColor(mContext, R.color.text_orange)); + } else { + binding.state.setText(mContext.getString(R.string.state_idle)); + binding.state.setTextColor(ContextCompat.getColor(mContext, R.color.text_green)); + } break; case "scanning": binding.state.setText(mContext.getString(R.string.state_scanning)); diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b379c5cc6..406583a1a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -840,6 +840,7 @@ Bitte melden Sie auftretende Probleme via GitHub. Unbekannt Pausiert Nicht synchronisiert + Ungeteilt %1$s / %2$s diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 0018ce607..5d2bb95ca 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -9,6 +9,7 @@ #ffff4444 #ff33b5e5 #ff99cc00 + #f57c00 #cccccc diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2099cc1dd..c236a819a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -861,6 +861,7 @@ Please report any problems you encounter via Github. Unknown Paused Out of Sync + Unshared %1$s / %2$s