Small ui updates

app/src/main/java/org/koitharu/kotatsu/utils/ext/StringExt.kt

@@ -12,13 +12,13 @@ fun String.longHashCode(): Long {
 	var h = 1125899906842597L
 	val len: Int = this.length
 	for (i in 0 until len) {
-		h = 31 * h + this[i].toLong()
+		h = 31 * h + this[i].code
 	}
 	return h
 }
 
 fun String.removeSurrounding(vararg chars: Char): String {
-	if (length == 0) {
+	if (isEmpty()) {
 		return this
 	}
 	for (c in chars) {
@@ -224,4 +224,4 @@ inline fun <T> StringBuilder.appendAll(
 		}
 		append(transform(item))
 	}
-}
+}

app/src/main/res/drawable/ic_list_add.xml

@@ -3,10 +3,10 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:width="24dp"
 	android:height="24dp"
-	android:tint="?android:textColorPrimary"
+	android:tint="?attr/colorControlNormal"
 	android:viewportWidth="24"
 	android:viewportHeight="24">
 	<path
 		android:fillColor="#000"
-		android:pathData="M17,18V5H7V18L12,15.82L17,18M17,3A2,2 0 0,1 19,5V21L12,18L5,21V5C5,3.89 5.9,3 7,3H17M11,7H13V9H15V11H13V13H11V11H9V9H11V7Z" />
-</vector>
+		android:pathData="M2,16H10V14H2M18,14V10H16V14H12V16H16V20H18V16H22V14M14,6H2V8H14M14,10H2V12H14V10Z" />
+</vector>

app/src/main/res/drawable/ic_loading.xml

@@ -0,0 +1,11 @@
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:tint="?attr/colorControlNormal"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path
+		android:fillColor="#000"
+		android:pathData="M13 2.03V4.05C17.39 4.59 20.5 8.58 19.96 12.97C19.5 16.61 16.64 19.5 13 19.93V21.93C18.5 21.38 22.5 16.5 21.95 11C21.5 6.25 17.73 2.5 13 2.03M11 2.06C9.05 2.25 7.19 3 5.67 4.26L7.1 5.74C8.22 4.84 9.57 4.26 11 4.06V2.06M4.26 5.67C3 7.19 2.25 9.04 2.05 11H4.05C4.24 9.58 4.8 8.23 5.69 7.1L4.26 5.67M2.06 13C2.26 14.96 3.03 16.81 4.27 18.33L5.69 16.9C4.81 15.77 4.24 14.42 4.06 13H2.06M7.1 18.37L5.67 19.74C7.18 21 9.04 21.79 11 22V20C9.58 19.82 8.23 19.25 7.1 18.37M20 4H44M13 18H11V16H13V18M13 15H11C11 11.75 14 12 14 10C14 8.9 13.1 8 12 8S10 8.9 10 10H8C8 7.79 9.79 6 12 6S16 7.79 16 10C16 12.5 13 12.75 13 15Z" />
+</vector>

app/src/main/res/layout/activity_categories.xml

@@ -41,16 +41,18 @@
 		android:visibility="gone"
 		tools:visibility="visible" />
 
-	<com.google.android.material.floatingactionbutton.FloatingActionButton
+	<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
 		android:id="@+id/fab_add"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_margin="16dp"
 		android:contentDescription="@string/add_new_category"
 		android:src="@drawable/ic_add"
+		android:text="@string/create_category"
 		app:fabSize="normal"
+		app:icon="@drawable/ic_add"
 		app:layout_anchor="@id/recyclerView"
 		app:layout_anchorGravity="bottom|end"
 		app:layout_dodgeInsetEdges="bottom" />
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/dialog_favorite_categories.xml

@@ -42,6 +42,6 @@
 		android:paddingEnd="?android:listPreferredItemPaddingEnd"
 		android:text="@string/add_new_category"
 		android:textAppearance="?attr/textAppearanceBodyLarge"
-		app:drawableEndCompat="@drawable/ic_add" />
+		app:drawableEndCompat="@drawable/ic_list_add" />
 
-</LinearLayout>
+</LinearLayout>

app/src/main/res/menu/opt_reader_bottom.xml

@@ -12,13 +12,6 @@
 		android:visible="false"
 		app:showAsAction="always" />
 
-	<item
-		android:id="@+id/action_bookmark_add"
-		android:icon="@drawable/ic_bookmark_add"
-		android:title="@string/add_bookmark"
-		android:visible="false"
-		app:showAsAction="always" />
-
 	<item
 		android:id="@+id/action_pages_thumbs"
 		android:icon="@drawable/ic_grid"
@@ -27,7 +20,7 @@
 
 	<item
 		android:id="@+id/action_reader_mode"
-		android:icon="@drawable/ic_book_page"
+		android:icon="@drawable/ic_loading"
 		android:title="@string/read_mode"
 		app:showAsAction="always" />
 
@@ -41,4 +34,4 @@
 		android:title="@string/settings"
 		app:showAsAction="never" />
 
-</menu>
+</menu>

app/src/main/res/values/styles.xml

@@ -140,4 +140,4 @@
 		<item name="android:layout">@layout/pref_slider</item>
 	</style>
 
-</resources>
+</resources>