diff --git a/app/src/main/java/com/etesync/syncadapter/ui/ViewCollectionActivity.java b/app/src/main/java/com/etesync/syncadapter/ui/ViewCollectionActivity.java index ac6d8742..02febe81 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/ViewCollectionActivity.java +++ b/app/src/main/java/com/etesync/syncadapter/ui/ViewCollectionActivity.java @@ -29,8 +29,6 @@ import com.etesync.syncadapter.R; import com.etesync.syncadapter.model.CollectionInfo; import com.etesync.syncadapter.model.EntryEntity; import com.etesync.syncadapter.model.JournalEntity; -import com.etesync.syncadapter.model.JournalModel; -import com.etesync.syncadapter.model.ServiceEntity; import com.etesync.syncadapter.resource.LocalAddressBook; import com.etesync.syncadapter.resource.LocalCalendar; import com.etesync.syncadapter.ui.importlocal.ImportActivity; @@ -96,6 +94,13 @@ public class ViewCollectionActivity extends AppCompatActivity implements Refresh final TextView desc = (TextView) findViewById(R.id.description); desc.setText(info.description); + + final TextView owner = (TextView) findViewById(R.id.owner); + if (account.name.equals(journalEntity.getOwner())) { + owner.setVisibility(View.GONE); + } else { + owner.setText(getString(R.string.account_owner, journalEntity.getOwner())); + } } @Override diff --git a/app/src/main/res/layout/collection_header.xml b/app/src/main/res/layout/collection_header.xml index 178f7fc4..6c55f861 100644 --- a/app/src/main/res/layout/collection_header.xml +++ b/app/src/main/res/layout/collection_header.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginBottom="16dp" android:orientation="vertical"> + tools:text="Description" /> + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d393ebc2..bff92d20 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -103,6 +103,7 @@ Change Journal In order to import contacts and calendars into EteSync, you need to click on the menu, and choose \"Import\". + Owner: %s Only the owner of this collection (%s) is allowed to view its members. Not Allowed Only the owner of this collection (%s) is allowed to edit it.