Skip to content

Commit 7c9105a

Browse files
Fan095Fan095
committed
opt recommend tips
1 parent e1a8314 commit 7c9105a

7 files changed

Lines changed: 40 additions & 14 deletions

File tree

‎app/src/main/java/com/sevtinge/hyperceiler/prefs/RecommendPreference.java‎

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,19 @@
4343
import java.util.List;
4444

4545
import fan.animation.Folme;
46+
import fan.preference.FolmeAnimationController;
47+
import fan.preference.PreferenceExtraPadding;
48+
import fan.preference.PreferenceStyle;
4649

47-
public class RecommendPreference extends Preference {
50+
public class RecommendPreference extends Preference
51+
implements FolmeAnimationController, PreferenceExtraPadding, PreferenceStyle {
4852

4953
private Context mContext;
5054
private int mTopMargin;
5155
private boolean mNeedClear;
5256
private String mRecommendTips;
5357
private TextView mRecommendTipsTv;
54-
private List<RelativeLayout> mItemList;
58+
private List<RelativeLayout> mItemList = new ArrayList<>();
5559
private LinearLayout mLinearLayout;
5660

5761
public RecommendPreference(@NonNull Context context) {
@@ -67,11 +71,6 @@ public RecommendPreference(Context context, int topMargin, boolean needClear) {
6771

6872
public RecommendPreference(@NonNull Context context, @Nullable AttributeSet attrs) {
6973
super(context, attrs);
70-
mItemList = new ArrayList<>();
71-
init();
72-
}
73-
74-
private void init() {
7574
setLayoutResource(R.layout.preference_recommend);
7675
}
7776

@@ -150,4 +149,26 @@ public void setRecommendTips(String tips) {
150149
mRecommendTips = tips;
151150
notifyChanged();
152151
}
152+
153+
@Override
154+
public boolean isEnabledCardStyle() {
155+
return false;
156+
}
157+
158+
@Override
159+
public boolean isTouchAnimationEnable() {
160+
return false;
161+
}
162+
163+
@Override
164+
public void onPreferenceExtraPadding(PreferenceViewHolder holder, int i) {
165+
View view = holder.itemView;
166+
float f = i;
167+
view.setPadding(
168+
(int) (view.getContext().getResources().getDimension(R.dimen.miuix_preference_checkable_item_mask_padding_start) + f),
169+
view.getPaddingTop(),
170+
(int) (view.getContext().getResources().getDimension(R.dimen.miuix_preference_checkable_item_bg_padding_end) + f),
171+
view.getPaddingBottom()
172+
);
173+
}
153174
}

‎app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/app/NfcFragment.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@
2828
import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment;
2929

3030
public class NfcFragment extends SettingsPreferenceFragment {
31+
3132
RecommendPreference mRecommend;
33+
3234
@Override
3335
public int getPreferenceScreenResId() {
3436
return R.xml.nfc;

‎app/src/main/res/layout/preference_recommend.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
android:id="@+id/line_layout"
2727
android:layout_width="match_parent"
2828
android:layout_height="wrap_content"
29-
android:layout_margin="@dimen/preference_recommend_region_margin"
29+
android:layout_marginBottom="@dimen/preference_recommend_region_margin"
3030
android:background="@drawable/preference_recommend_background"
3131
android:orientation="vertical"
3232
android:paddingBottom="@dimen/preference_recommend_region_padding_bottom">
@@ -36,7 +36,7 @@
3636
android:layout_width="wrap_content"
3737
android:layout_height="wrap_content"
3838
android:layout_marginHorizontal="@dimen/preference_recommend_title_margin_horizontal"
39-
android:layout_marginVertical="@dimen/preference_recommend_title_margin_top"
39+
android:layout_marginTop="@dimen/preference_recommend_title_margin_top"
4040
android:layout_marginBottom="@dimen/preference_recommend_title_margin_bottom"
4141
android:text="@string/preference_recommend_tip"
4242
android:textColor="@color/preference_recommend_title_color"

‎app/src/main/res/layout/preference_recommend_item.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
android:id="@+id/recommend_item"
3131
android:layout_width="wrap_content"
3232
android:layout_height="wrap_content"
33-
android:layout_marginStart="@dimen/preference_recommend_item_margin_start"
33+
android:layout_marginHorizontal="@dimen/preference_recommend_item_margin_horizontal"
3434
android:layout_marginTop="@dimen/preference_recommend_item_margin_vertical"
3535
android:layout_marginBottom="@dimen/preference_recommend_item_margin_vertical"
3636
android:fontFamily="sans-serif-medium"

‎app/src/main/res/values-night/colors.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<color name="color_on_surface_variant">#FAABABAD</color>
3131
<color name="color_surface_variant">#DC2E2E30</color>
3232

33-
<color name="preference_recommend_region_color">#ff222224</color>
33+
<color name="preference_recommend_region_color">@color/miuix_color_white_level8</color>
3434
<color name="preference_recommend_title_color">#ffffffff</color>
3535

3636
<color name="preference_recommend_item_link">#ff0097ff</color>

‎app/src/main/res/values/colors.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<color name="color_on_surface_variant">#FAFCFCFC</color>
4444
<color name="ic_launcher_background">#FC5B8D</color>
4545

46-
<color name="preference_recommend_region_color">#fff0f0f0</color>
46+
<color name="preference_recommend_region_color">@color/miuix_color_white_solid_100</color>
4747
<color name="preference_recommend_title_color">#66000000</color>
4848

4949
<color name="preference_recommend_item_link">#ff0d84ff</color>

‎app/src/main/res/values/dimens.xml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@
5555

5656
<dimen name="preference_recommend_radius">13.089998dp</dimen>
5757
<dimen name="preference_recommend_region_margin">12dp</dimen>
58-
<dimen name="preference_recommend_region_padding_bottom">15.639984dp</dimen>
58+
<dimen name="preference_recommend_region_padding_bottom">4dp</dimen>
5959
<dimen name="preference_recommend_title_margin_top">22.549988dp</dimen>
6060
<dimen name="preference_recommend_title_margin_bottom">12.359985dp</dimen>
6161
<dimen name="preference_recommend_title_margin_horizontal">21.819977dp</dimen>
6262

63-
<dimen name="preference_recommend_item_margin_start">21.819977dp</dimen>
63+
<dimen name="preference_recommend_item_margin_horizontal">16dp</dimen>
6464
<dimen name="preference_recommend_item_margin_vertical">10.179993dp</dimen>
6565

6666

@@ -91,4 +91,7 @@
9191
<dimen name="about_copy_right_padding_edge">28dp</dimen>
9292

9393
<dimen name="preference_item_padding">16dp</dimen>
94+
95+
<dimen name="miuix_preference_checkable_item_bg_padding_end">@dimen/miuix_theme_padding_horizontal_common</dimen>
96+
<dimen name="miuix_preference_checkable_item_mask_padding_start">@dimen/miuix_theme_padding_horizontal_common</dimen>
9497
</resources>

0 commit comments

Comments
 (0)