Font, Softer Breast (#19)

* add breast parameter editer

* add pre-config, add scale set

* support disable replace font
This commit is contained in:
chinosk
2024-06-15 14:21:07 -05:00
committed by GitHub
parent ca0e6e6a9a
commit f5a88a9127
10 changed files with 975 additions and 234 deletions
+392
View File
@@ -77,6 +77,19 @@
android:text="@string/enable_plugin" />
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/replaceFontSwitch"
android:layout_width="match_parent"
android:layout_height="48dp"
android:checked="@={config.replaceFont}"
android:onCheckedChanged="@{(view, value) -> listener.onReplaceFontChanged(value)}"
android:text="@string/replace_font" />
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -587,6 +600,385 @@
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="4sp"
android:background="@drawable/table_row_border">
<TableLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="10sp"
android:paddingRight="10sp"
android:paddingBottom="10sp"
android:stretchColumns="0">
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/SwitchEnableBreastParam"
android:layout_width="match_parent"
android:layout_height="48dp"
android:checked="@={config.enableBreastParam}"
android:onCheckedChanged="@{(view, value) -> listener.onEnableBreastParamChanged(value)}"
android:text="@string/enable_breast_param" />
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="@{config.enableBreastParam ? android.view.View.VISIBLE : android.view.View.GONE}">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.button.MaterialButton
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_margin="1sp"
android:layout_weight="1"
android:minWidth="1sp"
android:onClick="@{() -> listener.onBClickPresetChanged(5)}"
android:text="\??" />
<com.google.android.material.button.MaterialButton
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_margin="1sp"
android:layout_weight="1"
android:minWidth="1sp"
android:onClick="@{() -> listener.onBClickPresetChanged(4)}"
android:text="+5" />
<com.google.android.material.button.MaterialButton
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_margin="1sp"
android:layout_weight="1"
android:minWidth="1sp"
android:onClick="@{() -> listener.onBClickPresetChanged(3)}"
android:text="+4" />
<com.google.android.material.button.MaterialButton
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_margin="1sp"
android:layout_weight="1"
android:minWidth="1sp"
android:onClick="@{() -> listener.onBClickPresetChanged(2)}"
android:text="+3" />
<com.google.android.material.button.MaterialButton
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_weight="1"
android:minWidth="1sp"
android:onClick="@{() -> listener.onBClickPresetChanged(1)}"
android:text="+2" />
<com.google.android.material.button.MaterialButton
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_weight="1"
android:layout_marginStart="1sp"
android:minWidth="1sp"
android:onClick="@{() -> listener.onBClickPresetChanged(0)}"
android:text="+1" />
</LinearLayout>
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="@{config.enableBreastParam ? android.view.View.VISIBLE : android.view.View.GONE}">
<TableLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical">
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
android:weightSum="2">
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_weight="1"
android:background="@android:color/transparent"
android:hint="@string/damping"
app:boxBackgroundColor="@android:color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ems="10"
android:inputType="numberDecimal|numberSigned"
android:onTextChanged="@{(s, st, b, a) -> listener.onBDampingChanged(s, st, b, a)}"
android:paddingStart="0dp"
android:paddingEnd="0dp"
android:paddingBottom="0dp"
android:text="@={`` + config.bDamping}" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_weight="1"
android:background="@android:color/transparent"
android:hint="@string/stiffness"
app:boxBackgroundColor="@android:color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ems="10"
android:inputType="numberDecimal|numberSigned"
android:onTextChanged="@{(s, st, b, a) -> listener.onBStiffnessChanged(s, st, b, a)}"
android:paddingStart="0dp"
android:paddingEnd="0dp"
android:paddingBottom="0dp"
android:text="@={`` + config.bStiffness}" />
</com.google.android.material.textfield.TextInputLayout>
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
android:weightSum="2">
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_weight="1"
android:background="@android:color/transparent"
android:hint="@string/spring"
app:boxBackgroundColor="@android:color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ems="10"
android:inputType="numberDecimal|numberSigned"
android:onTextChanged="@{(s, st, b, a) -> listener.onBSpringChanged(s, st, b, a)}"
android:paddingStart="0dp"
android:paddingEnd="0dp"
android:paddingBottom="0dp"
android:text="@={`` + config.bSpring}" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_weight="1"
android:background="@android:color/transparent"
android:hint="@string/pendulum"
app:boxBackgroundColor="@android:color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ems="10"
android:inputType="numberDecimal|numberSigned"
android:onTextChanged="@{(s, st, b, a) -> listener.onBPendulumChanged(s, st, b, a)}"
android:paddingStart="0dp"
android:paddingEnd="0dp"
android:paddingBottom="0dp"
android:text="@={`` + config.bPendulum}" />
</com.google.android.material.textfield.TextInputLayout>
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
android:weightSum="2">
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_weight="1"
android:background="@android:color/transparent"
android:hint="@string/pendulumrange"
app:boxBackgroundColor="@android:color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ems="10"
android:inputType="numberDecimal|numberSigned"
android:onTextChanged="@{(s, st, b, a) -> listener.onBPendulumRangeChanged(s, st, b, a)}"
android:paddingStart="0dp"
android:paddingEnd="0dp"
android:paddingBottom="0dp"
android:text="@={`` + config.bPendulumRange}" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_weight="1"
android:background="@android:color/transparent"
android:hint="@string/average"
app:boxBackgroundColor="@android:color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ems="10"
android:inputType="numberDecimal|numberSigned"
android:onTextChanged="@{(s, st, b, a) -> listener.onBAverageChanged(s, st, b, a)}"
android:paddingStart="0dp"
android:paddingEnd="0dp"
android:paddingBottom="0dp"
android:text="@={`` + config.bAverage}" />
</com.google.android.material.textfield.TextInputLayout>
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
android:weightSum="2">
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_weight="1"
android:background="@android:color/transparent"
android:hint="@string/rootweight"
app:boxBackgroundColor="@android:color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ems="10"
android:inputType="numberDecimal|numberSigned"
android:onTextChanged="@{(s, st, b, a) -> listener.onBRootWeightChanged(s, st, b, a)}"
android:paddingStart="0dp"
android:paddingEnd="0dp"
android:paddingBottom="0dp"
android:text="@={`` + config.bRootWeight}" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_weight="1"
android:background="@android:color/transparent"
android:hint="@string/uselimit_0_1"
app:boxBackgroundColor="@android:color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ems="10"
android:inputType="number"
android:onTextChanged="@{(s, st, b, a) -> listener.onBUseLimitChanged(s, st, b, a)}"
android:paddingStart="0dp"
android:paddingEnd="0dp"
android:paddingBottom="0dp"
android:text="@={`` + config.bUseLimit}" />
</com.google.android.material.textfield.TextInputLayout>
</TableRow>
</TableLayout>
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="@{config.enableBreastParam ? android.view.View.VISIBLE : android.view.View.GONE}">
<TableLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical">
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent" >
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_weight="3"
android:background="@android:color/transparent"
android:hint="@string/breast_scale"
app:boxBackgroundColor="@android:color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ems="10"
android:inputType="numberDecimal|numberSigned"
android:onTextChanged="@{(s, st, b, a) -> listener.onBScaleChanged(s, st, b, a)}"
android:paddingStart="0dp"
android:paddingEnd="0dp"
android:paddingBottom="0dp"
android:text="@={`` + config.bScale}" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.checkbox.MaterialCheckBox
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_weight="1"
android:checked="@={config.bUseScale}"
android:onCheckedChanged="@{(view, value) -> listener.onBUseScaleChanged(value)}"
android:text="@string/usescale" />
</TableRow>
</TableLayout>
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="@{config.enableBreastParam ? android.view.View.VISIBLE : android.view.View.GONE}">
<com.google.android.material.switchmaterial.SwitchMaterial
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_weight="1"
android:checked="@={config.bUseArmCorrection}"
android:onCheckedChanged="@{(view, value) -> listener.onBUseArmCorrectionChanged(value)}"
android:text="@string/usearmcorrection" />
</TableRow>
</TableLayout>
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -2,6 +2,7 @@
<string name="app_name">Gakumas Localify</string>
<string name="gakumas_localify">Gakumas Localify</string>
<string name="enable_plugin">启用插件 (不可热重载)</string>
<string name="replace_font">替换字体</string>
<string name="enable_free_camera">启用自由视角(可热重载; 需使用实体键盘)</string>
<string name="start_game">以上述配置启动游戏/重载配置</string>
<string name="setFpsTitle">最大 FPS (0 为保持游戏原设置)</string>
@@ -23,4 +24,17 @@
<string name="orientation_portrait">竖屏</string>
<string name="orientation_landscape">横屏</string>
<string name="orientation_lock">方向锁定</string>
<string name="enable_breast_param">启用胸部参数</string>
<string name="damping">阻尼 (Damping)</string>
<string name="stiffness">刚度 (Stiffness)</string>
<string name="spring">弹簧系数 (Spring)</string>
<string name="pendulum">钟摆系数 (Pendulum)</string>
<string name="pendulumrange">钟摆范围 (PendulumRange)</string>
<string name="average">Average</string>
<string name="rootweight">RootWeight</string>
<string name="uselimit_0_1">限制范围 (0/1)</string>
<string name="usearmcorrection">使用手臂矫正</string>
<string name="isdirty">IsDirty</string>
<string name="usescale">应用缩放</string>
<string name="breast_scale">胸部缩放倍率</string>
</resources>
+14
View File
@@ -2,6 +2,7 @@
<string name="app_name">Gakumas Localify</string>
<string name="gakumas_localify">Gakumas Localify</string>
<string name="enable_plugin">Enable Plugin (Not Hot Reloadable)</string>
<string name="replace_font">Replace Font</string>
<string name="enable_free_camera">Enable Free Camera</string>
<string name="start_game">Start Game / Hot Reload Config</string>
<string name="setFpsTitle">Max FPS (0 is Use Original Settings)</string>
@@ -23,5 +24,18 @@
<string name="orientation_portrait">Portrait</string>
<string name="orientation_landscape">Landscape</string>
<string name="orientation_lock">Orientation Lock</string>
<string name="enable_breast_param">Enable Breast Param</string>
<string name="damping">Damping</string>
<string name="stiffness">Stiffness</string>
<string name="spring">Spring</string>
<string name="pendulum">Pendulum</string>
<string name="pendulumrange">Pendulum Range</string>
<string name="average">Average</string>
<string name="rootweight">Root Weight</string>
<string name="uselimit_0_1">Use Limit (0/1)</string>
<string name="usearmcorrection">Use Arm Correction</string>
<string name="isdirty">IsDirty</string>
<string name="usescale">Use Breast Scale</string>
<string name="breast_scale">Breast Scale</string>
</resources>