fixed logic error & added project subtitle

This commit is contained in:
k0shk0sh 2017-09-16 20:04:27 +02:00
parent 3f10d27bcf
commit ad34cb4f00
4 changed files with 5 additions and 3 deletions

View File

@ -251,7 +251,7 @@
<activity
android:name="com.fastaccess.ui.modules.repos.projects.details.ProjectPagerActivity"
android:label="@string/projects"
android:label="@string/project"
android:parentActivityName=".ui.modules.repos.RepoPagerActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"

View File

@ -32,8 +32,8 @@ class ProjectColumnPresenter : BasePresenter<ProjectColumnMvp.View>(), ProjectCo
popupMenu.inflate(R.menu.project_card_menu)
popupMenu.menu.findItem(R.id.share).isVisible = !item.contentUrl.isNullOrBlank()
popupMenu.menu.findItem(R.id.copy).isVisible = !item.contentUrl.isNullOrBlank()
popupMenu.menu.findItem(R.id.edit).isVisible = it.isOwner() && item.note.isNullOrBlank()
popupMenu.menu.findItem(R.id.delete).isVisible = it.isOwner() && item.note.isNullOrBlank()
popupMenu.menu.findItem(R.id.edit).isVisible = it.isOwner() && !item.note.isNullOrBlank()
popupMenu.menu.findItem(R.id.delete).isVisible = it.isOwner() && !item.note.isNullOrBlank()
popupMenu.setOnMenuItemClickListener {
when (it.itemId) {
R.id.edit -> sendToView { it.onEditCard(item.note, position) }

View File

@ -110,6 +110,7 @@ class ProjectPagerActivity : BaseActivity<ProjectPagerMvp.View, ProjectPagerPres
} else {
onInitPager(presenter.getColumns())
}
toolbar?.subtitle = "${presenter.login}/${presenter.repoId}"
}
override fun onDeletePage(model: ProjectColumnModel) {

View File

@ -566,4 +566,5 @@
<string name="no_cards">No Cards</string>
<string name="card_added_by">Added by %s %s</string>
<string name="too_large_changes">Changes are large, please open in browser</string>
<string name="project">Project</string>
</resources>