diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml index 5541acd..ab33a4f 100644 --- a/res/values/cherish_strings.xml +++ b/res/values/cherish_strings.xml @@ -543,6 +543,10 @@ Icon pack Set custom icon pack style + Signal icon style + Set custom signal icon style + WiFi icon style + Set custom wifi icon style Signal diff --git a/res/xml/cherish_settings_theme.xml b/res/xml/cherish_settings_theme.xml index 44658e4..69bb6b2 100644 --- a/res/xml/cherish_settings_theme.xml +++ b/res/xml/cherish_settings_theme.xml @@ -49,13 +49,19 @@ android:summary="@string/theme_customization_icon_shape_summary" android:fragment="com.cherish.settings.fragments.ui.IconShapes"/> - + + - + + diff --git a/src/com/cherish/settings/fragments/ThemeSettings.java b/src/com/cherish/settings/fragments/ThemeSettings.java index 8456901..44c8b73 100644 --- a/src/com/cherish/settings/fragments/ThemeSettings.java +++ b/src/com/cherish/settings/fragments/ThemeSettings.java @@ -96,10 +96,6 @@ public class ThemeSettings extends DashboardFragment implements OnPreferenceChan Context context, Lifecycle lifecycle, Fragment fragment) { final List controllers = new ArrayList<>(); - controllers.add(new OverlayCategoryPreferenceController(context, - "android.theme.customization.signal_icon")); - controllers.add(new OverlayCategoryPreferenceController(context, - "android.theme.customization.wifi_icon")); return controllers; } diff --git a/src/com/cherish/settings/fragments/ui/SignalIcons.java b/src/com/cherish/settings/fragments/ui/SignalIcons.java new file mode 100644 index 0000000..8067c82 --- /dev/null +++ b/src/com/cherish/settings/fragments/ui/SignalIcons.java @@ -0,0 +1,244 @@ +/* + * Copyright (C) 2022 crDroid Android Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.cherish.settings.fragments.ui; + +import android.content.ContentResolver; +import android.content.Context; +import android.content.res.Resources; +import android.content.pm.PackageManager; +import android.graphics.drawable.AnimationDrawable; +import android.graphics.drawable.Drawable; +import android.os.Bundle; +import android.provider.SearchIndexableResource; +import android.provider.Settings; +import android.view.LayoutInflater; +import android.view.View; +import android.view.Gravity; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.FrameLayout; +import android.widget.TextView; +import android.widget.Toast; +import android.text.TextUtils; +import androidx.preference.PreferenceViewHolder; +import android.view.ViewGroup.LayoutParams; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; +import androidx.recyclerview.widget.RecyclerView; +import android.net.Uri; +import androidx.core.content.res.ResourcesCompat; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceScreen; + +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.settings.R; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.Indexable; +import com.android.settings.SettingsPreferenceFragment; + +import com.bumptech.glide.Glide; + +import com.android.internal.util.cherish.ThemeUtils; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Arrays; + +import org.json.JSONObject; +import org.json.JSONException; + +public class SignalIcons extends SettingsPreferenceFragment { + + private RecyclerView mRecyclerView; + private ThemeUtils mThemeUtils; + private String mCategory = "android.theme.customization.signal_icon"; + + private List mPkgs; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + getActivity().setTitle(R.string.theme_customization_signal_icon_title); + + mThemeUtils = new ThemeUtils(getActivity()); + mPkgs = mThemeUtils.getOverlayPackagesForCategory(mCategory, "android"); + Collections.sort(mPkgs); + } + + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { + View view = inflater.inflate( + R.layout.item_view, container, false); + + mRecyclerView = (RecyclerView) view.findViewById(R.id.recycler_view); + GridLayoutManager gridLayoutManager = new GridLayoutManager(getActivity(), 3); + mRecyclerView.setLayoutManager(gridLayoutManager); + Adapter mAdapter = new Adapter(getActivity()); + mRecyclerView.setAdapter(mAdapter); + + return view; + } + + @Override + public int getMetricsCategory() { + return MetricsEvent.CHERISH_SETTINGS; + } + + @Override + public void onResume() { + super.onResume(); + } + + public class Adapter extends RecyclerView.Adapter { + Context context; + String mSelectedPkg; + String mAppliedPkg; + + public Adapter(Context context) { + this.context = context; + } + + @Override + public CustomViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.icon_option, parent, false); + CustomViewHolder vh = new CustomViewHolder(v); + return vh; + } + + @Override + public void onBindViewHolder(CustomViewHolder holder, final int position) { + String iconPkg = mPkgs.get(position); + + holder.image1.setBackgroundDrawable(getDrawable(holder.image1.getContext(), iconPkg, "ic_signal_cellular_0_5_bar")); + holder.image2.setBackgroundDrawable(getDrawable(holder.image2.getContext(), iconPkg, "ic_signal_cellular_1_5_bar")); + holder.image3.setBackgroundDrawable(getDrawable(holder.image3.getContext(), iconPkg, "ic_signal_cellular_3_5_bar")); + holder.image4.setBackgroundDrawable(getDrawable(holder.image4.getContext(), iconPkg, "ic_signal_cellular_5_5_bar")); + + String currentPackageName = mThemeUtils.getOverlayInfos(mCategory).stream() + .filter(info -> info.isEnabled()) + .map(info -> info.packageName) + .findFirst() + .orElse("android"); + + holder.name.setText("android".equals(iconPkg) ? "Default" : getLabel(holder.name.getContext(), iconPkg)); + + if (currentPackageName.equals(iconPkg)) { + mAppliedPkg = iconPkg; + if (mSelectedPkg == null) { + mSelectedPkg = iconPkg; + } + } + + holder.itemView.setActivated(iconPkg == mSelectedPkg); + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + updateActivatedStatus(mSelectedPkg, false); + updateActivatedStatus(iconPkg, true); + mSelectedPkg = iconPkg; + enableOverlays(position); + } + }); + } + + @Override + public int getItemCount() { + return mPkgs.size(); + } + + public class CustomViewHolder extends RecyclerView.ViewHolder { + TextView name; + ImageView image1; + ImageView image2; + ImageView image3; + ImageView image4; + public CustomViewHolder(View itemView) { + super(itemView); + name = (TextView) itemView.findViewById(R.id.option_label); + image1 = (ImageView) itemView.findViewById(R.id.image1); + image2 = (ImageView) itemView.findViewById(R.id.image2); + image3 = (ImageView) itemView.findViewById(R.id.image3); + image4 = (ImageView) itemView.findViewById(R.id.image4); + } + } + + private void updateActivatedStatus(String pkg, boolean isActivated) { + int index = mPkgs.indexOf(pkg); + if (index < 0) { + return; + } + RecyclerView.ViewHolder holder = mRecyclerView.findViewHolderForAdapterPosition(index); + if (holder != null && holder.itemView != null) { + holder.itemView.setActivated(isActivated); + } + } + } + + public Drawable getDrawable(Context context, String pkg, String drawableName) { + try { + PackageManager pm = context.getPackageManager(); + Resources res = pkg.equals("android") ? Resources.getSystem() + : pm.getResourcesForApplication(pkg); + int resId = res.getIdentifier(drawableName, "drawable", pkg); + if (resId == 0) { + return Resources.getSystem().getDrawable( + Resources.getSystem().getIdentifier(drawableName, "drawable", "android")); + } + return res.getDrawable(resId); + } + catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + } + return null; + } + + public String getLabel(Context context, String pkg) { + PackageManager pm = context.getPackageManager(); + try { + return pm.getApplicationInfo(pkg, 0) + .loadLabel(pm).toString(); + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + } + return pkg; + } + + public void enableOverlays(int position) { + mThemeUtils.setOverlayEnabled(mCategory, mPkgs.get(position)); + } + + public void enableOverlay(String category, String target, String pattern) { + if (pattern.isEmpty()) { + mThemeUtils.setOverlayEnabled(category, "android"); + return; + } + for (String pkg: mThemeUtils.getOverlayPackagesForCategory(category, target)) { + if (pkg.contains(pattern)) { + mThemeUtils.setOverlayEnabled(category, pkg); + } + } + } +} diff --git a/src/com/cherish/settings/fragments/ui/WifiIcons.java b/src/com/cherish/settings/fragments/ui/WifiIcons.java new file mode 100644 index 0000000..1836714 --- /dev/null +++ b/src/com/cherish/settings/fragments/ui/WifiIcons.java @@ -0,0 +1,244 @@ +/* + * Copyright (C) 2022 crDroid Android Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.cherish.settings.fragments.ui; + +import android.content.ContentResolver; +import android.content.Context; +import android.content.res.Resources; +import android.content.pm.PackageManager; +import android.graphics.drawable.AnimationDrawable; +import android.graphics.drawable.Drawable; +import android.os.Bundle; +import android.provider.SearchIndexableResource; +import android.provider.Settings; +import android.view.LayoutInflater; +import android.view.View; +import android.view.Gravity; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.FrameLayout; +import android.widget.TextView; +import android.widget.Toast; +import android.text.TextUtils; +import androidx.preference.PreferenceViewHolder; +import android.view.ViewGroup.LayoutParams; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; +import androidx.recyclerview.widget.RecyclerView; +import android.net.Uri; +import androidx.core.content.res.ResourcesCompat; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceScreen; + +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.settings.R; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.Indexable; +import com.android.settings.SettingsPreferenceFragment; + +import com.bumptech.glide.Glide; + +import com.android.internal.util.cherish.ThemeUtils; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Arrays; + +import org.json.JSONObject; +import org.json.JSONException; + +public class WifiIcons extends SettingsPreferenceFragment { + + private RecyclerView mRecyclerView; + private ThemeUtils mThemeUtils; + private String mCategory = "android.theme.customization.wifi_icon"; + + private List mPkgs; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + getActivity().setTitle(R.string.theme_customization_wifi_icon_title); + + mThemeUtils = new ThemeUtils(getActivity()); + mPkgs = mThemeUtils.getOverlayPackagesForCategory(mCategory, "android"); + Collections.sort(mPkgs); + } + + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { + View view = inflater.inflate( + R.layout.item_view, container, false); + + mRecyclerView = (RecyclerView) view.findViewById(R.id.recycler_view); + GridLayoutManager gridLayoutManager = new GridLayoutManager(getActivity(), 3); + mRecyclerView.setLayoutManager(gridLayoutManager); + Adapter mAdapter = new Adapter(getActivity()); + mRecyclerView.setAdapter(mAdapter); + + return view; + } + + @Override + public int getMetricsCategory() { + return MetricsEvent.CHERISH_SETTINGS; + } + + @Override + public void onResume() { + super.onResume(); + } + + public class Adapter extends RecyclerView.Adapter { + Context context; + String mSelectedPkg; + String mAppliedPkg; + + public Adapter(Context context) { + this.context = context; + } + + @Override + public CustomViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.icon_option, parent, false); + CustomViewHolder vh = new CustomViewHolder(v); + return vh; + } + + @Override + public void onBindViewHolder(CustomViewHolder holder, final int position) { + String iconPkg = mPkgs.get(position); + + holder.image1.setBackgroundDrawable(getDrawable(holder.image1.getContext(), iconPkg, "ic_wifi_signal_0")); + holder.image2.setBackgroundDrawable(getDrawable(holder.image2.getContext(), iconPkg, "ic_wifi_signal_2")); + holder.image3.setBackgroundDrawable(getDrawable(holder.image3.getContext(), iconPkg, "ic_wifi_signal_3")); + holder.image4.setBackgroundDrawable(getDrawable(holder.image4.getContext(), iconPkg, "ic_wifi_signal_4")); + + String currentPackageName = mThemeUtils.getOverlayInfos(mCategory).stream() + .filter(info -> info.isEnabled()) + .map(info -> info.packageName) + .findFirst() + .orElse("android"); + + holder.name.setText("android".equals(iconPkg) ? "Default" : getLabel(holder.name.getContext(), iconPkg)); + + if (currentPackageName.equals(iconPkg)) { + mAppliedPkg = iconPkg; + if (mSelectedPkg == null) { + mSelectedPkg = iconPkg; + } + } + + holder.itemView.setActivated(iconPkg == mSelectedPkg); + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + updateActivatedStatus(mSelectedPkg, false); + updateActivatedStatus(iconPkg, true); + mSelectedPkg = iconPkg; + enableOverlays(position); + } + }); + } + + @Override + public int getItemCount() { + return mPkgs.size(); + } + + public class CustomViewHolder extends RecyclerView.ViewHolder { + TextView name; + ImageView image1; + ImageView image2; + ImageView image3; + ImageView image4; + public CustomViewHolder(View itemView) { + super(itemView); + name = (TextView) itemView.findViewById(R.id.option_label); + image1 = (ImageView) itemView.findViewById(R.id.image1); + image2 = (ImageView) itemView.findViewById(R.id.image2); + image3 = (ImageView) itemView.findViewById(R.id.image3); + image4 = (ImageView) itemView.findViewById(R.id.image4); + } + } + + private void updateActivatedStatus(String pkg, boolean isActivated) { + int index = mPkgs.indexOf(pkg); + if (index < 0) { + return; + } + RecyclerView.ViewHolder holder = mRecyclerView.findViewHolderForAdapterPosition(index); + if (holder != null && holder.itemView != null) { + holder.itemView.setActivated(isActivated); + } + } + } + + public Drawable getDrawable(Context context, String pkg, String drawableName) { + try { + PackageManager pm = context.getPackageManager(); + Resources res = pkg.equals("android") ? Resources.getSystem() + : pm.getResourcesForApplication(pkg); + int resId = res.getIdentifier(drawableName, "drawable", pkg); + if (resId == 0) { + return Resources.getSystem().getDrawable( + Resources.getSystem().getIdentifier(drawableName, "drawable", "android")); + } + return res.getDrawable(resId); + } + catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + } + return null; + } + + public String getLabel(Context context, String pkg) { + PackageManager pm = context.getPackageManager(); + try { + return pm.getApplicationInfo(pkg, 0) + .loadLabel(pm).toString(); + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + } + return pkg; + } + + public void enableOverlays(int position) { + mThemeUtils.setOverlayEnabled(mCategory, mPkgs.get(position)); + } + + public void enableOverlay(String category, String target, String pattern) { + if (pattern.isEmpty()) { + mThemeUtils.setOverlayEnabled(category, "android"); + return; + } + for (String pkg: mThemeUtils.getOverlayPackagesForCategory(category, target)) { + if (pkg.contains(pattern)) { + mThemeUtils.setOverlayEnabled(category, pkg); + } + } + } +}