MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Partially reverted developer section changes

Browse Source
This commit is contained in:
Viktor De Pasquale 2019-10-26 21:14:01 +02:00
parent a70c0174e1
commit ee7d297ca8
3 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/HomeItems.kt
View File

@ -106,7 +106,7 @@ sealed class DeveloperItem : ComparableRvItem<DeveloperItem>() {
object App : DeveloperItem() { object App : DeveloperItem() {
override val items = override val items =
listOf(HomeItem.PayPal.App, HomeItem.Twitter.App) listOf(HomeItem.PayPal.App, HomeItem.Twitter.App)
override val icon = R.drawable.ic_mainline_dev override val icon = R.drawable.ic_app_dev
override val name = R.string.home_links_app override val name = R.string.home_links_app
} }

7
app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeFragment.kt
View File

@ -1,9 +1,6 @@
package com.topjohnwu.magisk.redesign.home package com.topjohnwu.magisk.redesign.home
import android.graphics.Insets import android.graphics.Insets
import android.os.Bundle
import android.view.View
import androidx.recyclerview.widget.LinearSnapHelper
import com.topjohnwu.magisk.R import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.databinding.FragmentHomeMd2Binding import com.topjohnwu.magisk.databinding.FragmentHomeMd2Binding
import com.topjohnwu.magisk.redesign.compat.CompatFragment import com.topjohnwu.magisk.redesign.compat.CompatFragment
@ -21,8 +18,4 @@ class HomeFragment : CompatFragment<HomeViewModel, FragmentHomeMd2Binding>() {
activity.title = resources.getString(R.string.section_home) activity.title = resources.getString(R.string.section_home)
} }
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
LinearSnapHelper().attachToRecyclerView(binding.homeSupportList)
}
} }

36
app/src/main/res/layout/fragment_home_md2.xml
View File

@ -698,19 +698,35 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.recyclerview.widget.RecyclerView <include
android:id="@+id/home_support_list" item="@{viewModel.items[0]}"
dividerHorizontal="@{R.drawable.divider_l1}" layout="@layout/item_developer"
itemBinding="@{viewModel.itemDeveloperBinding}" viewModel="@{viewModel}"
items="@{viewModel.items}"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/l1"
android:layout_marginTop="@dimen/l1" android:layout_marginTop="@dimen/l1"
android:clipToPadding="false" android:layout_marginEnd="@dimen/l1" />
android:orientation="horizontal"
android:paddingStart="@dimen/l1" <include
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" item="@{viewModel.items[1]}"
tools:listitem="@layout/item_developer" /> layout="@layout/item_developer"
viewModel="@{viewModel}"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/l1"
android:layout_marginTop="@dimen/l1"
android:layout_marginEnd="@dimen/l1" />
<include
item="@{viewModel.items[2]}"
layout="@layout/item_developer"
viewModel="@{viewModel}"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/l1"
android:layout_marginTop="@dimen/l1"
android:layout_marginEnd="@dimen/l1" />
</LinearLayout> </LinearLayout>