KotatsuApp
/
Kotatsu
2
0
Fork 0
Code Issues 124 Pull Requests Packages Projects Releases 163 Wiki Activity

Some tweaks

Browse Source
pull/47/head
Zakhar Timoshenko 5 years ago
parent 7f5ef227eb
commit 45170fae52
5 changed files with 66 additions and 37 deletions
Show Stats Download Patch File Download Diff File

2
app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt
Unescape Escape View File

@ -67,7 +67,7 @@ class ChipsView @JvmOverloads constructor(
val chip = Chip(context) val chip = Chip(context)
val drawable = ChipDrawable.createFromAttributes(context, null, 0, R.style.Widget_Kotatsu_Chip) val drawable = ChipDrawable.createFromAttributes(context, null, 0, R.style.Widget_Kotatsu_Chip)
chip.setChipDrawable(drawable) chip.setChipDrawable(drawable)
chip.setTextColor(ContextCompat.getColor(context, R.color.blue_primary)) chip.setTextColor(ContextCompat.getColor(context, R.color.color_primary))
chip.isCloseIconVisible = false chip.isCloseIconVisible = false
chip.setEnsureMinTouchTargetSize(false) chip.setEnsureMinTouchTargetSize(false)
chip.setOnClickListener(chipOnClickListener) chip.setOnClickListener(chipOnClickListener)

6
app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
Unescape Escape View File

@ -208,9 +208,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(),
override fun onWindowInsetsChanged(insets: Insets) { override fun onWindowInsetsChanged(insets: Insets) {
binding.toolbarCard.updateLayoutParams<ViewGroup.MarginLayoutParams> { binding.toolbarCard.updateLayoutParams<ViewGroup.MarginLayoutParams> {
topMargin = insets.top + 16 topMargin = insets.top + resources.resolveDp(8)
leftMargin = insets.left + 32 leftMargin = insets.left + resources.resolveDp(16)
rightMargin = insets.right + 32 rightMargin = insets.right + resources.resolveDp(16)
} }
binding.fab.updateLayoutParams<ViewGroup.MarginLayoutParams> { binding.fab.updateLayoutParams<ViewGroup.MarginLayoutParams> {
bottomMargin = insets.bottom + topMargin bottomMargin = insets.bottom + topMargin

54
app/src/main/res/layout/item_empty_state.xml
Unescape Escape View File

@ -1,37 +1,63 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:gravity="center"
android:orientation="vertical" <androidx.constraintlayout.widget.Guideline
android:padding="16dp"> android:id="@+id/guideline_start"
android:layout_width="0dp"
android:layout_height="0dp"
android:orientation="vertical"
app:layout_constraintGuide_begin="32dp" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_end"
android:layout_width="0dp"
android:layout_height="0dp"
android:orientation="vertical"
app:layout_constraintGuide_end="32dp" />
<ImageView <ImageView
android:id="@+id/icon" android:id="@+id/icon"
android:layout_width="98dp" android:layout_width="98dp"
android:layout_height="98dp" android:layout_height="98dp"
android:layout_marginBottom="16dp" app:layout_constrainedWidth="true"
tools:src="@drawable/ic_alert_outline" /> app:layout_constraintBottom_toTopOf="@+id/textPrimary"
app:layout_constraintEnd_toEndOf="@id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed"
app:srcCompat="@drawable/ic_alert_outline" />
<TextView <TextView
android:id="@+id/textPrimary" android:id="@+id/textPrimary"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_normal"
android:gravity="center" android:gravity="center"
android:padding="4dp" android:textAppearance="@style/TextAppearance.Kotatsu.H1"
android:textAppearance="?android:textAppearanceLarge" app:layout_constrainedWidth="true"
app:layout_constraintBottom_toTopOf="@+id/textSecondary"
app:layout_constraintEnd_toEndOf="@id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/icon"
tools:text="@tools:sample/lorem[3]" /> tools:text="@tools:sample/lorem[3]" />
<TextView <TextView
android:id="@+id/textSecondary" android:id="@+id/textSecondary"
style="@style/TextAppearance.Kotatsu.NoticeBody"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_normal"
android:gravity="center" android:gravity="center"
android:padding="4dp" app:layout_constrainedWidth="true"
android:textAppearance="?android:textAppearanceMedium" app:layout_constraintBottom_toBottomOf="parent"
android:textColor="?android:textColorSecondary" app:layout_constraintEnd_toEndOf="@id/guideline_end"
tools:text="@tools:sample/lorem[3]" /> app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/textPrimary"
tools:text="@tools:sample/lorem[15]" />
</LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout>

20
app/src/main/res/values/dimens.xml
Unescape Escape View File

@ -3,6 +3,7 @@
<!-- Common dimensions --> <!-- Common dimensions -->
<dimen name="margin_normal">16dp</dimen> <dimen name="margin_normal">16dp</dimen>
<dimen name="margin_small">8dp</dimen>
<!-- Navigation --> <!-- Navigation -->
<dimen name="nav_header_logo_size">36dp</dimen> <dimen name="nav_header_logo_size">36dp</dimen>
@ -25,22 +26,7 @@
<dimen name="list_footer_height">48dp</dimen> <dimen name="list_footer_height">48dp</dimen>
<dimen name="screen_padding">16dp</dimen> <dimen name="screen_padding">16dp</dimen>
<!--SearchView dimens--> <!--Text dimens-->
<dimen name="text_size_h1">22sp</dimen>
<dimen name="search_dp_16">16dp</dimen>
<dimen name="search_sp_16">16sp</dimen>
<dimen name="search_icon_48">48dp</dimen>
<dimen name="search_icon_56">56dp</dimen>
<dimen name="search_divider">1dp</dimen>
<dimen name="search_stroke_width_focus">0dp</dimen>
<dimen name="search_layout_height">48dp</dimen>
<dimen name="search_layout_height_focus">56dp</dimen>
<dimen name="search_radius">8dp</dimen>
<dimen name="search_radius_focus">0dp</dimen>
<dimen name="search_elevation">3dp</dimen>
<dimen name="search_elevation_focus">0dp</dimen>
<dimen name="search_margins_left_right">16dp</dimen>
<dimen name="search_margins_top_bottom">8dp</dimen>
<dimen name="search_margins_focus">0dp</dimen>
</resources> </resources>

21
app/src/main/res/values/styles.xml
Unescape Escape View File

@ -2,6 +2,8 @@
<!-- Widget styles --> <!-- Widget styles -->
<style name="Widget.Kotatsu" parent="@android:style/Widget.Material" />
<style name="Widget.Kotatsu.AppBar" parent="@style/Widget.Design.AppBarLayout"> <style name="Widget.Kotatsu.AppBar" parent="@style/Widget.Design.AppBarLayout">
<item name="android:background">?attr/colorSurface</item> <item name="android:background">?attr/colorSurface</item>
<item name="android:elevation">8dp</item> <item name="android:elevation">8dp</item>
@ -37,10 +39,9 @@
<style name="Widget.Kotatsu.Chip" parent="Widget.MaterialComponents.Chip.Action"> <style name="Widget.Kotatsu.Chip" parent="Widget.MaterialComponents.Chip.Action">
<item name="chipStrokeWidth">1dp</item> <item name="chipStrokeWidth">1dp</item>
<item name="chipStrokeColor">?attr/colorAccent</item> <item name="chipStrokeColor">?attr/colorPrimary</item>
<item name="chipBackgroundColor">@android:color/transparent</item> <item name="chipBackgroundColor">@android:color/transparent</item>
<item name="chipIconTint">?attr/colorPrimary</item> <item name="chipIconTint">?attr/colorPrimary</item>
<item name="android:textColor">?attr/colorAccent</item>
<!-- Smaller text/height --> <!-- Smaller text/height -->
<item name="android:textSize">12sp</item> <item name="android:textSize">12sp</item>
@ -63,6 +64,14 @@
<item name="subtitleTextStyle">?attr/textAppearanceSubtitle1</item> <item name="subtitleTextStyle">?attr/textAppearanceSubtitle1</item>
</style> </style>
<!-- textAppearance alone doesn't support line spacing attrs. Multiline body text will use
style="Widget.Kotatsu.MultilineBody" instead of the equivalent textAppearance.
-->
<style name="Widget.Kotatsu.MultilineBody">
<item name="android:lineSpacingExtra">4sp</item>
<item name="android:textColor">?android:textColorSecondary</item>
</style>
<!-- TextAppearance --> <!-- TextAppearance -->
<style name="TextAppearance.Kotatsu.ToolbarTitle" parent="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"> <style name="TextAppearance.Kotatsu.ToolbarTitle" parent="@style/TextAppearance.Widget.AppCompat.Toolbar.Title">
@ -89,4 +98,12 @@
<style name="TextAppearance.Kotatsu.Body2" parent="TextAppearance.MaterialComponents.Body2" /> <style name="TextAppearance.Kotatsu.Body2" parent="TextAppearance.MaterialComponents.Body2" />
<style name="TextAppearance.Kotatsu.H1" parent="@style/TextAppearance.MaterialComponents.Headline5">
<item name="android:textSize">@dimen/text_size_h1</item>
</style>
<style name="TextAppearance.Kotatsu.NoticeBody" parent="@style/Widget.Kotatsu.MultilineBody">
<item name="android:textSize">18sp</item>
</style>
</resources> </resources>
Write Preview
Loading…
Cancel
Save