Initial work on mod toggle UI.

This still needs a lot of work.
This commit is contained in:
Daniel Scalzi 2018-07-24 01:14:26 -04:00
parent 6e71cd6b46
commit e583133c8b
3 changed files with 207 additions and 5 deletions

View File

@ -1113,8 +1113,8 @@ body, button {
.toggleSwitch { .toggleSwitch {
position: relative; position: relative;
display: inline-block; display: inline-block;
width: 50px; width: 40px;
height: 25px; height: 20px;
border-radius: 50px; border-radius: 50px;
box-sizing: border-box; box-sizing: border-box;
} }
@ -1136,8 +1136,8 @@ body, button {
.toggleSwitchSlider:before { .toggleSwitchSlider:before {
position: absolute; position: absolute;
content: ""; content: "";
height: 17px; height: 13px;
width: 21px; width: 16px;
left: 3px; left: 3px;
bottom: 3px; bottom: 3px;
background-color: white; background-color: white;
@ -1147,9 +1147,11 @@ body, button {
} }
input:checked + .toggleSwitchSlider { input:checked + .toggleSwitchSlider {
background-color: rgb(31, 140, 11); background-color: rgb(31, 140, 11);
/* box-shadow: inset 2px 1px 20px black; */
border: 1px solid rgb(31, 140, 11);
} }
input:checked + .toggleSwitchSlider:before { input:checked + .toggleSwitchSlider:before {
transform: translateX(21px); transform: translateX(15px);
} }
/* Range Slider styles. */ /* Range Slider styles. */
@ -1357,6 +1359,99 @@ input:checked + .toggleSwitchSlider:before {
width: 75px; width: 75px;
} }
/* * *
* Settings View (Mods Tab)
* * */
#settingsReqModsContent,
#settingsOptModsContent {
font-size: 12px;
background: rgba(0, 0, 0, 0.25);
border-radius: 3px;
color: white;
}
#settingsModsContainer {
width: 75%;
}
.settingsModsHeader {
padding-bottom: 10px;
border-bottom: 1px solid rgba(255, 255, 255, 0.5);
margin-bottom: 10px;
}
#settingsReqModsContainer,
#settingsOptModsContainer {
padding-bottom: 25px;
}
.settingsMod {
padding: 10px;
}
.settingsSubMod {
padding: 10px 0px 10px 15px;
margin-left: 20px;
border-left: 1px solid rgba(255, 255, 255, 0.5);
}
.settingsModStatus {
width: 7px;
height: 7px;
border-radius: 50%;
background-color: #c32625;
margin-right: 15px;
}
.settingsModContent {
display: flex;
align-items: center;
justify-content: space-between;
}
.settingsModMainWrapper {
display: flex;
align-items: center;
}
.settingsModVersion {
color: grey;
font-size: 10px;
}
.settingsModDetails {
display: flex;
flex-direction: column;
}
.toggleSwitch[reqmod] {
filter: grayscale(49%) brightness(60%);
pointer-events: none;
}
.settingsMod[enabled] .settingsModStatus,
.settingsSubMod[enabled] .settingsModStatus{
background-color: rgb(165, 195, 37);
}
.settingsSubModContainer > .settingsSubMod:first-child {
border-top-left-radius: 10px;
}
.settingsSubModContainer > .settingsSubMod:last-child {
border-bottom-left-radius: 10px;
}
settingsSubModContainer > .settingsSubMod:only-child {
border-top-left-radius: 10px;
border-bottom-left-radius: 10px;
}
.settingsSubModContainer {
margin-top: 10px;
}
/* * * /* * *
* Settings View (Java Tab) * Settings View (Java Tab)
* * */ * * */

View File

@ -422,6 +422,97 @@ document.getElementById('settingsGameHeight').addEventListener('keydown', (e) =>
} }
}) })
/**
* Mods Tab
*/
function resolveModsForUI(){
const serv = ConfigManager.getSelectedServer()
const distro = DistroManager.getDistribution()
const servConf = ConfigManager.getModConfiguration(serv)
const modStr = parseModulesForUI(distro.getServer(serv).getModules(), false, servConf.mods)
document.getElementById('settingsReqModsContent').innerHTML = modStr.reqMods
document.getElementById('settingsOptModsContent').innerHTML = modStr.optMods
}
function parseModulesForUI(mdls, submodules = false, servConf){
let reqMods = ''
let optMods = ''
for(const mdl of mdls){
if(mdl.getType() === DistroManager.Types.ForgeMod || mdl.getType() === DistroManager.Types.LiteMod || mdl.getType() === DistroManager.Types.LiteLoader){
if(mdl.getRequired().isRequired()){
reqMods += `<div id="${mdl.getVersionlessID()}" class="settings${submodules ? 'Sub' : ''}Mod" enabled>
<div class="settingsModContent">
<div class="settingsModMainWrapper">
<div class="settingsModStatus"></div>
<div class="settingsModDetails">
<span class="settingsModName">${mdl.getName().substring(0, mdl.getName().indexOf('('))}</span>
<span class="settingsModVersion">v${mdl.getVersion()}</span>
</div>
</div>
<label class="toggleSwitch" reqmod>
<input type="checkbox" checked>
<span class="toggleSwitchSlider"></span>
</label>
</div>
${mdl.hasSubModules() ? `<div class="settingsSubModContainer">
${Object.values(parseModulesForUI(mdl.getSubModules(), true)).join('')}
</div>` : ''}
</div>`
} else {
const conf = servConf[mdl.getVersionlessID()]
const val = typeof conf === 'object' ? conf.value : conf
optMods += `<div id="${mdl.getVersionlessID()}" class="settings${submodules ? 'Sub' : ''}Mod" ${val ? 'enabled' : ''}>
<div class="settingsModContent">
<div class="settingsModMainWrapper">
<div class="settingsModStatus"></div>
<div class="settingsModDetails">
<span class="settingsModName">${mdl.getName().substring(0, mdl.getName().indexOf('('))}</span>
<span class="settingsModVersion">v${mdl.getVersion()}</span>
</div>
</div>
<label class="toggleSwitch">
<input type="checkbox" ${val ? 'checked' : ''}>
<span class="toggleSwitchSlider"></span>
</label>
</div>
${mdl.hasSubModules() ? `<div class="settingsSubModContainer">
${mdl.hasSubModules() ? Object.values(parseModulesForUI(mdl.getSubModules(), true, conf.mods)).join('') : ''}
</div>` : ''}
</div>`
}
}
}
return {
reqMods,
optMods
}
}
/**
* Prepare the Java tab for display.
*/
function prepareModsTab(){
resolveModsForUI()
}
/** /**
* Java Tab * Java Tab
*/ */
@ -739,6 +830,8 @@ function prepareSettings(first = false) {
if(first){ if(first){
setupSettingsTabs() setupSettingsTabs()
initSettingsValidators() initSettingsValidators()
} else {
prepareModsTab()
} }
initSettingsValues() initSettingsValues()
prepareAccountsTab() prepareAccountsTab()

View File

@ -96,6 +96,20 @@
<span class="settingsTabHeaderText">Mod Settings</span> <span class="settingsTabHeaderText">Mod Settings</span>
<span class="settingsTabHeaderDesc">Enable or disable mods.</span> <span class="settingsTabHeaderDesc">Enable or disable mods.</span>
</div> </div>
<div id="settingsModsContainer">
<div id="settingsReqModsContainer">
<div class="settingsModsHeader">Required Mods</div>
<div id="settingsReqModsContent">
</div>
</div>
<div id="settingsOptModsContainer">
<div class="settingsModsHeader">Optional Mods</div>
<div id="settingsOptModsContent">
</div>
</div>
</div>
</div> </div>
<div id="settingsTabJava" class="settingsTab" style="display: none;"> <div id="settingsTabJava" class="settingsTab" style="display: none;">
<div class="settingsTabHeader"> <div class="settingsTabHeader">