diff --git a/app_pojavlauncher/src/main/java/com/kdt/mcgui/LauncherMenuButton.java b/app_pojavlauncher/src/main/java/com/kdt/mcgui/LauncherMenuButton.java index be7eefea1..365824e7d 100644 --- a/app_pojavlauncher/src/main/java/com/kdt/mcgui/LauncherMenuButton.java +++ b/app_pojavlauncher/src/main/java/com/kdt/mcgui/LauncherMenuButton.java @@ -39,6 +39,8 @@ public class LauncherMenuButton extends ExtendedButton { setPaddingRelative(padding, 0, 0, 0); setGravity(Gravity.CENTER_VERTICAL); + setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimensionPixelSize(R.dimen._12ssp)); + // Set drawable size int[] sizes = getExtendedViewData().getSizeCompounds(); sizes[0] = resources.getDimensionPixelSize(R.dimen._30sdp); diff --git a/app_pojavlauncher/src/main/java/com/kdt/mcgui/MineButton.java b/app_pojavlauncher/src/main/java/com/kdt/mcgui/MineButton.java index c3fc26049..8d5c65f46 100644 --- a/app_pojavlauncher/src/main/java/com/kdt/mcgui/MineButton.java +++ b/app_pojavlauncher/src/main/java/com/kdt/mcgui/MineButton.java @@ -22,6 +22,7 @@ public class MineButton extends androidx.appcompat.widget.AppCompatButton { public void init() { setTypeface(ResourcesCompat.getFont(getContext(), R.font.noto_sans_bold)); setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.mine_button_background, null)); + setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimensionPixelSize(R.dimen._13ssp)); } } diff --git a/app_pojavlauncher/src/main/java/com/kdt/mcgui/mcVersionSpinner.java b/app_pojavlauncher/src/main/java/com/kdt/mcgui/mcVersionSpinner.java index 3dcea9b46..0a5deb7c7 100644 --- a/app_pojavlauncher/src/main/java/com/kdt/mcgui/mcVersionSpinner.java +++ b/app_pojavlauncher/src/main/java/com/kdt/mcgui/mcVersionSpinner.java @@ -10,6 +10,7 @@ import android.os.Build; import android.os.Bundle; import android.transition.Slide; import android.util.AttributeSet; +import android.util.TypedValue; import android.view.Gravity; import android.view.MotionEvent; import android.view.View; @@ -74,6 +75,7 @@ public class mcVersionSpinner extends ExtendedTextView { /** Initialize various behaviors */ private void init(){ // Setup various attributes + setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimensionPixelSize(R.dimen._12ssp)); setGravity(Gravity.CENTER_VERTICAL); int startPadding = getContext().getResources().getDimensionPixelOffset(R.dimen._17sdp); int endPadding = getContext().getResources().getDimensionPixelOffset(R.dimen._5sdp); diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java index b3c78069f..f74081ad4 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java @@ -32,6 +32,7 @@ public class ControlButton extends TextView implements ControlInterface { setAllCaps(true); setTextColor(Color.WHITE); setPadding(4, 4, 4, 4); + setTextSize(14); // Nullify the default size setting //setOnLongClickListener(this); diff --git a/app_pojavlauncher/src/main/res/layout/activity_import_control.xml b/app_pojavlauncher/src/main/res/layout/activity_import_control.xml index 5aac9e3d1..a6d93ff84 100644 --- a/app_pojavlauncher/src/main/res/layout/activity_import_control.xml +++ b/app_pojavlauncher/src/main/res/layout/activity_import_control.xml @@ -19,7 +19,7 @@ android:layout_height="wrap_content" - android:layout_marginHorizontal="15dp" + android:layout_marginHorizontal="@dimen/_15sdp" android:background="@drawable/menu_background" android:paddingVertical="20dp" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app_pojavlauncher/src/main/res/layout/activity_pojav_launcher.xml b/app_pojavlauncher/src/main/res/layout/activity_pojav_launcher.xml index 498691d26..78a6963e0 100644 --- a/app_pojavlauncher/src/main/res/layout/activity_pojav_launcher.xml +++ b/app_pojavlauncher/src/main/res/layout/activity_pojav_launcher.xml @@ -22,6 +22,8 @@ android:layout_height="@dimen/_52sdp" android:background="?attr/selectableItemBackground" android:src="@drawable/ic_menu_settings" + android:scaleType="fitCenter" + android:paddingVertical="@dimen/_8sdp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app_pojavlauncher/src/main/res/layout/dialog_color_selector.xml b/app_pojavlauncher/src/main/res/layout/dialog_color_selector.xml index 94beb2966..63251af17 100644 --- a/app_pojavlauncher/src/main/res/layout/dialog_color_selector.xml +++ b/app_pojavlauncher/src/main/res/layout/dialog_color_selector.xml @@ -14,7 +14,7 @@ @@ -149,7 +151,7 @@ android:hint=".minecraft" android:paddingHorizontal="@dimen/_12sdp" - android:textSize="@dimen/_14ssp" + android:textSize="@dimen/_13ssp" app:layout_constraintEnd_toStartOf="@id/vprof_editor_path_button" app:layout_constraintStart_toStartOf="parent" @@ -180,6 +182,7 @@ android:layout_marginTop="32dp" android:background="@drawable/background_line" android:paddingVertical="0px" + android:textSize="@dimen/_13ssp" app:layout_constraintTop_toBottomOf="@+id/vprof_editor_path" diff --git a/app_pojavlauncher/src/main/res/layout/start_screen.xml b/app_pojavlauncher/src/main/res/layout/start_screen.xml index 8f042b284..b7ddc3a00 100644 --- a/app_pojavlauncher/src/main/res/layout/start_screen.xml +++ b/app_pojavlauncher/src/main/res/layout/start_screen.xml @@ -12,7 +12,7 @@ android:text="@string/app_short_name" android:textAppearance="?android:attr/textAppearanceLarge" android:fontFamily="@font/noto_sans_bold" - android:textSize="40sp"/> + android:textSize="@dimen/_40ssp"/> @android:color/transparent @style/PreferenceThemeOverlay.v14.Material + @dimen/_12ssp +