diff --git a/app/src/main/java/emu/skyline/MainActivity.kt b/app/src/main/java/emu/skyline/MainActivity.kt index a0c05abb..944e6109 100644 --- a/app/src/main/java/emu/skyline/MainActivity.kt +++ b/app/src/main/java/emu/skyline/MainActivity.kt @@ -22,7 +22,6 @@ import androidx.core.view.isVisible import androidx.core.view.size import androidx.lifecycle.observe import androidx.preference.PreferenceManager -import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView import com.google.android.material.chip.Chip @@ -163,7 +162,7 @@ class MainActivity : AppCompatActivity() { binding.appList.apply { while (itemDecorationCount > 0) removeItemDecorationAt(0) when (layoutType) { - LayoutType.List -> addItemDecoration(DividerItemDecoration(context, RecyclerView.VERTICAL)) + LayoutType.List -> Unit LayoutType.Grid, LayoutType.GridCompact -> addItemDecoration(GridSpacingItemDecoration()) } diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml index 99f8fd8f..058b4a6d 100644 --- a/app/src/main/res/layout/main_activity.xml +++ b/app/src/main/res/layout/main_activity.xml @@ -33,14 +33,14 @@ android:layout_width="30dp" android:layout_height="30dp" android:layout_gravity="center_vertical" - android:layout_marginTop="16dp" android:layout_marginEnd="4dp" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/refresh" android:padding="5dp" android:visibility="invisible" + app:layout_constraintBottom_toBottomOf="@id/sub_text" app:layout_constraintEnd_toStartOf="@id/log_icon" - app:layout_constraintTop_toTopOf="parent" + app:layout_constraintTop_toTopOf="@id/title_text" app:srcCompat="@drawable/ic_refresh" app:tint="?android:attr/textColorSecondary" tools:visibility="visible" /> @@ -50,13 +50,13 @@ android:layout_width="30dp" android:layout_height="30dp" android:layout_gravity="center_vertical" - android:layout_marginTop="16dp" android:layout_marginEnd="4dp" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/log" android:padding="5dp" + app:layout_constraintBottom_toBottomOf="@id/sub_text" app:layout_constraintEnd_toStartOf="@id/settings_icon" - app:layout_constraintTop_toTopOf="parent" + app:layout_constraintTop_toTopOf="@id/title_text" app:srcCompat="@drawable/ic_log" app:tint="?android:attr/textColorSecondary" /> @@ -65,13 +65,13 @@ android:layout_width="30dp" android:layout_height="30dp" android:layout_gravity="center_vertical" - android:layout_marginTop="16dp" android:layout_marginEnd="16dp" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/settings" android:padding="5dp" + app:layout_constraintBottom_toBottomOf="@id/sub_text" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" + app:layout_constraintTop_toTopOf="@id/title_text" app:srcCompat="@drawable/ic_settings" app:tint="?android:attr/textColorSecondary" /> @@ -87,7 +87,22 @@ android:textColor="?android:attr/textColorPrimary" android:textSize="32sp" android:textStyle="bold" - app:layout_constraintTop_toBottomOf="@id/settings_icon" /> + app:layout_constraintEnd_toStartOf="@id/refresh_icon" + app:layout_constraintTop_toTopOf="parent" /> + + + app:layout_constraintTop_toBottomOf="@id/sub_text" />