@@ -11,7 +11,6 @@ import androidx.preference.SeekBarPreference
1111import androidx.preference.children
1212import com.programminghoch10.VolumeStepsIncrease.Common.SHARED_PREFERENCES_NAME
1313import com.programminghoch10.VolumeStepsIncrease.Common.STREAMS
14- import com.programminghoch10.VolumeStepsIncrease.Common.STREAM_NAMES
1514import com.programminghoch10.VolumeStepsIncrease.Common.getModuleDefaultVolumeSteps
1615import com.programminghoch10.VolumeStepsIncrease.Common.getModuleMaxVolumeSteps
1716import com.programminghoch10.VolumeStepsIncrease.Common.getModuleMinVolumeSteps
@@ -38,22 +37,21 @@ class SettingsActivity : FragmentActivity() {
3837 preferenceManager.sharedPreferencesName = SHARED_PREFERENCES_NAME
3938 preferenceManager.sharedPreferencesMode = MODE_WORLD_READABLE
4039
41- for (stream in STREAM_NAMES ) {
42- val streamInt = STREAMS [stream]!!
40+ for (stream in STREAMS ) {
4341 val preference = SeekBarPreference (requireContext())
44- preference.key = getPreferenceKey(streamInt )
45- preference.title = stream.replace(" STREAM_" , " " )
46- preference.min = getModuleMinVolumeSteps(streamInt )
47- preference.max = getModuleMaxVolumeSteps(streamInt )
48- preference.setDefaultValue(getModuleDefaultVolumeSteps(streamInt ))
42+ preference.key = getPreferenceKey(stream.value )
43+ preference.title = stream.key. replace(" STREAM_" , " " )
44+ preference.min = getModuleMinVolumeSteps(stream.value )
45+ preference.max = getModuleMaxVolumeSteps(stream.value )
46+ preference.setDefaultValue(getModuleDefaultVolumeSteps(stream.value ))
4947 preference.showSeekBarValue = true
5048 preference.updatesContinuously = true
5149 preference.setOnPreferenceChangeListener { preference, newValue ->
52- val factor = (newValue as Int ).toDouble() / getSystemMaxVolumeSteps(streamInt )
50+ val factor = (newValue as Int ).toDouble() / getSystemMaxVolumeSteps(stream.value )
5351 preference.summary = arrayOf(
5452 " factor=${factor.round(1 )} x " ,
55- // "systemMin=${getSystemMinVolumeSteps(streamInt )} ",
56- " systemMax=${getSystemMaxVolumeSteps(streamInt )} " ,
53+ // "systemMin=${getSystemMinVolumeSteps(stream.value )} ",
54+ " systemMax=${getSystemMaxVolumeSteps(stream.value )} " ,
5755 ).joinToString(" " )
5856 true
5957 }
0 commit comments