Skip to content

Commit a74efc0

Browse files
MaxJubayerYTMaxJubayerYT
authored
Merge pull request #86 from CopperLauncher/feat/misc
Feat/misc
2 parents 3645780 + b5a83ff commit a74efc0

6 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎app_pojavlauncher/src/main/res/drawable/ic_filter.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2-
android:width="16.03dp"
3-
android:height="18.02dp"
4-
android:viewportWidth="16.03"
5-
android:viewportHeight="18.02">
2+
android:width="24.03dp"
3+
android:height="24.03dp"
4+
android:viewportWidth="110"
5+
android:viewportHeight="110">
66
<path
77
android:fillColor="#FFF"
8-
android:pathData="M10.02,9v7.88c0.04,0.3 -0.06,0.62 -0.29,0.83a1,1 0,0 1,-1.41 0l-2.01,-2.01a0.99,0.99 0,0 1,-0.29 -0.83L6.02,9h-0.03L0.23,1.62a1,1 0,0 1,0.17 -1.4c0.19,-0.14 0.4,-0.22 0.62,-0.22h14c0.22,0 0.43,0.08 0.62,0.22a1,1 0,0 1,0.17 1.4L10.05,9L10.02,9Z"/>
9-
</vector>
8+
android:pathData="M20 0h70v10h10v10h10v10h-10v10H90v10H80v10H70v40H60v10H50v-10H40V60H30V50H20V40H10V30H0V20h10V10h10zm70 10H20v10H10v10h10v10h10v10h10v10h10v40h10V60h10V50h10V40h10V30h10V20H90z"/>
9+
</vector>

‎app_pojavlauncher/src/main/res/drawable/ic_force_landscape.png‎

3.43 KB
Loading

‎app_pojavlauncher/src/main/res/drawable/ic_mclogs_share.png‎

63.4 KB
Loading

‎app_pojavlauncher/src/main/res/drawable/ic_refresh.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
android:viewportHeight="24">
66
<path
77
android:fillColor="#FFF"
8-
android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
9-
</vector>
8+
android:pathData="M4.5,3 h13.5 v1.5 h-13.5 z M1.5,4.5 h18 v1.5 h-18 z M1.5,6 h3 v1.5 h-3 z M18,6 h1.5 v1.5 h-1.5 z M1.5,7.5 h3 v1.5 h-3 z M18,7.5 h1.5 v1.5 h-1.5 z M1.5,9 h3 v1.5 h-3 z M15,9 h1.5 v1.5 h-1.5 z M18,9 h1.5 v1.5 h-1.5 z M21,9 h1.5 v1.5 h-1.5 z M1.5,10.5 h3 v1.5 h-3 z M16.5,10.5 h4.5 v1.5 h-4.5 z M1.5,12 h3 v1.5 h-3 z M18,12 h1.5 v1.5 h-1.5 z M1.5,13.5 h3 v1.5 h-3 z M1.5,15 h3 v1.5 h-3 z M1.5,16.5 h3 v1.5 h-3 z M18,16.5 h1.5 v1.5 h-1.5 z M3,18 h16.5 v1.5 h-16.5 z M4.5,19.5 h13.5 v1.5 h-13.5 z"/>
9+
</vector>

‎app_pojavlauncher/src/main/res/layout/item_installed_mod.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
android:maxLines="1"
3838
android:ellipsize="end"
3939
app:layout_constraintStart_toEndOf="@+id/installed_mod_icon"
40-
app:layout_constraintEnd_toStartOf="@+id/installed_mod_toggle"
40+
app:layout_constraintEnd_toStartOf="@+id/installed_mod_update"
4141
app:layout_constraintTop_toTopOf="parent"
4242
tools:text="EntityCulling" />
4343

@@ -52,7 +52,7 @@
5252
android:maxLines="1"
5353
android:ellipsize="end"
5454
app:layout_constraintStart_toEndOf="@+id/installed_mod_icon"
55-
app:layout_constraintEnd_toStartOf="@+id/installed_mod_toggle"
55+
app:layout_constraintEnd_toStartOf="@+id/installed_mod_update"
5656
app:layout_constraintTop_toBottomOf="@+id/installed_mod_name"
5757
tools:text="Version 1.8.0" />
5858

@@ -68,23 +68,12 @@
6868
android:maxLines="2"
6969
android:ellipsize="end"
7070
app:layout_constraintStart_toEndOf="@+id/installed_mod_icon"
71-
app:layout_constraintEnd_toStartOf="@+id/installed_mod_toggle"
71+
app:layout_constraintEnd_toStartOf="@+id/installed_mod_update"
7272
app:layout_constraintTop_toBottomOf="@+id/installed_mod_version"
7373
app:layout_constraintBottom_toBottomOf="parent"
7474
app:layout_constraintVertical_bias="0.0"
7575
tools:text="This mod uses async path-tracing to hide Tiles/Entities that are not vi…" />
7676

77-
<!-- Enable/disable toggle -->
78-
<androidx.appcompat.widget.SwitchCompat
79-
android:id="@+id/installed_mod_toggle"
80-
android:layout_width="wrap_content"
81-
android:layout_height="wrap_content"
82-
android:layout_marginEnd="@dimen/padding_moderate"
83-
android:checked="true"
84-
app:layout_constraintEnd_toStartOf="@+id/installed_mod_update"
85-
app:layout_constraintTop_toTopOf="parent"
86-
app:layout_constraintBottom_toBottomOf="parent" />
87-
8877
<!-- Update button — hidden until an update is available, uses MineButton style -->
8978
<com.kdt.mcgui.MineButton
9079
android:id="@+id/installed_mod_update"
@@ -96,6 +85,17 @@
9685
android:paddingHorizontal="@dimen/padding_moderate"
9786
android:paddingVertical="@dimen/padding_small"
9887
android:visibility="gone"
88+
app:layout_constraintEnd_toStartOf="@+id/installed_mod_toggle"
89+
app:layout_constraintTop_toTopOf="parent"
90+
app:layout_constraintBottom_toBottomOf="parent" />
91+
92+
<!-- Enable/disable toggle -->
93+
<androidx.appcompat.widget.SwitchCompat
94+
android:id="@+id/installed_mod_toggle"
95+
android:layout_width="wrap_content"
96+
android:layout_height="wrap_content"
97+
android:layout_marginEnd="@dimen/padding_moderate"
98+
android:checked="true"
9999
app:layout_constraintEnd_toStartOf="@+id/installed_mod_delete"
100100
app:layout_constraintTop_toTopOf="parent"
101101
app:layout_constraintBottom_toBottomOf="parent" />

‎app_pojavlauncher/src/main/res/xml/pref_launcher_appearance.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
android:defaultValue="false"
1010
android:key="force_landscape"
1111
android:title="@string/preference_force_landscape_title"
12-
android:summary="@string/preference_force_landscape_summary" />
13-
12+
android:summary="@string/preference_force_landscape_summary"
13+
android:icon="@drawable/ic_force_landscape" />
1414
<!-- Set custom launcher background from gallery -->
1515
<Preference
1616
android:key="set_custom_launcher_bg"

0 commit comments

Comments
 (0)