From 608f237d9ef6d80f90692c8ee9dcb20e1dea6e77 Mon Sep 17 00:00:00 2001 From: Suphon Thanakornpakapong Date: Sun, 17 Oct 2021 22:59:52 +0700 Subject: [PATCH] Theme work tab cards --- lawnchair/AndroidManifest.xml | 13 ++++++++++- .../theme/drawable/DrawableTokens.kt | 3 +++ .../launcher3/allapps/WorkEduCard.java | 22 +++++++++++++++++-- .../launcher3/allapps/WorkPausedCard.java | 8 +++++++ 4 files changed, 43 insertions(+), 3 deletions(-) diff --git a/lawnchair/AndroidManifest.xml b/lawnchair/AndroidManifest.xml index 257bbbc4c4..33f268108d 100644 --- a/lawnchair/AndroidManifest.xml +++ b/lawnchair/AndroidManifest.xml @@ -16,9 +16,20 @@ ** limitations under the License. */ --> - + + + + + (R.drawable.work_card) + .setColor(ColorTokens.Surface) } diff --git a/src/com/android/launcher3/allapps/WorkEduCard.java b/src/com/android/launcher3/allapps/WorkEduCard.java index 9db7bf01ac..c0939d04cc 100644 --- a/src/com/android/launcher3/allapps/WorkEduCard.java +++ b/src/com/android/launcher3/allapps/WorkEduCard.java @@ -21,11 +21,20 @@ import android.view.View; import android.view.ViewGroup; import android.view.animation.Animation; import android.view.animation.AnimationUtils; +import android.widget.Button; import android.widget.FrameLayout; +import android.widget.LinearLayout; +import android.widget.TextView; + +import androidx.core.view.ViewCompat; import com.android.launcher3.Launcher; import com.android.launcher3.R; +import app.lawnchair.font.FontManager; +import app.lawnchair.theme.color.ColorTokens; +import app.lawnchair.theme.drawable.DrawableTokens; + /** * Work profile toggle switch shown at the bottom of AllApps work tab */ @@ -67,9 +76,18 @@ public class WorkEduCard extends FrameLayout implements View.OnClickListener, @Override protected void onFinishInflate() { super.onFinishInflate(); - findViewById(R.id.action_btn).setOnClickListener(this); - MarginLayoutParams lp = ((MarginLayoutParams) findViewById(R.id.wrapper).getLayoutParams()); + Button button = ViewCompat.requireViewById(this, R.id.action_btn); + button.setOnClickListener(this); + button.setAllCaps(false); + FontManager.INSTANCE.get(getContext()).setCustomFont(button, R.id.font_button); + + LinearLayout wrapper = ViewCompat.requireViewById(this, R.id.wrapper); + wrapper.setBackground(DrawableTokens.WorkCard.resolve(getContext())); + MarginLayoutParams lp = ((MarginLayoutParams) wrapper.getLayoutParams()); lp.width = mLauncher.getAppsView().getActiveRecyclerView().getTabWidth(); + + TextView title = ViewCompat.requireViewById(this, R.id.work_apps_paused_title); + title.setTextColor(ColorTokens.TextColorPrimary.resolveColor(getContext())); } @Override diff --git a/src/com/android/launcher3/allapps/WorkPausedCard.java b/src/com/android/launcher3/allapps/WorkPausedCard.java index 7908b63ec2..b6949aa9d5 100644 --- a/src/com/android/launcher3/allapps/WorkPausedCard.java +++ b/src/com/android/launcher3/allapps/WorkPausedCard.java @@ -24,11 +24,17 @@ import android.util.AttributeSet; import android.view.View; import android.widget.Button; import android.widget.LinearLayout; +import android.widget.TextView; + +import androidx.core.view.ViewCompat; import com.android.launcher3.Launcher; import com.android.launcher3.R; import com.android.launcher3.Utilities; +import app.lawnchair.font.FontManager; +import app.lawnchair.theme.color.ColorTokens; + /** * Work profile toggle switch shown at the bottom of AllApps work tab */ @@ -56,6 +62,8 @@ public class WorkPausedCard extends LinearLayout implements View.OnClickListener super.onFinishInflate(); mBtn = findViewById(R.id.enable_work_apps); mBtn.setOnClickListener(this); + mBtn.setAllCaps(false); + FontManager.INSTANCE.get(getContext()).setCustomFont(mBtn, R.id.font_button); } @Override