summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorfox <fox@fakecake.org>2026-03-12 10:17:59 +0300
committerfox <fox@fakecake.org>2026-03-12 10:17:59 +0300
commit8ce3e80d42f05c94969fe35b721b68a16876da27 (patch)
tree672b3de8e90c6115c4364719f4f3b60916c03d9d
parente73c27ccde64af75c5e0a449a506bb50bfc9a736 (diff)
parent8ba7eaf88266d0dc9b71372c658b9e772ce1dec9 (diff)
downloadthe-epube-android-8ce3e80d42f05c94969fe35b721b68a16876da27.tar.gz
the-epube-android-8ce3e80d42f05c94969fe35b721b68a16876da27.tar.xz
Merge branch 'dev' into 'master' 26.03-8ce3e80d-signed
set cursive actionbar title

See merge request git/the-epube-android!5
-rw-r--r--org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java10
-rw-r--r--org.fox.epube/src/main/res/layout/toolbar.xml14
2 files changed, 19 insertions, 5 deletions
diff --git a/org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java b/org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java
index 06cd833..5ebd44a 100644
--- a/org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java
+++ b/org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java
@@ -33,6 +33,7 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;

 import android.webkit.WebViewClient;

 import android.widget.ProgressBar;

+import android.widget.TextView;

 import android.widget.Toast;

 

 import androidx.activity.EdgeToEdge;

@@ -85,6 +86,7 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
 

         setSupportActionBar(findViewById(R.id.toolbar));

         getSupportActionBar().setHomeButtonEnabled(true);

+        getSupportActionBar().setDisplayShowTitleEnabled(false);

 

         final WebViewAssetLoader assetLoader = new WebViewAssetLoader.Builder()

                 .setDomain(Uri.parse(m_baseUrl).getHost())

@@ -323,15 +325,15 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
         switch (page) {

             case PAGE_FAVORITES:

                 m_menu.setGroupVisible(R.id.menu_group_favorites, true);

-                getSupportActionBar().setTitle(R.string.page_favorites);

+                ((TextView)findViewById(R.id.toolbar_title)).setText(R.string.page_favorites);

                 break;

             case PAGE_LIBRARY:

                 m_menu.setGroupVisible(R.id.menu_group_library, true);

-                getSupportActionBar().setTitle(R.string.app_name);

+                ((TextView)findViewById(R.id.toolbar_title)).setText(R.string.app_name);

                 break;

             case PAGE_OFFLINE:

                 m_menu.setGroupVisible(R.id.menu_group_offline, true);

-                getSupportActionBar().setTitle(R.string.page_downloaded);

+                ((TextView)findViewById(R.id.toolbar_title)).setText(R.string.page_downloaded);

                 break;

             case PAGE_READER:

                 m_menu.setGroupVisible(R.id.menu_group_reader, true);

@@ -435,7 +437,7 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
 

         @JavascriptInterface

         public void setTitle(final String title) {

-            runOnUiThread(() -> getSupportActionBar().setTitle(title));

+            runOnUiThread(() -> ((TextView)findViewById(R.id.toolbar_title)).setText(title));

         }

 

         @JavascriptInterface

diff --git a/org.fox.epube/src/main/res/layout/toolbar.xml b/org.fox.epube/src/main/res/layout/toolbar.xml
index 9592da3..2e945fc 100644
--- a/org.fox.epube/src/main/res/layout/toolbar.xml
+++ b/org.fox.epube/src/main/res/layout/toolbar.xml
@@ -5,4 +5,16 @@
     android:id="@+id/toolbar"

     android:layout_height="wrap_content"

     android:layout_width="match_parent"

-    android:minHeight="?attr/actionBarSize"/>
\ No newline at end of file
+    android:minHeight="?attr/actionBarSize">

+

+    <TextView

+        android:layout_width="wrap_content"

+        android:layout_height="wrap_content"

+        android:text="@string/app_name"

+        android:fontFamily="cursive"

+        android:maxLines="2"

+        android:ellipsize="middle"

+        style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"

+        android:id="@+id/toolbar_title" />

+

+</com.google.android.material.appbar.MaterialToolbar>
\ No newline at end of file