Merge pull request EventFahrplan#682 from EventFahrplan/random-housek…

…eeping Random housekeeping (Copyright logo text, search icon)
johnjohndoe · Nov 4, 2024 · 32ba487 · 32ba487
2 parents eadc1e7 + c65bbcd
commit 32ba487
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
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
@@ -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
@@ -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
@@ -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">
     </item>