Skip to content

Commit 204f4c7

Browse files
lingqiqi5211lingqiqi5211
committed
Merge remote-tracking branch 'origin3/main' into main2
2 parents 467451b + 29dcc00 commit 204f4c7

9 files changed

Lines changed: 100 additions & 12 deletions

File tree

‎app/src/main/java/com/sevtinge/hyperceiler/ui/base/NavigationActivity.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*/
1919
package com.sevtinge.hyperceiler.ui.base;
2020

21+
import static com.sevtinge.hyperceiler.utils.DisplayUtils.dip2px;
2122
import static com.sevtinge.hyperceiler.utils.Helpers.isDarkMode;
2223

2324
import android.content.Context;
@@ -173,16 +174,12 @@ private void addPaddingForRadioButton(View view, Context context) {
173174
public WindowInsetsCompat onApplyWindowInsets(@NonNull View v, @NonNull WindowInsetsCompat insets) {
174175
Insets inset = Insets.max(insets.getInsets(WindowInsetsCompat.Type.systemBars()),
175176
insets.getInsets(WindowInsetsCompat.Type.displayCutout()));
176-
v.setPadding(0, dpToPx(10, context), 0, inset.bottom + dpToPx(18, context));
177+
v.setPadding(0, dip2px(context, 10), 0, inset.bottom + dip2px(context, 18));
177178
return insets;
178179
}
179180
});
180181
}
181182

182-
private static int dpToPx(int dp, Context context) {
183-
return (int) (dp * context.getResources().getDisplayMetrics().density);
184-
}
185-
186183
private void changeSelect(int position) {
187184
switch (position) {
188185
case 0 -> {

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,22 @@
1818
*/
1919
package com.sevtinge.hyperceiler.ui.fragment;
2020

21+
import static com.sevtinge.hyperceiler.utils.DisplayUtils.dip2px;
22+
import static com.sevtinge.hyperceiler.utils.DisplayUtils.sp2px;
2123
import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreHyperOSVersion;
2224

2325
import android.content.Intent;
2426
import android.net.Uri;
27+
import android.os.Bundle;
28+
import android.view.View;
29+
30+
import androidx.annotation.NonNull;
31+
import androidx.annotation.Nullable;
32+
import androidx.core.graphics.Insets;
33+
import androidx.core.view.OnApplyWindowInsetsListener;
34+
import androidx.core.view.ViewCompat;
35+
import androidx.core.view.WindowInsetsCompat;
36+
import androidx.recyclerview.widget.RecyclerView;
2537

2638
import com.sevtinge.hyperceiler.BuildConfig;
2739
import com.sevtinge.hyperceiler.R;
@@ -92,4 +104,22 @@ private void joinQQGroup(String key) {
92104
// 未安装手Q或安装的版本不支持
93105
}
94106
}
107+
108+
@Override
109+
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
110+
super.onViewCreated(view, savedInstanceState);
111+
112+
RecyclerView recyclerView = view.findViewById(moralnorm.preference.R.id.recycler_view);
113+
ViewCompat.setOnApplyWindowInsetsListener(recyclerView, new OnApplyWindowInsetsListener() {
114+
@NonNull
115+
@Override
116+
public WindowInsetsCompat onApplyWindowInsets(@NonNull View v, @NonNull WindowInsetsCompat insets) {
117+
Insets inset = Insets.max(insets.getInsets(WindowInsetsCompat.Type.systemBars()),
118+
insets.getInsets(WindowInsetsCompat.Type.displayCutout()));
119+
// 22dp + 2dp + 12sp + 10dp + 18dp + 0.5dp + inset.bottom + 4dp(?)
120+
v.setPadding(inset.left, 0, inset.right, inset.bottom + dip2px(requireContext(), 56.5F) + sp2px(requireContext(),12));
121+
return insets;
122+
}
123+
});
124+
}
95125
}

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,24 @@
1818
*/
1919
package com.sevtinge.hyperceiler.ui.fragment;
2020

21+
import static com.sevtinge.hyperceiler.utils.DisplayUtils.dip2px;
22+
import static com.sevtinge.hyperceiler.utils.DisplayUtils.sp2px;
2123
import static com.sevtinge.hyperceiler.utils.api.VoyagerApisKt.isPad;
2224
import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.getRomAuthor;
2325
import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isAndroidVersion;
2426
import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreHyperOSVersion;
2527

28+
import android.os.Bundle;
29+
import android.view.View;
30+
31+
import androidx.annotation.NonNull;
32+
import androidx.annotation.Nullable;
33+
import androidx.core.graphics.Insets;
34+
import androidx.core.view.OnApplyWindowInsetsListener;
35+
import androidx.core.view.ViewCompat;
36+
import androidx.core.view.WindowInsetsCompat;
37+
import androidx.recyclerview.widget.RecyclerView;
38+
2639
import com.sevtinge.hyperceiler.R;
2740
import com.sevtinge.hyperceiler.ui.MainActivityContextHelper;
2841
import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment;
@@ -119,4 +132,22 @@ public void isSignPass() {
119132
mHeadtipWarn.setTitle(R.string.headtip_warn_sign_verification_failed);
120133
mHeadtipWarn.setVisible(!mainActivityContextHelper.isSignCheckPass());
121134
}
135+
136+
@Override
137+
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
138+
super.onViewCreated(view, savedInstanceState);
139+
140+
RecyclerView recyclerView = view.findViewById(moralnorm.preference.R.id.recycler_view);
141+
ViewCompat.setOnApplyWindowInsetsListener(recyclerView, new OnApplyWindowInsetsListener() {
142+
@NonNull
143+
@Override
144+
public WindowInsetsCompat onApplyWindowInsets(@NonNull View v, @NonNull WindowInsetsCompat insets) {
145+
Insets inset = Insets.max(insets.getInsets(WindowInsetsCompat.Type.systemBars()),
146+
insets.getInsets(WindowInsetsCompat.Type.displayCutout()));
147+
// 22dp + 2dp + 12sp + 10dp + 18dp + 0.5dp + inset.bottom + 4dp(?)
148+
v.setPadding(inset.left, 0, inset.right, inset.bottom + dip2px(requireContext(), 56.5F) + sp2px(requireContext(),12));
149+
return insets;
150+
}
151+
});
152+
}
122153
}

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,24 @@
1818
*/
1919
package com.sevtinge.hyperceiler.ui.fragment.settings;
2020

21+
import static com.sevtinge.hyperceiler.utils.DisplayUtils.dip2px;
22+
import static com.sevtinge.hyperceiler.utils.DisplayUtils.sp2px;
23+
2124
import android.app.Activity;
2225
import android.content.ComponentName;
2326
import android.content.pm.PackageManager;
27+
import android.os.Bundle;
28+
import android.view.View;
2429
import android.widget.Toast;
2530

31+
import androidx.annotation.NonNull;
32+
import androidx.annotation.Nullable;
33+
import androidx.core.graphics.Insets;
34+
import androidx.core.view.OnApplyWindowInsetsListener;
35+
import androidx.core.view.ViewCompat;
36+
import androidx.core.view.WindowInsetsCompat;
37+
import androidx.recyclerview.widget.RecyclerView;
38+
2639
import com.sevtinge.hyperceiler.BuildConfig;
2740
import com.sevtinge.hyperceiler.R;
2841
import com.sevtinge.hyperceiler.ui.LauncherActivity;
@@ -147,4 +160,22 @@ public void backupSettings(Activity activity) {
147160
public void restoreSettings(Activity activity) {
148161
BackupUtils.restore(activity);
149162
}
163+
164+
@Override
165+
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
166+
super.onViewCreated(view, savedInstanceState);
167+
168+
RecyclerView recyclerView = view.findViewById(moralnorm.preference.R.id.recycler_view);
169+
ViewCompat.setOnApplyWindowInsetsListener(recyclerView, new OnApplyWindowInsetsListener() {
170+
@NonNull
171+
@Override
172+
public WindowInsetsCompat onApplyWindowInsets(@NonNull View v, @NonNull WindowInsetsCompat insets) {
173+
Insets inset = Insets.max(insets.getInsets(WindowInsetsCompat.Type.systemBars()),
174+
insets.getInsets(WindowInsetsCompat.Type.displayCutout()));
175+
// 22dp + 2dp + 12sp + 10dp + 18dp + 0.5dp + inset.bottom + 4dp(?)
176+
v.setPadding(inset.left, 0, inset.right, inset.bottom + dip2px(requireContext(), 56.5F) + sp2px(requireContext(),12));
177+
return insets;
178+
}
179+
});
180+
}
150181
}

‎app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/development/DevelopmentDebugInfoFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import static com.sevtinge.hyperceiler.utils.devicesdk.DeviceSDKKt.getManufacture;
2929
import static com.sevtinge.hyperceiler.utils.devicesdk.DeviceSDKKt.getMarketName;
3030
import static com.sevtinge.hyperceiler.utils.devicesdk.DeviceSDKKt.getModelName;
31-
import static com.sevtinge.hyperceiler.utils.devicesdk.DeviceSDKKt.getSerial;
31+
// import static com.sevtinge.hyperceiler.utils.devicesdk.DeviceSDKKt.getSerial;
3232
import static com.sevtinge.hyperceiler.utils.devicesdk.DeviceSDKKt.getSoc;
3333
import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.getAndroidVersion;
3434
import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.getBuildDate;

‎app/src/main/java/com/sevtinge/hyperceiler/utils/DisplayUtils.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ public static int dip2px(Context context, float dipValue) {
4949
return (int) (dipValue * scale + 0.5f);
5050
}
5151

52+
public static int sp2px(Context context, float spValue) {
53+
final float scale = context.getResources().getDisplayMetrics().scaledDensity;
54+
return (int) (spValue * scale + 0.5f);
55+
}
56+
5257
public static int px2dip(Context context, float pxValue) {
5358
final float scale = context.getResources().getDisplayMetrics().density;
5459
return (int) (pxValue / scale + 0.5f);

‎app/src/main/res/xml/prefs_about.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,4 @@
155155

156156
</PreferenceCategory>
157157

158-
<Preference android:enabled="false" />
159-
160158
</PreferenceScreen>

‎app/src/main/res/xml/prefs_main.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,8 +396,6 @@
396396
android:layout="@layout/preference_text"
397397
android:summary="@string/tip_default" />
398398

399-
<Preference android:enabled="false" />
400-
401399
</PreferenceCategory>
402400

403401
</PreferenceScreen>

‎app/src/main/res/xml/prefs_settings.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,4 @@
6363

6464
</PreferenceCategory>
6565

66-
<Preference android:enabled="false" />
67-
6866
</PreferenceScreen>

0 commit comments

Comments
 (0)