Skip to content

Commit

Permalink
Depth Wallpaper: Attempt to fix missing keyguard indication text
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mahmud0808
Mahmud0808 committed Sep 23, 2023
1 parent 89b2121 commit 3209da9
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 51 deletions.
53 changes: 26 additions & 27 deletions app/src/main/java/com/drdisagree/iconify/xposed/mods/DepthWallpaper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,49 +67,48 @@ protected void afterHookedMethod(MethodHookParam param) {
if (!showDepthWallpaper) return;

View view = (View) param.thisObject;
ViewGroup container = view.findViewById(mContext.getResources().getIdentifier("keyguard_indication_area", "id", mContext.getPackageName()));
ViewGroup mIndicationArea = view.findViewById(mContext.getResources().getIdentifier("keyguard_indication_area", "id", mContext.getPackageName()));

container.setClipChildren(false);
container.setClipToPadding(false);
container.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT;
container.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
((ViewGroup.MarginLayoutParams) container.getLayoutParams()).bottomMargin = 0;
mIndicationArea.setClipChildren(false);
mIndicationArea.setClipToPadding(false);
mIndicationArea.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT;
mIndicationArea.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
((ViewGroup.MarginLayoutParams) mIndicationArea.getLayoutParams()).bottomMargin = 0;

// Create a new layout for the indication text views
LinearLayout mIndicationView = new LinearLayout(mContext);
LinearLayout mIndicationTextView = new LinearLayout(mContext);
LinearLayout.LayoutParams mIndicationViewParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
int bottomMargin = mContext.getResources().getDimensionPixelSize(mContext.getResources().getIdentifier("keyguard_indication_margin_bottom", "dimen", mContext.getPackageName()));
mIndicationViewParams.setMargins(0, 0, 0, bottomMargin);
mIndicationViewParams.gravity = Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL;
mIndicationView.setOrientation(LinearLayout.VERTICAL);
mIndicationView.setLayoutParams(mIndicationViewParams);
mIndicationTextView.setGravity(Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL);
mIndicationTextView.setOrientation(LinearLayout.VERTICAL);
mIndicationTextView.setLayoutParams(mIndicationViewParams);

// Add the indication text views to the new layout
TextView mTopIndicationView = container.findViewById(mContext.getResources().getIdentifier("keyguard_indication_text", "id", mContext.getPackageName()));
TextView mLockScreenIndicationView = container.findViewById(mContext.getResources().getIdentifier("keyguard_indication_text_bottom", "id", mContext.getPackageName()));
TextView mTopIndicationView = mIndicationArea.findViewById(mContext.getResources().getIdentifier("keyguard_indication_text", "id", mContext.getPackageName()));
TextView mLockScreenIndicationView = mIndicationArea.findViewById(mContext.getResources().getIdentifier("keyguard_indication_text_bottom", "id", mContext.getPackageName()));

((ViewGroup) mTopIndicationView.getParent()).removeView(mTopIndicationView);
((ViewGroup) mLockScreenIndicationView.getParent()).removeView(mLockScreenIndicationView);
mIndicationView.addView(mTopIndicationView);
mIndicationView.addView(mLockScreenIndicationView);
container.addView(mIndicationView);
mIndicationTextView.addView(mTopIndicationView);
mIndicationTextView.addView(mLockScreenIndicationView);

FrameLayout mIndicationAreaDupe = new FrameLayout(mContext);
mIndicationAreaDupe.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
mIndicationAreaDupe.addView(mIndicationTextView, -1);
mIndicationArea.addView(mIndicationAreaDupe);

// Get the depth wallpaper layout
String depth_wall_tag = "iconify_depth_wallpaper";
mDepthWallpaperLayout = container.findViewWithTag(depth_wall_tag);
mDepthWallpaperLayout = mIndicationArea.findViewWithTag(depth_wall_tag);

// Create the depth wallpaper layout if it doesn't exist
if (mDepthWallpaperLayout == null) {
mDepthWallpaperLayout = new FrameLayout(mContext);
mDepthWallpaperLayout.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
mDepthWallpaperLayout.setTag(depth_wall_tag);

FrameLayout mIndicationArea = new FrameLayout(mContext);
FrameLayout.LayoutParams mIndicationAreaParams = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
mIndicationArea.setLayoutParams(mIndicationAreaParams);

mIndicationArea.addView(mDepthWallpaperLayout, 0);
container.addView(mIndicationArea, 0);
mIndicationAreaDupe.addView(mDepthWallpaperLayout, 0);
}

mDepthWallpaperBackground = new ImageView(mContext);
Expand All @@ -127,8 +126,8 @@ protected void afterHookedMethod(MethodHookParam param) {
int offset = mContext.getResources().getDimensionPixelSize(mContext.getResources().getIdentifier("keyguard_affordance_fixed_height", "dimen", mContext.getPackageName()))
+ mContext.getResources().getDimensionPixelSize(mContext.getResources().getIdentifier("keyguard_affordance_horizontal_offset", "dimen", mContext.getPackageName()));

startButton.getViewTreeObserver().addOnGlobalLayoutListener(() -> ((ViewGroup.MarginLayoutParams) mIndicationView.getLayoutParams()).setMarginStart(startButton.getVisibility() == View.VISIBLE ? offset : 0));
endButton.getViewTreeObserver().addOnGlobalLayoutListener(() -> ((ViewGroup.MarginLayoutParams) mIndicationView.getLayoutParams()).setMarginEnd(endButton.getVisibility() == View.VISIBLE ? offset : 0));
startButton.getViewTreeObserver().addOnGlobalLayoutListener(() -> ((ViewGroup.MarginLayoutParams) mIndicationTextView.getLayoutParams()).setMarginStart(startButton.getVisibility() == View.VISIBLE ? offset : 0));
endButton.getViewTreeObserver().addOnGlobalLayoutListener(() -> ((ViewGroup.MarginLayoutParams) mIndicationTextView.getLayoutParams()).setMarginEnd(endButton.getVisibility() == View.VISIBLE ? offset : 0));

updateWallpaper();
}
Expand Down Expand Up @@ -178,11 +177,11 @@ protected void afterHookedMethod(MethodHookParam param) {
if (!showDepthWallpaper) return;

View view = (View) param.thisObject;
ViewGroup container = view.findViewById(mContext.getResources().getIdentifier("keyguard_indication_area", "id", mContext.getPackageName()));
ViewGroup mIndicationArea = view.findViewById(mContext.getResources().getIdentifier("keyguard_indication_area", "id", mContext.getPackageName()));

ViewGroup.MarginLayoutParams mlp = (ViewGroup.MarginLayoutParams) container.getLayoutParams();
ViewGroup.MarginLayoutParams mlp = (ViewGroup.MarginLayoutParams) mIndicationArea.getLayoutParams();
mlp.bottomMargin = 0;
container.setLayoutParams(mlp);
mIndicationArea.setLayoutParams(mlp);
}
});
}
Expand Down
47 changes: 23 additions & 24 deletions app/src/main/java/com/drdisagree/iconify/xposed/mods/LockscreenClock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,49 +124,48 @@ protected void afterHookedMethod(MethodHookParam param) {
if (!showLockscreenClock || !showDepthWallpaper) return;

View view = (View) param.thisObject;
ViewGroup container = view.findViewById(mContext.getResources().getIdentifier("keyguard_indication_area", "id", mContext.getPackageName()));
ViewGroup mIndicationArea = view.findViewById(mContext.getResources().getIdentifier("keyguard_indication_area", "id", mContext.getPackageName()));

container.setClipChildren(false);
container.setClipToPadding(false);
container.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT;
container.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
((ViewGroup.MarginLayoutParams) container.getLayoutParams()).bottomMargin = 0;
mIndicationArea.setClipChildren(false);
mIndicationArea.setClipToPadding(false);
mIndicationArea.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT;
mIndicationArea.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
((ViewGroup.MarginLayoutParams) mIndicationArea.getLayoutParams()).bottomMargin = 0;

// Create a new layout for the indication text views
LinearLayout mIndicationView = new LinearLayout(mContext);
LinearLayout mIndicationTextView = new LinearLayout(mContext);
LinearLayout.LayoutParams mIndicationViewParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
int bottomMargin = mContext.getResources().getDimensionPixelSize(mContext.getResources().getIdentifier("keyguard_indication_margin_bottom", "dimen", mContext.getPackageName()));
mIndicationViewParams.setMargins(0, 0, 0, bottomMargin);
mIndicationViewParams.gravity = Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL;
mIndicationView.setOrientation(LinearLayout.VERTICAL);
mIndicationView.setLayoutParams(mIndicationViewParams);
mIndicationTextView.setGravity(Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL);
mIndicationTextView.setOrientation(LinearLayout.VERTICAL);
mIndicationTextView.setLayoutParams(mIndicationViewParams);

// Add the indication text views to the new layout
TextView mTopIndicationView = container.findViewById(mContext.getResources().getIdentifier("keyguard_indication_text", "id", mContext.getPackageName()));
TextView mLockScreenIndicationView = container.findViewById(mContext.getResources().getIdentifier("keyguard_indication_text_bottom", "id", mContext.getPackageName()));
TextView mTopIndicationView = mIndicationArea.findViewById(mContext.getResources().getIdentifier("keyguard_indication_text", "id", mContext.getPackageName()));
TextView mLockScreenIndicationView = mIndicationArea.findViewById(mContext.getResources().getIdentifier("keyguard_indication_text_bottom", "id", mContext.getPackageName()));

container.removeView(mTopIndicationView);
container.removeView(mLockScreenIndicationView);
mIndicationView.addView(mTopIndicationView);
mIndicationView.addView(mLockScreenIndicationView);
container.addView(mIndicationView);
((ViewGroup) mTopIndicationView.getParent()).removeView(mTopIndicationView);
((ViewGroup) mLockScreenIndicationView.getParent()).removeView(mLockScreenIndicationView);
mIndicationTextView.addView(mTopIndicationView);
mIndicationTextView.addView(mLockScreenIndicationView);

FrameLayout mIndicationAreaDupe = new FrameLayout(mContext);
mIndicationAreaDupe.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
mIndicationAreaDupe.addView(mIndicationTextView, -1);
mIndicationArea.addView(mIndicationAreaDupe);

// Get the depth wallpaper layout
String depth_wall_tag = "iconify_depth_wallpaper";
mClockViewContainer = container.findViewWithTag(depth_wall_tag);
mClockViewContainer = mIndicationArea.findViewWithTag(depth_wall_tag);

// Create the depth wallpaper layout if it doesn't exist
if (mClockViewContainer == null) {
mClockViewContainer = new FrameLayout(mContext);
mClockViewContainer.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
mClockViewContainer.setTag(depth_wall_tag);

FrameLayout mIndicationArea = new FrameLayout(mContext);
FrameLayout.LayoutParams mIndicationAreaParams = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
mIndicationArea.setLayoutParams(mIndicationAreaParams);

mIndicationArea.addView(mClockViewContainer, 0);
container.addView(mIndicationArea, 0);
mIndicationAreaDupe.addView(mClockViewContainer, 0);
}

registerClockUpdater();
Expand Down

0 comments on commit 3209da9

Please sign in to comment.