GitHub/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-12-27 16:15:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

AppListItem misc tweaks

Browse Source 
* Restore text marquee on all layouts
* Text size and color tweaks
* List layout image has round corners
* Clean up unneeded attributes
This commit is contained in:
lynxnb 2022-01-21 12:19:39 +01:00
parent 6ee5e7e629
commit 74d75505e9
8 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/emu/skyline/adapter/AppViewItem.kt
View File

@ -87,6 +87,9 @@ class AppViewItem(var layoutType : LayoutType, private val item : AppItem, priva
override fun bind(binding : LayoutBinding<*>, position : Int) {
binding.textTitle.text = item.title
binding.textSubtitle.text = item.subTitle ?: item.loaderResultString(binding.root.context)
// Make the title text view selected for marquee to work
binding.textTitle.isSelected = true
binding.textSubtitle.isSelected = true
binding.icon.setImageBitmap(item.icon ?: missingIcon)

5
app/src/main/res/layout/app_item_grid.xml
View File

@ -37,7 +37,8 @@
android:marqueeRepeatLimit="marquee_forever"
android:singleLine="true"
android:textColor="?android:attr/textColorPrimary"
android:textSize="12sp"
android:textAppearance="?android:attr/textAppearanceListItem"
android:textSize="14sp"
tools:text="Title" />
<TextView
@ -50,6 +51,8 @@
android:ellipsize="marquee"
android:marqueeRepeatLimit="marquee_forever"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="?android:attr/textColorSecondary"
android:textSize="12sp"
tools:text="Subtitle" />
</LinearLayout>

13
app/src/main/res/layout/app_item_grid_compact.xml
View File

@ -33,16 +33,14 @@
android:id="@+id/text_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:alpha="242.25"
android:paddingHorizontal="8dp"
android:ellipsize="marquee"
android:marqueeRepeatLimit="marquee_forever"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceListItem"
android:textSize="14sp"
android:textColor="@android:color/white"
android:textStyle="bold"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toTopOf="@id/text_subtitle"
app:layout_constraintEnd_toEndOf="@id/icon"
app:layout_constraintStart_toStartOf="@id/icon"
@ -52,16 +50,15 @@
android:id="@+id/text_subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingHorizontal="8dp"
android:layout_marginBottom="8dp"
android:alpha="242.25"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:marqueeRepeatLimit="marquee_forever"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textSize="12sp"
android:textColor="@android:color/white"
android:alpha="0.95"
app:layout_constraintBottom_toBottomOf="@id/icon"
app:layout_constraintEnd_toEndOf="@id/icon"
app:layout_constraintStart_toStartOf="@id/icon"

14
app/src/main/res/layout/app_item_linear.xml
View File

@ -10,7 +10,7 @@
android:focusable="true"
android:padding="16dp">
<ImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/icon"
android:layout_width="56dp"
android:layout_height="56dp"
@ -18,14 +18,16 @@
android:focusable="false"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:shapeAppearanceOverlay="@style/RoundedAppImage"
tools:src="@drawable/default_icon" />
<TextView
android:id="@+id/text_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:ellipsize="end"
android:layout_marginStart="12dp"
android:ellipsize="marquee"
android:marqueeRepeatLimit="marquee_forever"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceListItem"
app:layout_constrainedWidth="true"
@ -40,14 +42,16 @@
android:id="@+id/text_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:ellipsize="marquee"
android:marqueeRepeatLimit="marquee_forever"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="@android:color/tertiary_text_light"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@id/icon"
app:layout_constraintStart_toStartOf="@+id/text_title"
app:layout_constraintTop_toBottomOf="@+id/text_title"
tools:text="SubTitle" />
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/values/attrs.xml
View File

@ -1,9 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<attr name="chipChoiceStyle" format="reference" />
<declare-styleable name="CustomEditTextPreference">
<attr name="limit" format="integer" />
</declare-styleable>
<attr name="chipChoiceStyle" format="reference" />
<declare-styleable name="IntegerListPreference">
<!-- The human-readable array to present as a list. Each entry must have a corresponding
index in entryValues. -->

1
app/src/main/res/values/dimens.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="grid_padding">8dp</dimen>
<dimen name="corner_radius">8dp</dimen>
</resources>

8
app/src/main/res/values/styles.xml
View File

@ -3,19 +3,13 @@
<style name="RoundedAppImage">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">6dp</item>
</style>
<style name="ChipChoice.Material">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorOnPrimary">@color/colorPrimary</item>
<item name="cornerSize">@dimen/corner_radius</item>
</style>
<style name="ChipChoice" parent="Widget.MaterialComponents.Chip.Choice">
<item name="android:textAllCaps">true</item>
<item name="chipStartPadding">8dp</item>
<item name="chipEndPadding">8dp</item>
<item name="materialThemeOverlay">@style/ChipChoice.Material</item>
<item name="shapeAppearance">@style/ShapeAppearance.MaterialComponents.LargeComponent</item>
</style>
</resources>

5
app/src/main/res/values/themes.xml
View File

@ -3,9 +3,10 @@
<style name="BaseAppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorOnPrimary">@color/colorPrimary</item>
<item name="colorOnPrimary">@android:color/white</item>
<item name="colorSecondary">@color/colorPrimary</item>
<item name="colorOnSecondary">@color/colorPrimary</item>
<item name="colorOnSecondary">@android:color/white</item>
<item name="android:statusBarColor">@color/backgroundColor</item>
<item name="android:navigationBarColor">@color/backgroundColor</item>
<item name="android:colorBackground">@color/backgroundColor</item>