Mirrors/SnapEnhance
1
0
Fork 0
mirror of https://github.com/rhunk/SnapEnhance.git synced 2025-06-13 05:37:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: immersive preview borders

Browse Source 
- todo: edits container offset
- remove cognac button
- better hide call buttons
This commit is contained in:
rhunk
2023-09-27 00:50:28 +02:00
parent 35418a9735
commit 061f5cc5a8
3 changed files with 50 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/assets/lang/en_US.json
View File

@ -615,8 +615,8 @@
"SAVABLE_SNAP": "Savable Snap" "SAVABLE_SNAP": "Savable Snap"
}, },
"hide_ui_components": { "hide_ui_components": {
"hide_call_buttons": "Remove Call Buttons", "hide_profile_call_buttons": "Remove Profile Call Buttons",
"hide_cognac_button": "Remove Cognac Button", "hide_chat_call_buttons": "Remove Chat Call Buttons",
"hide_live_location_share_button": "Remove Live Location Share Button", "hide_live_location_share_button": "Remove Live Location Share Button",
"hide_stickers_button": "Remove Stickers Button", "hide_stickers_button": "Remove Stickers Button",
"hide_voice_record_button": "Remove Voice Record Button" "hide_voice_record_button": "Remove Voice Record Button"

4
core/src/main/kotlin/me/rhunk/snapenhance/core/config/impl/UserInterfaceTweaks.kt
View File

@ -26,9 +26,9 @@ class UserInterfaceTweaks : ConfigContainer() {
val hideUiComponents = multiple("hide_ui_components", val hideUiComponents = multiple("hide_ui_components",
"hide_voice_record_button", "hide_voice_record_button",
"hide_stickers_button", "hide_stickers_button",
"hide_cognac_button",
"hide_live_location_share_button", "hide_live_location_share_button",
"hide_call_buttons" "hide_chat_call_buttons",
"hide_profile_call_buttons"
) )
val ddBitmojiSelfie = boolean("2d_bitmoji_selfie") val ddBitmojiSelfie = boolean("2d_bitmoji_selfie")
val disableSpotlight = boolean("disable_spotlight") val disableSpotlight = boolean("disable_spotlight")

90
core/src/main/kotlin/me/rhunk/snapenhance/features/impl/ui/UITweaks.kt
View File

@ -3,9 +3,10 @@ package me.rhunk.snapenhance.features.impl.ui
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context
import android.content.res.Resources import android.content.res.Resources
import android.graphics.Rect
import android.text.SpannableString import android.text.SpannableString
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup.MarginLayoutParams
import android.widget.FrameLayout import android.widget.FrameLayout
import me.rhunk.snapenhance.Constants import me.rhunk.snapenhance.Constants
import me.rhunk.snapenhance.core.event.events.impl.AddViewEvent import me.rhunk.snapenhance.core.event.events.impl.AddViewEvent
@ -28,11 +29,13 @@ class UITweaks : Feature("UITweaks", loadParams = FeatureLoadParams.ACTIVITY_CRE
private fun hideStorySection(event: AddViewEvent) { private fun hideStorySection(event: AddViewEvent) {
val parent = event.parent val parent = event.parent
parent.visibility = View.GONE parent.visibility = View.GONE
val marginLayoutParams = parent.layoutParams as ViewGroup.MarginLayoutParams val marginLayoutParams = parent.layoutParams as MarginLayoutParams
marginLayoutParams.setMargins(-99999, -99999, -99999, -99999) marginLayoutParams.setMargins(-99999, -99999, -99999, -99999)
event.canceled = true event.canceled = true
} }
private var surfaceViewAspectRatio: Float = 0f
@SuppressLint("DiscouragedApi", "InternalInsetResource") @SuppressLint("DiscouragedApi", "InternalInsetResource")
override fun onActivityCreate() { override fun onActivityCreate() {
val blockAds by context.config.global.blockAds val blockAds by context.config.global.blockAds
@ -41,6 +44,12 @@ class UITweaks : Feature("UITweaks", loadParams = FeatureLoadParams.ACTIVITY_CRE
val isImmersiveCamera by context.config.camera.immersiveCameraPreview val isImmersiveCamera by context.config.camera.immersiveCameraPreview
val displayMetrics = context.resources.displayMetrics val displayMetrics = context.resources.displayMetrics
val deviceAspectRatio = displayMetrics.widthPixels.toFloat() / displayMetrics.heightPixels.toFloat()
val statusBarHeight = run {
val resourceId = context.resources.getIdentifier("status_bar_height", "dimen", "android")
if (resourceId > 0) context.resources.getDimensionPixelSize(resourceId)
else Rect().apply { context.mainActivity!!.window.decorView.getWindowVisibleDisplayFrame(this) }.top
}
val callButtonsStub = getIdentifier("call_buttons_stub", "id") val callButtonsStub = getIdentifier("call_buttons_stub", "id")
val callButton1 = getIdentifier("friend_action_button3", "id") val callButton1 = getIdentifier("friend_action_button3", "id")
@ -48,6 +57,14 @@ class UITweaks : Feature("UITweaks", loadParams = FeatureLoadParams.ACTIVITY_CRE
val chatNoteRecordButton = getIdentifier("chat_note_record_button", "id") val chatNoteRecordButton = getIdentifier("chat_note_record_button", "id")
View::class.java.hook("setVisibility", HookStage.BEFORE) { methodParam ->
val viewId = (methodParam.thisObject() as View).id
if (viewId == callButton1 || viewId == callButton2) {
if (!hiddenElements.contains("hide_profile_call_buttons")) return@hook
methodParam.setArg(0, View.GONE)
}
}
Resources::class.java.methods.first { it.name == "getDimensionPixelSize"}.hook(HookStage.AFTER, Resources::class.java.methods.first { it.name == "getDimensionPixelSize"}.hook(HookStage.AFTER,
{ isImmersiveCamera } { isImmersiveCamera }
) { param -> ) { param ->
@ -58,18 +75,6 @@ class UITweaks : Feature("UITweaks", loadParams = FeatureLoadParams.ACTIVITY_CRE
} }
} }
Hooker.hook(View::class.java, "setVisibility", HookStage.BEFORE) { methodParam ->
val viewId = (methodParam.thisObject() as View).id
if (viewId == chatNoteRecordButton && hiddenElements.contains("hide_voice_record_button")) {
methodParam.setArg(0, View.GONE)
}
if (viewId == callButton1 || viewId == callButton2) {
if (!hiddenElements.contains("hide_call_buttons")) return@hook
methodParam.setArg(0, View.GONE)
}
}
context.event.subscribe(AddViewEvent::class) { event -> context.event.subscribe(AddViewEvent::class) { event ->
val viewId = event.view.id val viewId = event.view.id
val view = event.view val view = event.view
@ -113,43 +118,40 @@ class UITweaks : Feature("UITweaks", loadParams = FeatureLoadParams.ACTIVITY_CRE
} }
if (isImmersiveCamera) { if (isImmersiveCamera) {
if (view.id == getIdentifier("edits_container", "id")) {
val deviceAspectRatio = displayMetrics.widthPixels.toFloat() / displayMetrics.heightPixels.toFloat()
Hooker.hookObjectMethod(View::class.java, view, "layout", HookStage.BEFORE) {
val width = it.arg(2) as Int
val realHeight = (width / deviceAspectRatio).toInt()
it.setArg(3, realHeight)
}
}
if (view.id == getIdentifier("full_screen_surface_view", "id")) { if (view.id == getIdentifier("full_screen_surface_view", "id")) {
Hooker.hookObjectMethod(View::class.java, view, "layout", HookStage.BEFORE) { Hooker.hookObjectMethod(View::class.java, view, "layout", HookStage.BEFORE) {
it.setArg(1, 1) val width = it.arg(2) as Int
val height = it.arg(3) as Int
if (height <= 0 || width <= 0) return@hookObjectMethod
surfaceViewAspectRatio = width.toFloat() / height.toFloat()
it.setArg(2, (displayMetrics.heightPixels * surfaceViewAspectRatio).toInt())
it.setArg(3, displayMetrics.heightPixels) it.setArg(3, displayMetrics.heightPixels)
} }
} }
if (view.id == getIdentifier("edits_container", "id")) {
Hooker.hookObjectMethod(View::class.java, view, "layout", HookStage.BEFORE) {
//TODO: fix edits position on the canvas
}
}
} }
if (viewId == chatNoteRecordButton && hiddenElements.contains("hide_voice_record_button")) { if (
view.isEnabled = false (viewId == chatNoteRecordButton && hiddenElements.contains("hide_voice_record_button")) ||
view.setWillNotDraw(true) (viewId == getIdentifier("chat_input_bar_sticker", "id") && hiddenElements.contains("hide_stickers_button")) ||
} (viewId == getIdentifier("chat_input_bar_sharing_drawer_button", "id") && hiddenElements.contains("hide_live_location_share_button")) ||
(viewId == callButtonsStub && hiddenElements.contains("hide_chat_call_buttons"))
if (getIdentifier("chat_input_bar_cognac", "id") == viewId && hiddenElements.contains("hide_cognac_button")) { ) {
view.visibility = View.GONE view.apply {
} view.post {
if (getIdentifier("chat_input_bar_sticker", "id") == viewId && hiddenElements.contains("hide_stickers_button")) { isEnabled = false
view.visibility = View.GONE setWillNotDraw(true)
} view.visibility = View.GONE
if (getIdentifier("chat_input_bar_sharing_drawer_button", "id") == viewId && hiddenElements.contains("hide_live_location_share_button")) { }
event.canceled = true addOnLayoutChangeListener { view, _, _, _, _, _, _, _, _ ->
} view.post { view.visibility = View.GONE }
if (viewId == callButton1 || viewId == callButton2) { }
if (!hiddenElements.contains("hide_call_buttons")) return@subscribe }
if (view.visibility == View.GONE) return@subscribe
}
if (viewId == callButtonsStub) {
if (!hiddenElements.contains("hide_call_buttons")) return@subscribe
event.canceled = true
} }
} }
} }