Skip to content

Commit

Permalink
Revert 'Android 13: Hide options which are not compatible' partially
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mahmud0808
Mahmud0808 committed Apr 27, 2023
1 parent 5756ef0 commit 18d54d0
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 89 deletions.
5 changes: 0 additions & 5 deletions app/src/main/java/com/drdisagree/iconify/ui/activities/QsIconLabel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,11 +304,6 @@ public void onStopTrackingTouch(SeekBar seekBar) {
Toast.makeText(Iconify.getAppContext(), finalMoveIcon[0] + "dp " + getResources().getString(R.string.toast_applied), Toast.LENGTH_SHORT).show();
}
});

if (Build.VERSION.SDK_INT >= 33) {
findViewById(R.id.icon_label_always_white_v2).setVisibility(View.GONE);
findViewById(R.id.icon_label_follow_system_v2).setVisibility(View.GONE);
}
}

@Override
Expand Down
152 changes: 68 additions & 84 deletions app/src/main/res/layout/activity_qs_icon_label.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,61 +273,53 @@
<View style="@style/dividerTransparent" />

<LinearLayout
android:id="@+id/icon_label_always_white_v2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:background="@drawable/container_mid"
android:orientation="horizontal"
android:paddingStart="@dimen/container_paddingSide"
android:paddingTop="@dimen/container_padding"
android:paddingEnd="@dimen/container_paddingSide"
android:paddingBottom="@dimen/container_padding">

<LinearLayout
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@drawable/container_mid"
android:orientation="horizontal"
android:paddingStart="@dimen/container_paddingSide"
android:paddingTop="@dimen/container_padding"
android:paddingEnd="@dimen/container_paddingSide"
android:paddingBottom="@dimen/container_padding">

<LinearLayout
android:layout_width="0dp"
android:layout_gravity="start|center"
android:layout_marginEnd="@dimen/container_padding"
android:layout_weight="1.0"
android:orientation="vertical">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|center"
android:layout_marginEnd="@dimen/container_padding"
android:layout_weight="1.0"
android:orientation="vertical">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|center"
android:paddingTop="3dp"
android:text="@string/label_always_white_v2_title"
android:textColor="@color/textColorPrimary"
android:textSize="@dimen/cont_title_size"
android:textStyle="bold" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|center"
android:paddingTop="3dp"
android:text="@string/label_always_white_v2_desc"
android:textColor="@color/textColorSecondary"
android:textSize="@dimen/cont_desc_size" />

</LinearLayout>

<Switch
android:id="@+id/label_whiteV2"
style="@style/customSwitch"
tools:ignore="UseSwitchCompatOrMaterialXml" />
android:paddingTop="3dp"
android:text="@string/label_always_white_v2_title"
android:textColor="@color/textColorPrimary"
android:textSize="@dimen/cont_title_size"
android:textStyle="bold" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|center"
android:paddingTop="3dp"
android:text="@string/label_always_white_v2_desc"
android:textColor="@color/textColorSecondary"
android:textSize="@dimen/cont_desc_size" />

</LinearLayout>

<View style="@style/dividerTransparent" />
<Switch
android:id="@+id/label_whiteV2"
style="@style/customSwitch"
tools:ignore="UseSwitchCompatOrMaterialXml" />

</LinearLayout>

<View style="@style/dividerTransparent" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down Expand Up @@ -377,61 +369,53 @@
<View style="@style/dividerTransparent" />

<LinearLayout
android:id="@+id/icon_label_follow_system_v2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:background="@drawable/container_mid"
android:orientation="horizontal"
android:paddingStart="@dimen/container_paddingSide"
android:paddingTop="@dimen/container_padding"
android:paddingEnd="@dimen/container_paddingSide"
android:paddingBottom="@dimen/container_padding">

<LinearLayout
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@drawable/container_mid"
android:orientation="horizontal"
android:paddingStart="@dimen/container_paddingSide"
android:paddingTop="@dimen/container_padding"
android:paddingEnd="@dimen/container_paddingSide"
android:paddingBottom="@dimen/container_padding">

<LinearLayout
android:layout_width="0dp"
android:layout_gravity="start|center"
android:layout_marginEnd="@dimen/container_padding"
android:layout_weight="1.0"
android:orientation="vertical">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|center"
android:layout_marginEnd="@dimen/container_padding"
android:layout_weight="1.0"
android:orientation="vertical">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|center"
android:paddingTop="3dp"
android:text="@string/label_follow_system_v2_title"
android:textColor="@color/textColorPrimary"
android:textSize="@dimen/cont_title_size"
android:textStyle="bold" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|center"
android:paddingTop="3dp"
android:text="@string/label_follow_system_v2_desc"
android:textColor="@color/textColorSecondary"
android:textSize="@dimen/cont_desc_size" />

</LinearLayout>

<Switch
android:id="@+id/label_systemInverseV2"
style="@style/customSwitch"
tools:ignore="UseSwitchCompatOrMaterialXml" />
android:paddingTop="3dp"
android:text="@string/label_follow_system_v2_title"
android:textColor="@color/textColorPrimary"
android:textSize="@dimen/cont_title_size"
android:textStyle="bold" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|center"
android:paddingTop="3dp"
android:text="@string/label_follow_system_v2_desc"
android:textColor="@color/textColorSecondary"
android:textSize="@dimen/cont_desc_size" />

</LinearLayout>

<View style="@style/dividerTransparent" />
<Switch
android:id="@+id/label_systemInverseV2"
style="@style/customSwitch"
tools:ignore="UseSwitchCompatOrMaterialXml" />

</LinearLayout>

<View style="@style/dividerTransparent" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down

0 comments on commit 18d54d0

Please sign in to comment.