Small ui fixes

pull/120/head
Koitharu 4 years ago
parent f6a70dc7ac
commit eb7e255430
No known key found for this signature in database
GPG Key ID: 8E861F8CE6E7CE27

@ -87,9 +87,9 @@ dependencies {
//noinspection LifecycleAnnotationProcessorWithJava8 //noinspection LifecycleAnnotationProcessorWithJava8
kapt 'androidx.lifecycle:lifecycle-compiler:2.4.1' kapt 'androidx.lifecycle:lifecycle-compiler:2.4.1'
implementation 'androidx.room:room-runtime:2.4.1' implementation 'androidx.room:room-runtime:2.4.2'
implementation 'androidx.room:room-ktx:2.4.1' implementation 'androidx.room:room-ktx:2.4.2'
kapt 'androidx.room:room-compiler:2.4.1' kapt 'androidx.room:room-compiler:2.4.2'
implementation 'com.squareup.okhttp3:okhttp:4.9.3' implementation 'com.squareup.okhttp3:okhttp:4.9.3'
implementation 'com.squareup.okio:okio:3.0.0' implementation 'com.squareup.okio:okio:3.0.0'
@ -115,6 +115,6 @@ dependencies {
androidTestImplementation 'androidx.test:rules:1.4.0' androidTestImplementation 'androidx.test:rules:1.4.0'
androidTestImplementation 'androidx.test:core-ktx:1.4.0' androidTestImplementation 'androidx.test:core-ktx:1.4.0'
androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3' androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'
androidTestImplementation 'androidx.room:room-testing:2.4.1' androidTestImplementation 'androidx.room:room-testing:2.4.2'
androidTestImplementation 'com.google.truth:truth:1.1.3' androidTestImplementation 'com.google.truth:truth:1.1.3'
} }

@ -6,6 +6,7 @@ import androidx.room.PrimaryKey
import org.koitharu.kotatsu.core.model.MangaSource import org.koitharu.kotatsu.core.model.MangaSource
import org.koitharu.kotatsu.core.model.MangaTag import org.koitharu.kotatsu.core.model.MangaTag
import org.koitharu.kotatsu.utils.ext.longHashCode import org.koitharu.kotatsu.utils.ext.longHashCode
import org.koitharu.kotatsu.utils.ext.toTitleCase
@Entity(tableName = "tags") @Entity(tableName = "tags")
class TagEntity( class TagEntity(
@ -18,7 +19,7 @@ class TagEntity(
fun toMangaTag() = MangaTag( fun toMangaTag() = MangaTag(
key = this.key, key = this.key,
title = this.title, title = this.title.toTitleCase(),
source = MangaSource.valueOf(this.source) source = MangaSource.valueOf(this.source)
) )

@ -292,7 +292,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(),
if (isLoading) { if (isLoading) {
binding.fab.setImageDrawable(CircularProgressDrawable(this).also { binding.fab.setImageDrawable(CircularProgressDrawable(this).also {
it.setColorSchemeColors(R.color.kotatsu_onPrimaryContainer) it.setColorSchemeColors(R.color.kotatsu_onPrimaryContainer)
it.strokeWidth = resources.resolveDp(2f) it.strokeWidth = resources.resolveDp(3.5f)
it.start() it.start()
}) })
} else { } else {

@ -22,7 +22,7 @@
android:id="@+id/appbar" android:id="@+id/appbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:color/transparent" android:background="@null"
android:stateListAnimator="@null"> android:stateListAnimator="@null">
<FrameLayout <FrameLayout
@ -39,7 +39,7 @@
android:id="@id/toolbar" android:id="@id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:color/transparent" android:background="@null"
android:focusable="true" android:focusable="true"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
app:contentInsetStartWithNavigation="0dp" app:contentInsetStartWithNavigation="0dp"
@ -74,6 +74,7 @@
android:contentDescription="@string/_continue" android:contentDescription="@string/_continue"
android:src="@drawable/ic_read_fill" android:src="@drawable/ic_read_fill"
android:visibility="gone" android:visibility="gone"
app:backgroundTint="?attr/colorContainer"
app:fabSize="normal" app:fabSize="normal"
app:layout_anchor="@id/container" app:layout_anchor="@id/container"
app:layout_anchorGravity="bottom|end" app:layout_anchorGravity="bottom|end"
@ -89,7 +90,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="start" android:layout_gravity="start"
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
app:insetForeground="@android:color/transparent"
app:menu="@menu/nav_drawer" /> app:menu="@menu/nav_drawer" />
</androidx.drawerlayout.widget.DrawerLayout> </androidx.drawerlayout.widget.DrawerLayout>

@ -10,7 +10,6 @@
android:id="@+id/tabs" android:id="@+id/tabs"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:tabGravity="center"
app:tabMode="scrollable" /> app:tabMode="scrollable" />
<androidx.viewpager2.widget.ViewPager2 <androidx.viewpager2.widget.ViewPager2

Loading…
Cancel
Save