diff --git a/app/src/main/java/org/levimc/launcher/ui/activities/BaseActivity.java b/app/src/main/java/org/levimc/launcher/ui/activities/BaseActivity.java index 443b23900..8cc60dfe1 100644 --- a/app/src/main/java/org/levimc/launcher/ui/activities/BaseActivity.java +++ b/app/src/main/java/org/levimc/launcher/ui/activities/BaseActivity.java @@ -430,18 +430,15 @@ private void styleNavTab(@Nullable View view, boolean active) { int accent = pm.getAccentColor(dark); float density = getResources().getDisplayMetrics().density; if (navbar) { - int text = ContextCompat.getColor(this, R.color.text_primary); + // As in v1.6.1: no pill behind the active tab; it is bold in the primary text color and + // the other tabs use the secondary text color. + int text = ContextCompat.getColor(this, active ? R.color.text_primary : R.color.text_secondary); tab.setTextColor(text); - tab.setTypeface(tab.getTypeface(), active ? Typeface.BOLD : Typeface.NORMAL); + tab.setTypeface(Typeface.create(tab.getTypeface(), active ? Typeface.BOLD : Typeface.NORMAL)); TextViewCompat.setCompoundDrawableTintList(tab, ColorStateList.valueOf(text)); - if (active) { - GradientDrawable bg = new GradientDrawable(); - bg.setCornerRadius(12 * density); - bg.setColor(ContextCompat.getColor(this, R.color.surface_variant)); - tab.setBackground(bg); - } else { - tab.setBackgroundResource(R.drawable.bg_shell_icon_button); - } + android.util.TypedValue ripple = new android.util.TypedValue(); + getTheme().resolveAttribute(android.R.attr.selectableItemBackground, ripple, true); + tab.setBackgroundResource(ripple.resourceId); } else { int icon = active ? ThemePalette.foreground(accent, dark) : ContextCompat.getColor(this, R.color.ui_muted); TextViewCompat.setCompoundDrawableTintList(tab, ColorStateList.valueOf(icon)); diff --git a/app/src/main/java/org/levimc/launcher/ui/activities/ExternalModsActivity.java b/app/src/main/java/org/levimc/launcher/ui/activities/ExternalModsActivity.java index fabada0a2..5c60c49af 100644 --- a/app/src/main/java/org/levimc/launcher/ui/activities/ExternalModsActivity.java +++ b/app/src/main/java/org/levimc/launcher/ui/activities/ExternalModsActivity.java @@ -19,7 +19,7 @@ import androidx.appcompat.widget.PopupMenu; import androidx.core.widget.CompoundButtonCompat; import androidx.lifecycle.ViewModelProvider; -import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.button.MaterialButton; @@ -124,7 +124,9 @@ private void bindViews() { } private void setupRecycler() { - recycler.setLayoutManager(new LinearLayoutManager(this)); + // v1.6.1 grid: about 3 cards across on a landscape phone, at least one. + int spans = Math.max(1, getResources().getConfiguration().screenWidthDp / 280); + recycler.setLayoutManager(new GridLayoutManager(this, spans)); adapter = new ExternalModsAdapter(minecraftVersion, this::handleModAction); recycler.setAdapter(adapter); } diff --git a/app/src/main/java/org/levimc/launcher/ui/widget/SegmentedControl.java b/app/src/main/java/org/levimc/launcher/ui/widget/SegmentedControl.java index 3bb27b2d4..bfc985662 100644 --- a/app/src/main/java/org/levimc/launcher/ui/widget/SegmentedControl.java +++ b/app/src/main/java/org/levimc/launcher/ui/widget/SegmentedControl.java @@ -40,7 +40,7 @@ public interface OnSegmentSelectedListener { private int selected = -1; private boolean equalWidth = true; private boolean vertical; - private float textSizeSp = 14f; + private float textSizeSp = 13f; @Nullable private Typeface baseTypeface; @Nullable @@ -53,11 +53,10 @@ public SegmentedControl(Context context) { public SegmentedControl(Context context, @Nullable AttributeSet attrs) { super(context, attrs); setOrientation(HORIZONTAL); - setBackgroundResource(R.drawable.bg_ui_segment_track); - int pad = dp(4); - setPadding(pad, pad, pad, pad); - setMinimumHeight(dp(48)); + // Horizontal (the default, stacked pages): v1.6.1 tab pills, separate 32dp pills with 8dp gaps + // and no track. Vertical (two-pane side panel) keeps the track. setGravity(Gravity.CENTER_VERTICAL); + applyTrack(); } /** True (default): segments share the width. False: each segment wraps its label (scrollable rows). */ @@ -74,11 +73,14 @@ public void setVertical(boolean vertical) { this.vertical = vertical; setOrientation(vertical ? VERTICAL : HORIZONTAL); setGravity(vertical ? Gravity.NO_GRAVITY : Gravity.CENTER_VERTICAL); + applyTrack(); for (TextView t : segments) { t.setGravity(vertical ? Gravity.CENTER_VERTICAL | Gravity.START : Gravity.CENTER); - t.setMinHeight(dp(vertical ? 44 : 40)); + t.setMinHeight(dp(vertical ? 44 : 32)); + t.setPadding(dp(vertical ? 14 : 16), 0, dp(vertical ? 14 : 16), 0); t.setLayoutParams(segmentParams()); } + applyState(); } public void setTextSizeSp(float sp) { @@ -103,8 +105,8 @@ public int addSegment(CharSequence label, int iconRes) { t.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSizeSp); if (baseTypeface == null) baseTypeface = ResourcesCompat.getFont(getContext(), R.font.misans); t.setTypeface(baseTypeface); - t.setMinHeight(dp(vertical ? 44 : 40)); - t.setPadding(dp(14), 0, dp(14), 0); + t.setMinHeight(dp(vertical ? 44 : 32)); + t.setPadding(dp(vertical ? 14 : 16), 0, dp(vertical ? 14 : 16), 0); if (iconRes != 0) { Drawable d = ContextCompat.getDrawable(getContext(), iconRes); if (d != null) { @@ -125,9 +127,23 @@ public int addSegment(CharSequence label, int iconRes) { private LayoutParams segmentParams() { if (vertical) return new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT); - return equalWidth - ? new LayoutParams(0, LayoutParams.WRAP_CONTENT, 1f) - : new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); + // v1.6.1 tab pills size to their label, 8dp apart. + LayoutParams lp = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); + lp.setMarginEnd(dp(8)); + return lp; + } + + private void applyTrack() { + if (vertical) { + setBackgroundResource(R.drawable.bg_ui_segment_track); + int pad = dp(4); + setPadding(pad, pad, pad, pad); + setMinimumHeight(dp(48)); + } else { + setBackground(null); + setPadding(0, 0, 0, 0); + setMinimumHeight(0); + } } public void setOnSegmentSelectedListener(@Nullable OnSegmentSelectedListener listener) { @@ -159,7 +175,8 @@ private void applyState() { for (int i = 0; i < segments.size(); i++) { TextView t = segments.get(i); boolean on = i == selected; - t.setBackgroundResource(on ? R.drawable.bg_ui_segment_selected : 0); + t.setBackgroundResource(on ? R.drawable.bg_ui_segment_selected + : vertical ? 0 : R.drawable.bg_ui_segment_track); t.setElevation(on ? dp(1) : 0); t.setTextColor(on ? active : inactive); t.setTypeface(Typeface.create(baseTypeface, on ? Typeface.BOLD : Typeface.NORMAL)); diff --git a/app/src/main/java/org/levimc/launcher/util/UiSettings.java b/app/src/main/java/org/levimc/launcher/util/UiSettings.java index 782abf9de..ef3aa2a3b 100644 --- a/app/src/main/java/org/levimc/launcher/util/UiSettings.java +++ b/app/src/main/java/org/levimc/launcher/util/UiSettings.java @@ -51,7 +51,7 @@ public static int getLayoutGeneration() { // ---- Layout and motion ---- public static String getLayoutMode(Context context) { - String mode = prefs(context).getString(KEY_LAYOUT_MODE, LAYOUT_SIDEBAR); + String mode = prefs(context).getString(KEY_LAYOUT_MODE, LAYOUT_NAVBAR); return LAYOUT_NAVBAR.equals(mode) ? LAYOUT_NAVBAR : LAYOUT_SIDEBAR; } @@ -72,7 +72,7 @@ public static void setLayoutMode(Context context, String mode) { * header card on top. */ public static boolean useTwoPane(Context context) { - return prefs(context).getBoolean(KEY_TWO_PANE, true); + return prefs(context).getBoolean(KEY_TWO_PANE, false); } public static void setTwoPane(Context context, boolean twoPane) { diff --git a/app/src/main/res/drawable/bg_shell_icon_button.xml b/app/src/main/res/drawable/bg_shell_icon_button.xml index add47ed5e..05395621d 100644 --- a/app/src/main/res/drawable/bg_shell_icon_button.xml +++ b/app/src/main/res/drawable/bg_shell_icon_button.xml @@ -3,7 +3,7 @@ - + diff --git a/app/src/main/res/drawable/bg_ui_card.xml b/app/src/main/res/drawable/bg_ui_card.xml index e1fd2e359..ef7c0e040 100644 --- a/app/src/main/res/drawable/bg_ui_card.xml +++ b/app/src/main/res/drawable/bg_ui_card.xml @@ -2,6 +2,5 @@ - - + diff --git a/app/src/main/res/drawable/bg_ui_card_inner.xml b/app/src/main/res/drawable/bg_ui_card_inner.xml index e6b26e6af..2c707ff38 100644 --- a/app/src/main/res/drawable/bg_ui_card_inner.xml +++ b/app/src/main/res/drawable/bg_ui_card_inner.xml @@ -2,6 +2,6 @@ - + diff --git a/app/src/main/res/drawable/bg_ui_icon_chip.xml b/app/src/main/res/drawable/bg_ui_icon_chip.xml index 40fa9c424..71e6f9144 100644 --- a/app/src/main/res/drawable/bg_ui_icon_chip.xml +++ b/app/src/main/res/drawable/bg_ui_icon_chip.xml @@ -2,5 +2,5 @@ - + diff --git a/app/src/main/res/drawable/bg_ui_input.xml b/app/src/main/res/drawable/bg_ui_input.xml index 64655404c..6481653c7 100644 --- a/app/src/main/res/drawable/bg_ui_input.xml +++ b/app/src/main/res/drawable/bg_ui_input.xml @@ -4,14 +4,14 @@ - + - + diff --git a/app/src/main/res/drawable/bg_ui_row.xml b/app/src/main/res/drawable/bg_ui_row.xml index 6049f4797..e822ccfba 100644 --- a/app/src/main/res/drawable/bg_ui_row.xml +++ b/app/src/main/res/drawable/bg_ui_row.xml @@ -4,7 +4,7 @@ - + diff --git a/app/src/main/res/drawable/bg_ui_segment_selected.xml b/app/src/main/res/drawable/bg_ui_segment_selected.xml index 20a273586..8a0da2d56 100644 --- a/app/src/main/res/drawable/bg_ui_segment_selected.xml +++ b/app/src/main/res/drawable/bg_ui_segment_selected.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/drawable/bg_ui_strip.xml b/app/src/main/res/drawable/bg_ui_strip.xml index f60099948..1d0712969 100644 --- a/app/src/main/res/drawable/bg_ui_strip.xml +++ b/app/src/main/res/drawable/bg_ui_strip.xml @@ -2,6 +2,6 @@ - + diff --git a/app/src/main/res/drawable/bg_ui_tag.xml b/app/src/main/res/drawable/bg_ui_tag.xml index dff5e0bc3..2e95eb6ea 100644 --- a/app/src/main/res/drawable/bg_ui_tag.xml +++ b/app/src/main/res/drawable/bg_ui_tag.xml @@ -2,5 +2,5 @@ - + diff --git a/app/src/main/res/drawable/bg_ui_tag_accent.xml b/app/src/main/res/drawable/bg_ui_tag_accent.xml index 818f708d7..c7e10dfa3 100644 --- a/app/src/main/res/drawable/bg_ui_tag_accent.xml +++ b/app/src/main/res/drawable/bg_ui_tag_accent.xml @@ -2,5 +2,5 @@ - + diff --git a/app/src/main/res/drawable/content_bg_icon_button.xml b/app/src/main/res/drawable/content_bg_icon_button.xml index c09ef8b9e..b9c17dbbd 100644 --- a/app/src/main/res/drawable/content_bg_icon_button.xml +++ b/app/src/main/res/drawable/content_bg_icon_button.xml @@ -4,7 +4,7 @@ - + diff --git a/app/src/main/res/drawable/content_bg_item_card.xml b/app/src/main/res/drawable/content_bg_item_card.xml index f84cfc04f..60cc5d320 100644 --- a/app/src/main/res/drawable/content_bg_item_card.xml +++ b/app/src/main/res/drawable/content_bg_item_card.xml @@ -3,14 +3,14 @@ - + - + diff --git a/app/src/main/res/drawable/content_bg_thumb.xml b/app/src/main/res/drawable/content_bg_thumb.xml index 5046b0a4b..bf943aef7 100644 --- a/app/src/main/res/drawable/content_bg_thumb.xml +++ b/app/src/main/res/drawable/content_bg_thumb.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/drawable/v161_home_launch_group.xml b/app/src/main/res/drawable/v161_home_launch_group.xml new file mode 100644 index 000000000..2be9971e9 --- /dev/null +++ b/app/src/main/res/drawable/v161_home_launch_group.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/app/src/main/res/drawable/v161_instances_bg_search.xml b/app/src/main/res/drawable/v161_instances_bg_search.xml new file mode 100644 index 000000000..2712496f2 --- /dev/null +++ b/app/src/main/res/drawable/v161_instances_bg_search.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/v161_misc_news_important.xml b/app/src/main/res/drawable/v161_misc_news_important.xml new file mode 100644 index 000000000..dfec16b40 --- /dev/null +++ b/app/src/main/res/drawable/v161_misc_news_important.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/src/main/res/drawable/v161_misc_news_tag.xml b/app/src/main/res/drawable/v161_misc_news_tag.xml new file mode 100644 index 000000000..6b1634ab4 --- /dev/null +++ b/app/src/main/res/drawable/v161_misc_news_tag.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/src/main/res/drawable/v161r2_misc_quick_launch_card.xml b/app/src/main/res/drawable/v161r2_misc_quick_launch_card.xml new file mode 100644 index 000000000..7a2124c4a --- /dev/null +++ b/app/src/main/res/drawable/v161r2_misc_quick_launch_card.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/app/src/main/res/drawable/v161r2_mods_external_card.xml b/app/src/main/res/drawable/v161r2_mods_external_card.xml new file mode 100644 index 000000000..2c75bdefe --- /dev/null +++ b/app/src/main/res/drawable/v161r2_mods_external_card.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/app/src/main/res/drawable/v161r2_mods_row_card.xml b/app/src/main/res/drawable/v161r2_mods_row_card.xml new file mode 100644 index 000000000..848ccef66 --- /dev/null +++ b/app/src/main/res/drawable/v161r2_mods_row_card.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 1c293c4ea..2080e8d00 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -10,19 +10,25 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="16dp"> + android:paddingStart="20dp" + android:paddingTop="15dp" + android:paddingEnd="20dp" + android:paddingBottom="24dp"> - + + android:layout_height="wrap_content" + app:cardBackgroundColor="@android:color/transparent" + app:cardElevation="0dp" + app:strokeWidth="0dp"> + android:padding="0dp"> + android:textAppearance="@style/TextAppearance.Levi.PageSubtitle" + android:textSize="14sp" /> - - + + android:layout_marginTop="20dp"> - + + android:gravity="center_vertical" + android:orientation="horizontal"> - + - + + - - + + - - + + + + - - - + android:layout_marginStart="12dp" + android:layout_weight="1" + android:orientation="vertical"> + android:gravity="center_vertical" + android:orientation="horizontal"> - - - - - - + android:fontFamily="@font/misans" + android:text="@string/about_author_name" + android:textColor="@color/text_primary" + android:textSize="15sp" + android:textStyle="bold" /> + android:layout_height="18dp" + android:layout_marginStart="8dp" + android:gravity="center" + android:paddingStart="8dp" + android:paddingTop="0dp" + android:paddingEnd="8dp" + android:paddingBottom="0dp" + android:text="@string/about_author_badge" + android:textSize="9sp" /> + + + + + + - - - + android:orientation="horizontal"> - + + + + + - + - - - - + + - - - + - - + android:layout_marginStart="12dp" + android:layout_weight="1" + android:orientation="vertical"> - - - + android:layout_height="wrap_content" + android:fontFamily="@font/misans" + android:text="MrPokeG" + android:textColor="@color/text_primary" + android:textSize="15sp" + android:textStyle="bold" /> - + android:gravity="center" + android:paddingStart="8dp" + android:paddingTop="0dp" + android:paddingEnd="8dp" + android:paddingBottom="0dp" + android:text="@string/maintainer" + android:textSize="9sp" /> - + + + - - + + + + + + + + + + + + + android:gravity="center_vertical" + android:orientation="horizontal"> - + + + + + + android:layout_marginStart="8dp" + android:text="@string/misc_about_thanks" + android:textAppearance="@style/TextAppearance.Levi.SectionTitle" /> + - + - - + - - + - + + - - - - - - - - - - - + android:layout_marginStart="12dp" + android:layout_weight="1" + android:fontFamily="@font/misans" + android:text="@string/misc_about_rhymc" + android:textColor="@color/text_primary" + android:textSize="15sp" + android:textStyle="bold" /> + + - - + + + android:padding="16dp"> @@ -398,185 +438,236 @@ + android:textAppearance="@style/TextAppearance.Levi.Body" + android:textSize="12sp" /> - + + android:layout_marginTop="12dp" + app:cardBackgroundColor="@android:color/transparent" + app:cardElevation="0dp" + app:strokeWidth="0dp"> + android:padding="0dp"> - + android:layout_height="match_parent" + android:layout_weight="1"> + android:orientation="vertical" + android:padding="16dp"> - + - - + android:background="@drawable/bg_ui_icon_chip"> - - + + - + + - + android:layout_marginTop="12dp" + android:scrollbars="none"> - - - + android:layout_height="wrap_content" + android:orientation="horizontal"> - - - + + + + + + + - - + + + + - + android:layout_height="match_parent" + android:layout_weight="1"> + android:orientation="vertical" + android:padding="16dp"> - + - - + android:background="@drawable/bg_ui_icon_chip"> + + + + + + - + android:layout_marginTop="8dp" + android:lineSpacingMultiplier="1.15" + android:text="@string/misc_about_contribute_desc" + android:textAppearance="@style/TextAppearance.Levi.Body" + android:textSize="12sp" /> - + - + - - - + + - + diff --git a/app/src/main/res/layout/activity_accounts.xml b/app/src/main/res/layout/activity_accounts.xml index 3c9e2b7d9..75cc14198 100644 --- a/app/src/main/res/layout/activity_accounts.xml +++ b/app/src/main/res/layout/activity_accounts.xml @@ -6,18 +6,22 @@ android:orientation="vertical" android:padding="16dp"> - + + android:layout_height="wrap_content" + app:cardBackgroundColor="@android:color/transparent" + app:cardCornerRadius="0dp" + app:cardElevation="0dp" + app:strokeWidth="0dp"> + android:padding="0dp"> - - + + android:layout_height="match_parent" + android:visibility="gone" + app:cardBackgroundColor="@android:color/transparent" + app:cardCornerRadius="0dp" + app:cardElevation="0dp" + app:strokeWidth="0dp"> + android:padding="32dp"> @@ -84,28 +81,30 @@ + android:textAppearance="@style/TextAppearance.Levi.PageSubtitle" + android:textSize="14sp" /> @@ -118,24 +117,27 @@ android:baselineAligned="false" android:orientation="horizontal"> + + android:layout_weight="1.2" + app:cardBackgroundColor="@android:color/transparent" + app:cardCornerRadius="0dp" + app:cardElevation="0dp" + app:strokeWidth="0dp"> + android:padding="0dp"> @@ -150,7 +152,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:clipToPadding="false" - android:paddingBottom="6dp" + android:paddingBottom="8dp" android:scrollbars="none" /> + android:textAppearance="@style/TextAppearance.Levi.PageSubtitle" + android:textSize="16sp" /> + + @@ -185,8 +199,9 @@ style="@style/Widget.Levi.Card" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_marginStart="12dp" - android:layout_weight="1"> + android:layout_marginStart="16dp" + android:layout_weight="1" + app:cardElevation="2dp"> + android:padding="20dp"> + android:paddingStart="12dp" + android:paddingTop="6dp" + android:paddingEnd="12dp" + android:paddingBottom="12dp"> + android:layout_height="wrap_content" + app:cardCornerRadius="12dp" + app:strokeWidth="1dp"> + android:padding="12dp"> @@ -82,7 +88,11 @@ android:id="@+id/btn_browser" style="@style/Widget.Levi.Button.Secondary" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="40dp" + android:textSize="12sp" + app:cornerRadius="11dp" + app:iconPadding="5dp" + app:iconSize="17dp" android:layout_marginStart="12dp" android:text="@string/website" app:icon="@drawable/ic_ui_open_in_new" /> @@ -91,7 +101,11 @@ android:id="@+id/btn_install_header" style="@style/Widget.Levi.Button.Primary" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="40dp" + android:textSize="12sp" + app:cornerRadius="11dp" + app:iconPadding="5dp" + app:iconSize="17dp" android:layout_marginStart="8dp" android:text="@string/install" app:icon="@drawable/ic_ui_download" /> @@ -102,7 +116,7 @@ style="?android:attr/progressBarStyleHorizontal" android:layout_width="match_parent" android:layout_height="2dp" - android:layout_marginTop="10dp" + android:layout_marginTop="7dp" android:indeterminate="true" android:visibility="gone" /> @@ -112,21 +126,23 @@ style="@style/Widget.Levi.Card" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="12dp"> + android:layout_marginTop="8dp" + app:cardCornerRadius="12dp" + app:strokeWidth="1dp"> + android:paddingStart="12dp" + android:paddingTop="12dp" + android:paddingEnd="12dp" + android:paddingBottom="8dp"> diff --git a/app/src/main/res/layout/activity_content_list_stacked.xml b/app/src/main/res/layout/activity_content_list_stacked.xml index 814f16f84..99f4d850a 100644 --- a/app/src/main/res/layout/activity_content_list_stacked.xml +++ b/app/src/main/res/layout/activity_content_list_stacked.xml @@ -16,16 +16,17 @@ style="@style/Widget.Levi.Card" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginHorizontal="16dp" - android:layout_marginTop="16dp" - android:layout_marginBottom="4dp" + android:layout_margin="8dp" + app:cardCornerRadius="12dp" + app:cardElevation="4dp" app:layout_scrollFlags="scroll|enterAlways|snap"> + android:paddingHorizontal="8dp" + android:paddingVertical="8dp"> + android:textSize="12sp" + android:textStyle="normal" /> + + + + + + + + + + - - + android:layout_weight="0.001" /> + + @@ -113,18 +180,23 @@ android:id="@+id/selection_count_text" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="12dp" + android:layout_marginStart="8dp" android:layout_weight="1" android:ellipsize="end" android:maxLines="1" android:text="@string/selected_count_zero" - android:textAppearance="@style/TextAppearance.Levi.SectionTitle" /> + android:textAppearance="@style/TextAppearance.Levi.SectionTitle" + android:textSize="16sp" /> @@ -132,8 +204,12 @@ android:id="@+id/batch_export_button" style="@style/Widget.Levi.Button.Secondary" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="8dp" + android:layout_marginStart="6dp" + android:layout_height="38dp" + android:minHeight="0dp" + android:paddingStart="12dp" + android:paddingEnd="12dp" + android:textSize="12sp" android:text="@string/export" app:icon="@drawable/ic_ui_download" /> @@ -141,8 +217,12 @@ android:id="@+id/batch_transfer_button" style="@style/Widget.Levi.Button.Secondary" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="8dp" + android:layout_marginStart="6dp" + android:layout_height="38dp" + android:minHeight="0dp" + android:paddingStart="12dp" + android:paddingEnd="12dp" + android:textSize="12sp" android:text="@string/transfer" app:icon="@drawable/ic_ui_storage" /> @@ -150,54 +230,22 @@ android:id="@+id/batch_delete_button" style="@style/Widget.Levi.Button.Danger" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="8dp" + android:layout_marginStart="6dp" + android:layout_height="38dp" + android:minHeight="0dp" + android:paddingStart="12dp" + android:paddingEnd="12dp" + android:textSize="12sp" android:text="@string/delete" app:icon="@drawable/ic_ui_delete" /> - - - - - - - - @@ -259,9 +307,8 @@ android:layout_height="match_parent" android:clipToPadding="false" android:overScrollMode="never" - android:paddingHorizontal="10dp" - android:paddingTop="6dp" - android:paddingBottom="16dp" /> + android:paddingHorizontal="8dp" + android:paddingBottom="8dp" /> diff --git a/app/src/main/res/layout/activity_content_management.xml b/app/src/main/res/layout/activity_content_management.xml index 5655c0d6d..ea0734e65 100644 --- a/app/src/main/res/layout/activity_content_management.xml +++ b/app/src/main/res/layout/activity_content_management.xml @@ -12,18 +12,22 @@ android:orientation="vertical" android:padding="16dp"> - + + android:layout_height="wrap_content" + app:cardBackgroundColor="@android:color/transparent" + app:cardElevation="0dp" + app:strokeWidth="0dp"> + android:padding="0dp"> - - - - - - - - + android:orientation="vertical"> + android:text="@string/content_management" + android:textAppearance="@style/TextAppearance.Levi.PageTitle" /> - - - - - + - - - - - - - - - + android:orientation="horizontal"> + + + + + + + + + + + - - - + android:textSize="12sp" + app:icon="@drawable/ic_ui_upload" + app:iconPadding="6dp" /> + + + + + + + + + + - + @@ -167,20 +175,20 @@ android:id="@+id/worlds_button" style="@style/Widget.Levi.Card" android:layout_width="0dp" - android:layout_height="wrap_content" + android:layout_height="80dp" android:layout_weight="1" - android:layout_marginEnd="12dp" + android:layout_marginEnd="6dp" android:clickable="true" - android:focusable="true"> + android:focusable="true" + app:cardElevation="0dp" + app:strokeWidth="0dp"> + android:layout_height="match_parent" + android:gravity="center" + android:orientation="vertical" + android:paddingHorizontal="8dp"> - - - + android:layout_marginTop="4dp" + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + + + android:focusable="true" + app:cardElevation="0dp" + app:strokeWidth="0dp"> + android:layout_height="match_parent" + android:gravity="center" + android:orientation="vertical" + android:paddingHorizontal="8dp"> + android:src="@drawable/ic_tshirt" /> - - - + android:layout_marginTop="4dp" + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + + + android:focusable="true" + app:cardElevation="0dp" + app:strokeWidth="0dp"> + android:layout_height="match_parent" + android:gravity="center" + android:orientation="vertical" + android:paddingHorizontal="8dp"> + android:src="@drawable/ic_ui_camera" /> - - - + android:layout_marginTop="4dp" + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + + + + + + + android:focusable="true" + app:cardElevation="0dp" + app:strokeWidth="0dp"> + android:layout_height="match_parent" + android:gravity="center" + android:orientation="vertical" + android:paddingHorizontal="8dp"> + android:src="@drawable/ic_ui_image" /> - - - - - + android:layout_marginTop="4dp" + android:gravity="center_vertical" + android:orientation="horizontal"> - + - + + + + + android:focusable="true" + app:cardElevation="0dp" + app:strokeWidth="0dp"> + android:layout_height="match_parent" + android:gravity="center" + android:orientation="vertical" + android:paddingHorizontal="8dp"> + android:src="@drawable/ic_ui_bolt" /> - - - + android:layout_marginTop="4dp" + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + + + android:focusable="true" + app:cardElevation="0dp" + app:strokeWidth="0dp"> + android:layout_height="match_parent" + android:gravity="center" + android:orientation="vertical" + android:paddingHorizontal="8dp"> + android:src="@drawable/ic_ui_server" /> - - - - - + android:layout_marginTop="4dp" + android:gravity="center_vertical" + android:orientation="horizontal"> - + - + + + + diff --git a/app/src/main/res/layout/activity_curseforge_stacked.xml b/app/src/main/res/layout/activity_curseforge_stacked.xml index ccc28bcd8..35bb56414 100644 --- a/app/src/main/res/layout/activity_curseforge_stacked.xml +++ b/app/src/main/res/layout/activity_curseforge_stacked.xml @@ -1,11 +1,9 @@ - + + android:layout_height="match_parent"> + android:padding="0dp"> + android:textAppearance="@style/TextAppearance.Levi.PageTitle" + android:textSize="20sp" + android:textStyle="bold" /> + + + + + + + + + + @@ -69,7 +109,7 @@ @@ -77,16 +117,23 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:orientation="vertical"> + android:gravity="center_vertical" + android:orientation="horizontal"> + android:layout_width="0dp" + android:layout_height="32dp" + android:layout_weight="1" + android:textSize="11sp" /> + android:gravity="center_vertical" + android:orientation="horizontal"> - - - - - - - + android:layout_width="0dp" + android:layout_height="32dp" + android:layout_weight="1" + android:textSize="11sp" /> @@ -133,7 +170,10 @@ style="@style/Widget.Levi.Card" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginBottom="16dp" + app:cardBackgroundColor="@android:color/transparent" + app:cardCornerRadius="0dp" + app:cardElevation="0dp" + app:strokeWidth="0dp" app:layout_behavior="@string/appbar_scrolling_view_behavior"> - + + android:paddingStart="16dp" + android:paddingTop="12dp" + android:paddingEnd="16dp" + android:paddingBottom="14dp"> - + + android:layout_height="wrap_content" + app:cardBackgroundColor="@android:color/transparent" + app:cardElevation="0dp" + app:strokeWidth="0dp"> + android:padding="0dp"> + android:textAppearance="@style/TextAppearance.Levi.PageTitle" + android:textSize="20sp" /> + android:textAppearance="@style/TextAppearance.Levi.PageSubtitle" + android:textSize="12sp" /> + android:textSize="11sp" + app:cornerRadius="9dp" + app:icon="@drawable/ic_discord" + app:iconPadding="6dp" + app:iconSize="17dp" /> @@ -65,7 +83,7 @@ @@ -73,31 +91,36 @@ android:id="@+id/external_mods_search" style="@style/Widget.Levi.Input" android:layout_width="0dp" - android:layout_height="44dp" + android:layout_height="38dp" android:layout_weight="1" android:drawableStart="@drawable/ic_ui_search" android:hint="@string/external_mods_search_hint" android:imeOptions="actionSearch" android:importantForAutofill="no" - android:inputType="text" /> + android:inputType="text" + android:textSize="12sp" /> + android:textAppearance="@style/TextAppearance.Levi.Body" + android:textSize="11sp" + android:textStyle="bold" /> @@ -105,17 +128,21 @@ android:id="@+id/external_mods_status" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="8dp" + android:layout_marginTop="6dp" android:textAppearance="@style/TextAppearance.Levi.Caption" + android:textSize="11sp" android:visibility="gone" /> - + + android:layout_marginTop="8dp" + app:cardBackgroundColor="@android:color/transparent" + app:cardElevation="0dp" + app:strokeWidth="0dp"> + android:clipToPadding="false" + android:paddingBottom="8dp" /> diff --git a/app/src/main/res/layout/activity_instance_settings_stacked.xml b/app/src/main/res/layout/activity_instance_settings_stacked.xml index d7c17232d..6c9c99679 100644 --- a/app/src/main/res/layout/activity_instance_settings_stacked.xml +++ b/app/src/main/res/layout/activity_instance_settings_stacked.xml @@ -16,20 +16,26 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="16dp"> + android:paddingStart="20dp" + android:paddingTop="15dp" + android:paddingEnd="20dp" + android:paddingBottom="24dp"> + android:layout_height="wrap_content" + app:cardBackgroundColor="@android:color/transparent" + app:cardElevation="0dp" + app:strokeWidth="0dp"> + android:padding="0dp"> @@ -114,7 +120,7 @@ + android:layout_marginTop="20dp"> + android:padding="16dp"> + android:textSize="15sp" /> + android:inputType="text" + android:textSize="14sp" /> + android:textAppearance="@style/TextAppearance.Levi.Caption" + android:textSize="11sp" /> + android:textSize="15sp" /> + android:minHeight="36dp" + android:paddingStart="14dp" + android:paddingEnd="14dp" + android:text="@string/instance_clear_icon" + android:textSize="12sp" /> + android:textAppearance="@style/TextAppearance.Levi.Caption" + android:textSize="11sp" /> @@ -241,13 +254,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="18dp"> + android:padding="16dp"> + android:textSize="15sp" /> - - + android:textSize="15sp" /> - - + + + + app:cardBackgroundColor="@android:color/transparent" + app:cardElevation="0dp" + app:strokeWidth="0dp"> + android:padding="0dp"> + android:textSize="15sp" /> + android:textAppearance="@style/TextAppearance.Levi.FieldLabel" + android:textSize="13sp" + android:textStyle="bold" /> + android:layout_marginTop="8dp" + android:orientation="vertical"> + android:inputType="text" + android:textSize="14sp" /> + + @@ -426,14 +444,12 @@ + android:orientation="vertical" + android:padding="16dp"> + android:textSize="15sp" /> @@ -466,13 +485,13 @@ style="@style/Widget.Levi.Card" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="12dp"> + android:layout_marginTop="14dp"> + android:padding="16dp"> + android:textSize="15sp" /> + android:textSize="15sp" /> + android:textColor="@color/ui_danger" + android:textSize="11sp" /> diff --git a/app/src/main/res/layout/activity_instances_stacked.xml b/app/src/main/res/layout/activity_instances_stacked.xml index 3c080d537..12f08137a 100644 --- a/app/src/main/res/layout/activity_instances_stacked.xml +++ b/app/src/main/res/layout/activity_instances_stacked.xml @@ -4,19 +4,25 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:padding="16dp"> + android:paddingStart="20dp" + android:paddingTop="15dp" + android:paddingEnd="20dp" + android:paddingBottom="24dp"> + android:layout_height="wrap_content" + app:cardBackgroundColor="@android:color/transparent" + app:cardElevation="0dp" + app:strokeWidth="0dp"> + android:padding="0dp"> + android:textSize="11sp" + android:textStyle="normal" + app:cornerRadius="8dp" + app:icon="@drawable/ic_ui_sort" + app:iconPadding="6dp" + app:iconSize="14dp" /> @@ -80,31 +92,51 @@ android:id="@+id/btn_batch_backup" style="@style/Widget.Levi.Button.Secondary" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="32dp" + android:minHeight="32dp" + android:paddingStart="14dp" + android:paddingEnd="14dp" android:text="@string/instance_batch_backup_button" + android:textSize="11sp" + app:cornerRadius="16dp" + app:iconPadding="6dp" + app:iconSize="14dp" app:icon="@drawable/ic_ui_download" /> + android:layout_height="1dp" /> @@ -116,10 +148,9 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:layout_marginTop="12dp" + android:layout_marginTop="16dp" android:clipToPadding="false" android:overScrollMode="never" - android:paddingTop="2dp" android:paddingBottom="8dp" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 839b2c85e..2dc086e0a 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,10 +7,10 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:paddingStart="16dp" - android:paddingTop="10dp" - android:paddingEnd="16dp" - android:paddingBottom="12dp"> + android:paddingStart="15dp" + android:paddingTop="15dp" + android:paddingEnd="15dp" + android:paddingBottom="24dp"> + android:padding="15dp"> @@ -186,37 +177,41 @@ android:id="@+id/launch_button" style="@style/Widget.Levi.Button.Primary" android:layout_width="wrap_content" - android:layout_height="48dp" - android:minHeight="48dp" - android:paddingStart="20dp" - android:paddingEnd="12dp" + android:layout_height="40dp" + android:minWidth="0dp" + android:minHeight="0dp" + android:insetTop="0dp" + android:insetBottom="0dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" android:stateListAnimator="@null" android:text="@string/launch" - android:textSize="17sp" + android:textSize="13sp" + android:textStyle="bold" app:backgroundTint="@android:color/transparent" - app:cornerRadius="14dp" + app:cornerRadius="8dp" app:icon="@drawable/ic_nav_launch" - app:iconPadding="8dp" - app:iconSize="20dp" + app:iconPadding="6dp" + app:iconSize="18dp" app:rippleColor="#33FFFFFF" /> @@ -226,19 +221,19 @@ @@ -247,13 +242,13 @@ android:id="@+id/tip_text" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="8dp" + android:layout_marginStart="6dp" android:layout_weight="1" android:ellipsize="end" android:fontFamily="@font/misans" android:singleLine="true" android:textColor="@color/text_secondary" - android:textSize="13sp" /> + android:textSize="12sp" /> @@ -280,26 +275,25 @@ + android:orientation="vertical" + android:padding="15dp"> + android:orientation="horizontal"> @@ -308,17 +302,19 @@ + android:textAppearance="@style/TextAppearance.Levi.SectionTitle" + android:textSize="14sp" + android:textStyle="bold" /> + android:textSize="10sp" + android:textStyle="bold" /> + android:orientation="vertical" /> + android:layout_weight="1.3"> + android:orientation="vertical" + android:padding="15dp"> + android:orientation="horizontal"> @@ -433,33 +426,34 @@ + android:textAppearance="@style/TextAppearance.Levi.SectionTitle" + android:textSize="14sp" + android:textStyle="bold" /> + android:textSize="11sp" /> + android:orientation="vertical"> + android:paddingTop="8dp" + android:paddingBottom="8dp"> + android:textSize="13sp" /> @@ -537,25 +530,25 @@ + android:paddingTop="8dp" + android:paddingBottom="8dp"> + android:textSize="13sp" /> @@ -595,25 +588,25 @@ + android:paddingTop="8dp" + android:paddingBottom="8dp"> + android:textSize="13sp" /> @@ -668,26 +661,25 @@ + android:orientation="vertical" + android:padding="15dp"> + android:orientation="horizontal"> @@ -696,17 +688,20 @@ + android:textAppearance="@style/TextAppearance.Levi.SectionTitle" + android:textSize="14sp" + android:textStyle="bold" /> + android:orientation="vertical"> + android:paddingTop="8dp" + android:paddingBottom="8dp"> + android:textSize="13sp" /> @@ -774,25 +767,25 @@ + android:paddingTop="8dp" + android:paddingBottom="8dp"> + android:textSize="13sp" /> @@ -822,25 +814,25 @@ + android:paddingTop="8dp" + android:paddingBottom="8dp"> + android:textSize="13sp" /> diff --git a/app/src/main/res/layout/activity_mods_fullscreen_stacked.xml b/app/src/main/res/layout/activity_mods_fullscreen_stacked.xml index d21637a19..9c78edf63 100644 --- a/app/src/main/res/layout/activity_mods_fullscreen_stacked.xml +++ b/app/src/main/res/layout/activity_mods_fullscreen_stacked.xml @@ -1,5 +1,6 @@ - + android:paddingStart="20dp" + android:paddingTop="15dp" + android:paddingEnd="20dp" + android:paddingBottom="24dp"> - + + android:layout_height="wrap_content" + app:cardBackgroundColor="@android:color/transparent" + app:cardElevation="0dp" + app:strokeWidth="0dp"> + android:orientation="vertical" + android:padding="0dp"> - + android:text="@string/full_mods_title" + android:textAppearance="@style/TextAppearance.Levi.PageTitle" /> - + - - - - + + + + + + + - + - - + + android:layout_marginTop="12dp" + app:cardBackgroundColor="@android:color/transparent" + app:cardElevation="0dp" + app:strokeWidth="0dp"> + android:paddingStart="12dp" + android:paddingEnd="12dp"> diff --git a/app/src/main/res/layout/activity_news.xml b/app/src/main/res/layout/activity_news.xml index fbd0baf06..d46db4b13 100644 --- a/app/src/main/res/layout/activity_news.xml +++ b/app/src/main/res/layout/activity_news.xml @@ -4,22 +4,27 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:paddingStart="16dp" - android:paddingTop="16dp" - android:paddingEnd="16dp"> + android:paddingStart="20dp" + android:paddingTop="15dp" + android:paddingEnd="20dp" + android:paddingBottom="18dp"> - + + android:layout_height="wrap_content" + app:cardBackgroundColor="@android:color/transparent" + app:cardCornerRadius="0dp" + app:cardElevation="0dp" + app:strokeWidth="0dp"> + android:padding="0dp"> @@ -45,15 +50,24 @@ android:id="@+id/news_enable_notifications" style="@style/Widget.Levi.Button.Secondary" android:layout_width="wrap_content" - android:layout_height="40dp" - android:layout_marginStart="12dp" + android:layout_height="36dp" + android:layout_marginStart="8dp" + android:minWidth="0dp" + android:minHeight="0dp" + android:paddingStart="12dp" + android:paddingEnd="12dp" android:text="@string/news_enable_notifications" + android:textSize="11sp" app:icon="@drawable/ic_nav_news" /> @@ -62,7 +76,7 @@ + android:layout_gravity="center" + android:visibility="gone" + app:cardBackgroundColor="@android:color/transparent" + app:cardElevation="0dp" + app:strokeWidth="0dp"> + android:textAppearance="@style/TextAppearance.Levi.PageSubtitle" + android:textSize="14sp" /> diff --git a/app/src/main/res/layout/activity_quick_launch.xml b/app/src/main/res/layout/activity_quick_launch.xml index 727ff1e91..a70e84bb0 100644 --- a/app/src/main/res/layout/activity_quick_launch.xml +++ b/app/src/main/res/layout/activity_quick_launch.xml @@ -1,5 +1,6 @@ + android:paddingStart="8dp" + android:paddingTop="15dp" + android:paddingEnd="8dp" + android:paddingBottom="8dp"> - + + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:layout_marginEnd="8dp" + app:cardBackgroundColor="@android:color/transparent" + app:cardCornerRadius="0dp" + app:cardElevation="0dp" + app:strokeWidth="0dp"> + android:padding="0dp"> + android:textAppearance="@style/TextAppearance.Levi.PageSubtitle" + android:textSize="14sp" /> - + + android:layout_marginTop="8dp" + app:cardBackgroundColor="@android:color/transparent" + app:cardCornerRadius="0dp" + app:cardElevation="0dp" + app:strokeWidth="0dp"> diff --git a/app/src/main/res/layout/activity_settings_stacked.xml b/app/src/main/res/layout/activity_settings_stacked.xml index a2102ab8f..1d33bcaf6 100644 --- a/app/src/main/res/layout/activity_settings_stacked.xml +++ b/app/src/main/res/layout/activity_settings_stacked.xml @@ -1,5 +1,5 @@ - - - - + android:paddingStart="20dp" + android:paddingTop="15dp" + android:paddingEnd="20dp" + android:paddingBottom="24dp"> + + + + android:orientation="vertical"> + android:textAppearance="@style/TextAppearance.Levi.PageSubtitle" + android:textSize="14sp" /> - + + android:layout_marginTop="20dp"> + android:padding="16dp"> @@ -222,7 +236,11 @@ android:id="@+id/personalize_nav_wallpaper" style="@style/Widget.Levi.Button.Secondary" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="32dp" + android:minHeight="0dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" + app:cornerRadius="16dp" android:layout_marginStart="8dp" android:text="@string/settings_ui_section_wallpaper" /> @@ -230,7 +248,11 @@ android:id="@+id/personalize_nav_material" style="@style/Widget.Levi.Button.Secondary" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="32dp" + android:minHeight="0dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" + app:cornerRadius="16dp" android:layout_marginStart="8dp" android:text="@string/settings_ui_section_material" /> @@ -249,8 +271,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingTop="12dp" - android:paddingBottom="16dp" + android:paddingTop="14dp" + android:paddingBottom="14dp" android:tag="settings_row"> + android:minWidth="120dp" /> + android:minWidth="120dp" /> @@ -359,14 +381,14 @@ @@ -375,7 +397,7 @@ @@ -408,7 +430,7 @@ @@ -464,9 +486,9 @@ @@ -494,7 +516,7 @@ @@ -511,10 +533,10 @@ android:orientation="horizontal"> @@ -538,7 +560,8 @@ + android:text="@string/preset_colors" + android:textSize="11sp" /> + android:text="@string/more_colors" + android:textSize="11sp" /> + android:layout_marginTop="14dp" + android:layout_marginBottom="14dp" /> @@ -649,15 +673,15 @@ + android:layout_width="40dp" + android:layout_height="40dp" /> + android:layout_marginStart="8dp" + android:text="@string/apply" + android:textSize="12sp" /> @@ -791,7 +816,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingTop="12dp" + android:paddingTop="14dp" android:paddingBottom="14dp" android:tag="settings_row"> @@ -810,7 +835,7 @@ android:background="@drawable/bg_ui_strip" android:gravity="center_vertical" android:orientation="horizontal" - android:padding="10dp"> + android:padding="12dp"> @@ -870,7 +895,11 @@ android:id="@+id/btn_next_bg_image" style="@style/Widget.Levi.Button.Secondary" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="32dp" + android:minHeight="0dp" + android:paddingStart="14dp" + android:paddingEnd="14dp" + android:textSize="11sp" android:text="@string/settings_ui_next_image" app:icon="@drawable/ic_ui_refresh" /> @@ -878,7 +907,11 @@ android:id="@+id/btn_clear_bg_image" style="@style/Widget.Levi.Button.Danger" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="32dp" + android:minHeight="0dp" + android:paddingStart="14dp" + android:paddingEnd="14dp" + android:textSize="11sp" android:layout_marginStart="8dp" android:text="@string/settings_ui_clear_folder" app:icon="@drawable/ic_ui_delete" /> @@ -887,7 +920,11 @@ android:id="@+id/btn_select_bg_image" style="@style/Widget.Levi.Button.Secondary" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="32dp" + android:minHeight="0dp" + android:paddingStart="14dp" + android:paddingEnd="14dp" + android:textSize="11sp" android:layout_marginStart="8dp" android:text="@string/settings_ui_select_image" app:icon="@drawable/ic_ui_image" /> @@ -896,7 +933,11 @@ android:id="@+id/btn_select_bg_folder" style="@style/Widget.Levi.Button.Primary" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="32dp" + android:minHeight="0dp" + android:paddingStart="14dp" + android:paddingEnd="14dp" + android:textSize="11sp" android:layout_marginStart="8dp" android:text="@string/settings_ui_select_folder" app:icon="@drawable/ic_ui_folder" /> @@ -950,13 +991,13 @@ android:id="@+id/bg_fit_mode" style="@style/Widget.Levi.Input" android:layout_width="wrap_content" - android:layout_height="44dp" + android:layout_height="36dp" android:background="@drawable/bg_ui_input" android:clickable="true" android:drawableEnd="@drawable/ic_ui_expand_more" android:focusable="true" android:gravity="center_vertical" - android:minWidth="140dp" /> + android:minWidth="120dp" /> @@ -1111,7 +1152,8 @@ + android:text="@string/settings_ui_material_presets" + android:textSize="11sp" /> @@ -1358,6 +1402,8 @@ style="@style/Widget.Levi.Button.Secondary" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:paddingStart="20dp" + android:paddingEnd="20dp" android:text="@string/preloader_sigs_update" /> @@ -1396,13 +1442,21 @@ diff --git a/app/src/main/res/layout/item_curseforge_content.xml b/app/src/main/res/layout/item_curseforge_content.xml index c9b6f9f77..12b0a010e 100644 --- a/app/src/main/res/layout/item_curseforge_content.xml +++ b/app/src/main/res/layout/item_curseforge_content.xml @@ -1,31 +1,36 @@ - + + android:paddingStart="11dp" + android:paddingTop="10dp" + android:paddingEnd="11dp" + android:paddingBottom="10dp"> @@ -53,6 +58,7 @@ android:ellipsize="end" android:maxLines="1" android:textAppearance="@style/TextAppearance.Levi.SectionTitle" + android:textSize="14sp" tools:text="Furnicraft Addon" /> @@ -71,18 +78,18 @@ android:id="@+id/mod_description" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="2dp" + android:layout_marginTop="3dp" android:ellipsize="end" android:maxLines="2" android:textAppearance="@style/TextAppearance.Levi.Body" android:textColor="@color/text_secondary" - android:textSize="13sp" + android:textSize="12sp" tools:text="Beautiful furniture and decorations for your Minecraft worlds" /> @@ -94,6 +101,7 @@ android:layout_marginEnd="6dp" android:ellipsize="end" android:maxWidth="160dp" + android:textSize="10sp" tools:text="Addons" /> @@ -125,6 +135,6 @@ diff --git a/app/src/main/res/layout/item_curseforge_footer.xml b/app/src/main/res/layout/item_curseforge_footer.xml index f393ea9ce..0b835397c 100644 --- a/app/src/main/res/layout/item_curseforge_footer.xml +++ b/app/src/main/res/layout/item_curseforge_footer.xml @@ -6,12 +6,18 @@ android:layout_height="wrap_content" android:gravity="center" android:orientation="horizontal" + android:paddingStart="14dp" android:paddingTop="10dp" - android:paddingBottom="6dp"> + android:paddingEnd="14dp" + android:paddingBottom="16dp"> @@ -20,15 +26,20 @@ android:id="@+id/tv_page_info" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="14dp" - android:layout_marginEnd="14dp" + android:layout_marginStart="12dp" + android:layout_marginEnd="12dp" android:text="@string/pagination_page_one" android:textAppearance="@style/TextAppearance.Levi.Body" - android:textStyle="bold" /> + android:textSize="12sp" + android:textStyle="normal" /> diff --git a/app/src/main/res/layout/item_external_mod.xml b/app/src/main/res/layout/item_external_mod.xml index c0dc14374..36908504b 100644 --- a/app/src/main/res/layout/item_external_mod.xml +++ b/app/src/main/res/layout/item_external_mod.xml @@ -1,131 +1,150 @@ - + + - - - - - + android:minHeight="198dp" + android:orientation="vertical" + android:padding="11dp"> + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + + + android:layout_marginStart="9dp" + android:layout_weight="1" + android:orientation="vertical"> + android:textAppearance="@style/TextAppearance.Levi.SectionTitle" + android:textSize="14sp" /> - + android:layout_marginTop="3dp" + android:gravity="center_vertical" + android:orientation="horizontal"> - + + + + + + + + + + + android:maxWidth="260dp" + android:textSize="9sp" /> - - - - - - - - + + + android:layout_width="match_parent" + android:layout_height="34dp" + android:layout_marginTop="8dp" + android:minHeight="0dp" + android:minWidth="0dp" + android:paddingHorizontal="12dp" + android:text="@string/install" + android:textSize="11sp" /> diff --git a/app/src/main/res/layout/item_instance_card.xml b/app/src/main/res/layout/item_instance_card.xml index 052e764ea..b2d3ee7e0 100644 --- a/app/src/main/res/layout/item_instance_card.xml +++ b/app/src/main/res/layout/item_instance_card.xml @@ -5,11 +5,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:background="@drawable/bg_ui_card" - android:paddingStart="16dp" - android:paddingTop="12dp" - android:paddingEnd="12dp" - android:paddingBottom="14dp" + android:background="@drawable/bg_ui_card_inner" + android:padding="14dp" android:clickable="true" android:focusable="true" android:foreground="?android:attr/selectableItemBackground"> @@ -29,35 +26,47 @@ + android:layout_height="22dp" + android:layout_marginStart="10dp" + android:gravity="center" + android:paddingStart="10dp" + android:paddingTop="0dp" + android:paddingEnd="10dp" + android:paddingBottom="0dp" + android:textSize="10sp" /> + app:icon="@drawable/ic_settings" + app:iconSize="18dp" /> @@ -75,11 +84,11 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:layout_marginStart="10dp" + android:layout_marginStart="6dp" android:ellipsize="end" android:fontFamily="@font/misans" android:maxLines="1" android:textColor="@color/text_secondary" - android:textSize="14sp" /> + android:textSize="12sp" /> diff --git a/app/src/main/res/layout/item_mod.xml b/app/src/main/res/layout/item_mod.xml index 6fde10feb..50450845e 100644 --- a/app/src/main/res/layout/item_mod.xml +++ b/app/src/main/res/layout/item_mod.xml @@ -1,17 +1,19 @@ - + + @@ -22,20 +24,19 @@ android:gravity="center_vertical" android:minHeight="56dp" android:orientation="horizontal" - android:paddingStart="16dp" - android:paddingTop="6dp" - android:paddingEnd="8dp" - android:paddingBottom="6dp"> + android:paddingStart="12dp" + android:paddingTop="8dp" + android:paddingEnd="12dp" + android:paddingBottom="8dp"> @@ -81,8 +82,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="6dp" + android:paddingHorizontal="7dp" + android:paddingVertical="2dp" android:text="@string/mod_config_badge" android:textSize="10sp" + android:textStyle="bold" android:visibility="gone" /> + android:textColor="@color/text_secondary" + android:textSize="12sp" + android:textStyle="bold" /> + android:padding="12dp"> @@ -60,16 +60,20 @@ android:id="@+id/btn_use" style="@style/Widget.Levi.Button.Primary" android:layout_width="wrap_content" - android:layout_height="40dp" + android:layout_height="36dp" android:layout_marginStart="8dp" + android:minWidth="0dp" + android:minHeight="0dp" + android:paddingStart="12dp" + android:paddingEnd="12dp" android:text="@string/ms_set_active" - android:textSize="13sp" /> + android:textSize="12sp" /> + android:padding="15dp"> @@ -47,7 +51,14 @@ android:id="@+id/news_item_category" style="@style/Widget.Levi.Tag" android:layout_width="wrap_content" - android:layout_height="wrap_content" /> + android:layout_height="20dp" + android:background="@drawable/v161_misc_news_tag" + android:gravity="center" + android:paddingStart="9dp" + android:paddingTop="0dp" + android:paddingEnd="9dp" + android:paddingBottom="0dp" + android:textSize="9sp" /> + android:textSize="10sp" /> diff --git a/app/src/main/res/layout/item_quick_launch.xml b/app/src/main/res/layout/item_quick_launch.xml index 5ba45fa1f..7767504ec 100644 --- a/app/src/main/res/layout/item_quick_launch.xml +++ b/app/src/main/res/layout/item_quick_launch.xml @@ -3,22 +3,21 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_margin="8dp" android:orientation="vertical"> + android:padding="16dp"> @@ -73,8 +72,8 @@ diff --git a/app/src/main/res/layout/item_resource_pack.xml b/app/src/main/res/layout/item_resource_pack.xml index e89efa98d..97e06e3e0 100644 --- a/app/src/main/res/layout/item_resource_pack.xml +++ b/app/src/main/res/layout/item_resource_pack.xml @@ -3,19 +3,19 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/pack_card" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginHorizontal="6dp" - android:layout_marginVertical="6dp" - android:background="@drawable/content_bg_item_card" + android:layout_height="76dp" + android:layout_marginHorizontal="4dp" + android:layout_marginVertical="3dp" + android:background="@drawable/bg_content_item" android:gravity="center_vertical" - android:minHeight="80dp" android:orientation="horizontal" - android:padding="12dp"> + android:paddingHorizontal="10dp" + android:paddingVertical="8dp"> + android:textAppearance="@style/TextAppearance.Levi.Caption" + android:textSize="11sp" /> + android:text="@string/resource_pack_description_placeholder" + android:textAppearance="@style/TextAppearance.Levi.Body" + android:textColor="@color/text_secondary" + android:textSize="11sp" /> diff --git a/app/src/main/res/layout/item_screenshot.xml b/app/src/main/res/layout/item_screenshot.xml index 7bc82c6f9..496b4db56 100644 --- a/app/src/main/res/layout/item_screenshot.xml +++ b/app/src/main/res/layout/item_screenshot.xml @@ -3,27 +3,25 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="6dp" - android:background="@drawable/content_bg_item_card" + android:layout_margin="4dp" + android:background="@drawable/bg_content_item" android:orientation="vertical" - android:padding="10dp"> + android:padding="8dp"> + android:scaleType="centerCrop" /> + android:orientation="horizontal"> + android:textAppearance="@style/TextAppearance.Levi.Caption" + android:textSize="11sp" /> diff --git a/app/src/main/res/layout/item_server.xml b/app/src/main/res/layout/item_server.xml index 8c2cf8d5e..5cf0f6d8b 100644 --- a/app/src/main/res/layout/item_server.xml +++ b/app/src/main/res/layout/item_server.xml @@ -3,11 +3,9 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginHorizontal="6dp" - android:layout_marginVertical="6dp" - android:background="@drawable/content_bg_item_card" + android:layout_margin="4dp" + android:background="@drawable/bg_content_item" android:gravity="center_vertical" - android:minHeight="72dp" android:orientation="horizontal" android:padding="12dp"> @@ -29,7 +27,7 @@ @@ -42,14 +40,14 @@ android:maxLines="1" android:text="@string/server_name_placeholder" android:textColor="@color/text_primary" - android:textSize="15sp" + android:textSize="16sp" android:textStyle="bold" /> @@ -58,7 +56,6 @@ + android:paddingHorizontal="10dp" + android:paddingVertical="8dp"> @@ -64,11 +65,19 @@ android:maxLines="1" android:text="@string/world_game_mode_survival_placeholder" android:textAppearance="@style/TextAppearance.Levi.Caption" /> + + + + @@ -81,7 +90,8 @@ android:ellipsize="end" android:maxLines="1" android:text="@string/world_last_played_placeholder" - android:textAppearance="@style/TextAppearance.Levi.Caption" /> + android:textAppearance="@style/TextAppearance.Levi.Caption" + android:textSize="11sp" /> @@ -89,10 +99,9 @@ android:id="@+id/world_edit_button" android:layout_width="40dp" android:layout_height="40dp" - android:layout_marginStart="8dp" android:background="@drawable/content_bg_icon_button" android:contentDescription="@string/edit" - android:padding="10dp" + android:padding="9dp" android:scaleType="fitCenter" android:src="@drawable/ic_edit" android:tooltipText="@string/edit" @@ -102,10 +111,9 @@ android:id="@+id/world_overflow_button" android:layout_width="40dp" android:layout_height="40dp" - android:layout_marginStart="8dp" android:background="@drawable/content_bg_icon_button" android:contentDescription="@string/more_actions" - android:padding="10dp" + android:padding="8dp" android:scaleType="fitCenter" android:src="@drawable/ic_ui_more" android:tooltipText="@string/more_actions" @@ -113,12 +121,11 @@ diff --git a/app/src/main/res/layout/shell_account_cluster.xml b/app/src/main/res/layout/shell_account_cluster.xml index a673fc706..0090d966c 100644 --- a/app/src/main/res/layout/shell_account_cluster.xml +++ b/app/src/main/res/layout/shell_account_cluster.xml @@ -6,10 +6,10 @@ - - - - - - + android:layout_height="match_parent" + android:layout_gravity="start|center_vertical" + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + + + + - - - - - - + + + + + + + diff --git a/app/src/main/res/values/styles_settings.xml b/app/src/main/res/values/styles_settings.xml index 9f31ec629..1f5b456bf 100644 --- a/app/src/main/res/values/styles_settings.xml +++ b/app/src/main/res/values/styles_settings.xml @@ -10,10 +10,10 @@ match_parent wrap_content vertical - 18dp - 18dp - 6dp - 6dp + 16dp + 16dp + 2dp + 2dp @@ -31,7 +31,7 @@ 0dp wrap_content 1 - 16dp + 0dp 96dp vertical @@ -53,7 +53,7 @@ @@ -70,8 +70,8 @@ @@ -63,7 +64,7 @@