diff --git a/app/src/main/java/nerd/tuxmobil/fahrplan/congress/commons/Composables.kt b/app/src/main/java/nerd/tuxmobil/fahrplan/congress/commons/Composables.kt index 73e437ebfe..3b3ad8ae55 100644 --- a/app/src/main/java/nerd/tuxmobil/fahrplan/congress/commons/Composables.kt +++ b/app/src/main/java/nerd/tuxmobil/fahrplan/congress/commons/Composables.kt @@ -202,6 +202,7 @@ fun ClickableText( gravity = if (textAlign == TextAlign.Center) CENTER else START textSize = fontSize.value text = textResource.html.toSpanned() + setLineSpacing(0f, 1.5f) } }, ) diff --git a/app/src/main/java/nerd/tuxmobil/fahrplan/congress/schedule/MainActivity.kt b/app/src/main/java/nerd/tuxmobil/fahrplan/congress/schedule/MainActivity.kt index 70b5571c24..90a35d98ef 100644 --- a/app/src/main/java/nerd/tuxmobil/fahrplan/congress/schedule/MainActivity.kt +++ b/app/src/main/java/nerd/tuxmobil/fahrplan/congress/schedule/MainActivity.kt @@ -43,6 +43,7 @@ import nerd.tuxmobil.fahrplan.congress.contract.BundleKeys import nerd.tuxmobil.fahrplan.congress.details.SessionDetailsActivity import nerd.tuxmobil.fahrplan.congress.details.SessionDetailsFragment import nerd.tuxmobil.fahrplan.congress.engagements.initUserEngagement +import nerd.tuxmobil.fahrplan.congress.extensions.isLandscape import nerd.tuxmobil.fahrplan.congress.extensions.withExtras import nerd.tuxmobil.fahrplan.congress.favorites.StarredListActivity import nerd.tuxmobil.fahrplan.congress.favorites.StarredListFragment @@ -133,7 +134,7 @@ class MainActivity : BaseActivity(), progressBar = requireViewByIdCompat(R.id.progress) setSupportActionBar(toolbar) - supportActionBar!!.setTitle(R.string.fahrplan) + supportActionBar!!.title = if (isLandscape()) getString(R.string.app_name) else "" supportActionBar!!.setDisplayShowHomeEnabled(true) supportActionBar!!.setDefaultDisplayHomeAsUpEnabled(true) val actionBarColor = ContextCompat.getColor(this, R.color.colorActionBar) diff --git a/app/src/main/res/menu/mainmenu.xml b/app/src/main/res/menu/mainmenu.xml index 2c234e10a6..dffce83ea9 100644 --- a/app/src/main/res/menu/mainmenu.xml +++ b/app/src/main/res/menu/mainmenu.xml @@ -26,7 +26,7 @@ android:id="@+id/menu_item_search" android:icon="@drawable/ic_search" android:orderInCategory="60" - app:showAsAction="ifRoom" + app:showAsAction="always" android:title="@string/menu_item_title_search" android:titleCondensed="@string/menu_item_title_search">