TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-17 16:47:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix[control]: Hide size/visibility editor on subButtons

Browse Source
This commit is contained in:
Mathias-Boulay 2023-05-15 23:30:31 +02:00 committed by ArtDev
parent f0e9f842ad
commit 3e9c4b1d59
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlSubButton.java
View File

@ -8,6 +8,7 @@ import android.view.ViewGroup;
import net.kdt.pojavlaunch.customcontrols.ControlData;
import net.kdt.pojavlaunch.customcontrols.ControlDrawerData;
import net.kdt.pojavlaunch.customcontrols.ControlLayout;
import net.kdt.pojavlaunch.customcontrols.handleview.EditControlPopup;
@SuppressLint("ViewConstructor")
public class ControlSubButton extends ControlButton {
@ -83,4 +84,9 @@ public class ControlSubButton extends ControlButton {
super.snapAndAlign(x, y);
// Else the button is forced into place
}
@Override
public void loadEditValues(EditControlPopup editControlPopup) {
editControlPopup.loadSubButtonValues(getProperties());
}
}

22
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlPopup.java
View File

@ -89,7 +89,8 @@ public class EditControlPopup {
protected CheckBox mDisplayInGameCheckbox, mDisplayInMenuCheckbox;
// Decorative textviews
private TextView mOrientationTextView, mMappingTextView, mNameTextView, mCornerRadiusTextView;
private TextView mOrientationTextView, mMappingTextView, mNameTextView,
mCornerRadiusTextView, mVisibilityTextView, mSizeTextview, mSizeXTextView;
@ -327,6 +328,22 @@ public class EditControlPopup {
mToggleSwitch.setVisibility(View.GONE);
}
/** Load values for sub buttons */
public void loadSubButtonValues(ControlData data){
loadValues(data);
// Size linked to the parent drawer
mSizeTextview.setVisibility(GONE);
mSizeXTextView.setVisibility(GONE);
mWidthEditText.setVisibility(GONE);
mHeightEditText.setVisibility(GONE);
// No conditional, already depends on the parent drawer visibility
mVisibilityTextView.setVisibility(GONE);
mDisplayInMenuCheckbox.setVisibility(GONE);
mDisplayInGameCheckbox.setVisibility(GONE);
}
private void bindLayout(){
mRootView = mScrollView.findViewById(R.id.edit_layout);
@ -357,6 +374,9 @@ public class EditControlPopup {
mOrientationTextView = mScrollView.findViewById(R.id.editOrientation_textView);
mNameTextView = mScrollView.findViewById(R.id.editName_textView);
mCornerRadiusTextView = mScrollView.findViewById(R.id.editCornerRadius_textView);
mVisibilityTextView = mScrollView.findViewById(R.id.visibility_textview);
mSizeTextview = mScrollView.findViewById(R.id.editSize_textView);
mSizeXTextView = mScrollView.findViewById(R.id.editSize_x_textView);
}
/**

1
app_pojavlauncher/src/main/res/layout/dialog_control_button_setting.xml
View File

@ -81,6 +81,7 @@
app:layout_constraintTop_toTopOf="@+id/editSize_editTextX" />
<TextView
android:id="@+id/editSize_x_textView"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:gravity="center"