Skip to content

Commit

Permalink
Android 13: Hide options which are not compatible
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mahmud0808
Mahmud0808 committed Apr 26, 2023
1 parent 84759c1 commit 8eb74ff
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 72 deletions.
9 changes: 5 additions & 4 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 @@ -8,6 +8,7 @@
import static com.drdisagree.iconify.common.References.FABRICATED_QS_TEXT_SIZE;

import android.annotation.SuppressLint;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.view.View;
Expand All @@ -18,17 +19,13 @@
import android.widget.Toast;

import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;

import com.drdisagree.iconify.Iconify;
import com.drdisagree.iconify.R;
import com.drdisagree.iconify.config.Prefs;
import com.drdisagree.iconify.ui.utils.ViewBindingHelpers;
import com.drdisagree.iconify.utils.FabricatedUtil;
import com.drdisagree.iconify.utils.OverlayUtil;
import com.google.android.material.appbar.CollapsingToolbarLayout;

import java.util.Objects;

public class QsIconLabel extends AppCompatActivity {

Expand Down Expand Up @@ -310,6 +307,10 @@ public void onStopTrackingTouch(SeekBar seekBar) {
}
});

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
5 changes: 5 additions & 0 deletions app/src/main/java/com/drdisagree/iconify/ui/fragments/Tweaks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import static com.drdisagree.iconify.common.References.FRAGMENT_XPOSEDMENU;

import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.view.LayoutInflater;
Expand Down Expand Up @@ -34,6 +35,7 @@
import com.google.android.material.appbar.CollapsingToolbarLayout;

import java.util.ArrayList;
import java.util.Objects;

public class Tweaks extends Fragment {

Expand Down Expand Up @@ -123,6 +125,9 @@ private void addItem(ArrayList<Object[]> pack) {
list.setOnClickListener((View.OnClickListener) pack.get(i)[0]);
}

if (Objects.equals((String) pack.get(i)[1], getResources().getString(R.string.activity_title_media_player)) && Build.VERSION.SDK_INT >= 33)
list.setVisibility(View.GONE);

listView.addView(list);
}
}
Expand Down
152 changes: 84 additions & 68 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,53 +273,61 @@
<View style="@style/dividerTransparent" />

<LinearLayout
android:id="@+id/icon_label_always_white_v2"
android:layout_width="match_parent"
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">
android:orientation="vertical">

<LinearLayout
android:layout_width="0dp"
android:layout_width="match_parent"
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: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_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" />
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" />

</LinearLayout>

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

</LinearLayout>

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

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

<LinearLayout
android:id="@+id/icon_label_follow_system_v2"
android:layout_width="match_parent"
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">
android:orientation="vertical">

<LinearLayout
android:layout_width="0dp"
android:layout_width="match_parent"
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: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_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" />
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" />

</LinearLayout>

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

</LinearLayout>

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

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

0 comments on commit 8eb74ff

Please sign in to comment.