TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-16 08:05:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Style: unify even more text and layout size

Browse Source
This commit is contained in:
Mathias-Boulay 2022-12-13 23:58:45 +01:00
parent 1058750a1a
commit 1faaecaf49
10 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app_pojavlauncher/src/main/java/com/kdt/mcgui/LauncherMenuButton.java
View File

@ -39,6 +39,8 @@ public class LauncherMenuButton extends ExtendedButton {
setPaddingRelative(padding, 0, 0, 0); setPaddingRelative(padding, 0, 0, 0);
setGravity(Gravity.CENTER_VERTICAL); setGravity(Gravity.CENTER_VERTICAL);
setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimensionPixelSize(R.dimen._12ssp));
// Set drawable size // Set drawable size
int[] sizes = getExtendedViewData().getSizeCompounds(); int[] sizes = getExtendedViewData().getSizeCompounds();
sizes[0] = resources.getDimensionPixelSize(R.dimen._30sdp); sizes[0] = resources.getDimensionPixelSize(R.dimen._30sdp);

1
app_pojavlauncher/src/main/java/com/kdt/mcgui/MineButton.java
View File

@ -22,6 +22,7 @@ public class MineButton extends androidx.appcompat.widget.AppCompatButton {
public void init() { public void init() {
setTypeface(ResourcesCompat.getFont(getContext(), R.font.noto_sans_bold)); setTypeface(ResourcesCompat.getFont(getContext(), R.font.noto_sans_bold));
setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.mine_button_background, null)); setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.mine_button_background, null));
setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimensionPixelSize(R.dimen._13ssp));
} }
} }

2
app_pojavlauncher/src/main/java/com/kdt/mcgui/mcVersionSpinner.java
View File

@ -10,6 +10,7 @@ import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.transition.Slide; import android.transition.Slide;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.Gravity; import android.view.Gravity;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
@ -74,6 +75,7 @@ public class mcVersionSpinner extends ExtendedTextView {
/** Initialize various behaviors */ /** Initialize various behaviors */
private void init(){ private void init(){
// Setup various attributes // Setup various attributes
setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimensionPixelSize(R.dimen._12ssp));
setGravity(Gravity.CENTER_VERTICAL); setGravity(Gravity.CENTER_VERTICAL);
int startPadding = getContext().getResources().getDimensionPixelOffset(R.dimen._17sdp); int startPadding = getContext().getResources().getDimensionPixelOffset(R.dimen._17sdp);
int endPadding = getContext().getResources().getDimensionPixelOffset(R.dimen._5sdp); int endPadding = getContext().getResources().getDimensionPixelOffset(R.dimen._5sdp);

1
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java
View File

@ -32,6 +32,7 @@ public class ControlButton extends TextView implements ControlInterface {
setAllCaps(true); setAllCaps(true);
setTextColor(Color.WHITE); setTextColor(Color.WHITE);
setPadding(4, 4, 4, 4); setPadding(4, 4, 4, 4);
setTextSize(14); // Nullify the default size setting
//setOnLongClickListener(this); //setOnLongClickListener(this);

2
app_pojavlauncher/src/main/res/layout/activity_import_control.xml
View File

@ -19,7 +19,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp" android:layout_marginHorizontal="@dimen/_15sdp"
android:background="@drawable/menu_background" android:background="@drawable/menu_background"
android:paddingVertical="20dp" android:paddingVertical="20dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"

2
app_pojavlauncher/src/main/res/layout/activity_pojav_launcher.xml
View File

@ -22,6 +22,8 @@
android:layout_height="@dimen/_52sdp" android:layout_height="@dimen/_52sdp"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:src="@drawable/ic_menu_settings" android:src="@drawable/ic_menu_settings"
android:scaleType="fitCenter"
android:paddingVertical="@dimen/_8sdp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

6
app_pojavlauncher/src/main/res/layout/dialog_color_selector.xml
View File

@ -14,7 +14,7 @@
<net.kdt.pojavlaunch.colorselector.SVRectangleView <net.kdt.pojavlaunch.colorselector.SVRectangleView
android:id="@+id/color_selector_rectangle_view" android:id="@+id/color_selector_rectangle_view"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="150dp" android:layout_height="@dimen/_150sdp"
android:focusable="true" android:focusable="true"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
@ -25,7 +25,7 @@
<net.kdt.pojavlaunch.colorselector.ColorSideBySideView <net.kdt.pojavlaunch.colorselector.ColorSideBySideView
android:id="@+id/color_selector_color_view" android:id="@+id/color_selector_color_view"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="94dp" android:layout_height="@dimen/_94sdp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
app:layout_constraintEnd_toEndOf="@+id/color_selector_rectangle_view" app:layout_constraintEnd_toEndOf="@+id/color_selector_rectangle_view"
app:layout_constraintStart_toStartOf="@+id/color_selector_rectangle_view" app:layout_constraintStart_toStartOf="@+id/color_selector_rectangle_view"
@ -39,7 +39,7 @@
android:gravity="center" android:gravity="center"
android:importantForAutofill="no" android:importantForAutofill="no"
android:inputType="text" android:inputType="text"
android:minHeight="48dp" android:minHeight="@dimen/_48sdp"
android:typeface="monospace" android:typeface="monospace"
app:layout_constraintEnd_toEndOf="@+id/color_selector_color_view" app:layout_constraintEnd_toEndOf="@+id/color_selector_color_view"
app:layout_constraintStart_toStartOf="@+id/color_selector_color_view" app:layout_constraintStart_toStartOf="@+id/color_selector_color_view"

9
app_pojavlauncher/src/main/res/layout/fragment_profile_editor.xml
View File

@ -29,6 +29,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/_24sdp" android:layout_marginTop="@dimen/_24sdp"
android:background="@drawable/background_line" android:background="@drawable/background_line"
android:textSize="@dimen/_13ssp"
android:ems="10" android:ems="10"
android:hint="@string/unnamed" android:hint="@string/unnamed"
@ -54,7 +55,7 @@
android:background="@drawable/background_line" android:background="@drawable/background_line"
android:hint="Select a version" android:hint="Select a version"
android:paddingHorizontal="@dimen/_12sdp" android:paddingHorizontal="@dimen/_12sdp"
android:textSize="@dimen/_14sdp" android:textSize="@dimen/_13ssp"
app:layout_constraintEnd_toStartOf="@+id/vprof_editor_version_button" app:layout_constraintEnd_toStartOf="@+id/vprof_editor_version_button"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -89,7 +90,7 @@
android:background="@drawable/background_line" android:background="@drawable/background_line"
android:hint="@string/use_global_default" android:hint="@string/use_global_default"
android:paddingHorizontal="@dimen/_12sdp" android:paddingHorizontal="@dimen/_12sdp"
android:textSize="@dimen/_14sdp" android:textSize="@dimen/_13ssp"
app:layout_constraintEnd_toStartOf="@id/vprof_editor_ctrl_button" app:layout_constraintEnd_toStartOf="@id/vprof_editor_ctrl_button"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -125,6 +126,7 @@
android:hint="@string/use_global_default" android:hint="@string/use_global_default"
android:inputType="text" android:inputType="text"
android:paddingHorizontal="@dimen/_12sdp" android:paddingHorizontal="@dimen/_12sdp"
android:textSize="@dimen/_13ssp"
app:layout_constraintTop_toBottomOf="@+id/vprof_editor_ctrl_spinner" /> app:layout_constraintTop_toBottomOf="@+id/vprof_editor_ctrl_spinner" />
@ -149,7 +151,7 @@
android:hint=".minecraft" android:hint=".minecraft"
android:paddingHorizontal="@dimen/_12sdp" android:paddingHorizontal="@dimen/_12sdp"
android:textSize="@dimen/_14ssp" android:textSize="@dimen/_13ssp"
app:layout_constraintEnd_toStartOf="@id/vprof_editor_path_button" app:layout_constraintEnd_toStartOf="@id/vprof_editor_path_button"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -180,6 +182,7 @@
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
android:background="@drawable/background_line" android:background="@drawable/background_line"
android:paddingVertical="0px" android:paddingVertical="0px"
android:textSize="@dimen/_13ssp"
app:layout_constraintTop_toBottomOf="@+id/vprof_editor_path" app:layout_constraintTop_toBottomOf="@+id/vprof_editor_path"

2
app_pojavlauncher/src/main/res/layout/start_screen.xml
View File

@ -12,7 +12,7 @@
android:text="@string/app_short_name" android:text="@string/app_short_name"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:fontFamily="@font/noto_sans_bold" android:fontFamily="@font/noto_sans_bold"
android:textSize="40sp"/> android:textSize="@dimen/_40ssp"/>
<TextView <TextView
android:layout_height="wrap_content" android:layout_height="wrap_content"

2
app_pojavlauncher/src/main/res/values/styles.xml
View File

@ -9,5 +9,7 @@
<item name="android:navigationBarColor">@android:color/transparent</item> <item name="android:navigationBarColor">@android:color/transparent</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item> <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="android:textSize">@dimen/_12ssp</item>
</style> </style>
</resources> </resources>