third-party-mirrors/ultrasonic
1
0
Fork 0
mirror of https://gitlab.com/ultrasonic/ultrasonic.git synced 2025-04-24 04:40:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed navigation on welcome screen

Browse Source 
Fixed navigation after selecting new server
Fixed color for new server
Fixed typo
This commit is contained in:
Nite 2021-10-21 17:55:19 +02:00
parent 949e7e58ba
commit f58c361e4e
No known key found for this signature in database
GPG Key ID: 1D1AD59B1C6386C1
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt
View File

@ -384,7 +384,7 @@ class NavigationActivity : AppCompatActivity() {
.setNegativeButton(R.string.main_welcome_cancel) { dialog, _ ->
// Go to the settings screen
dialog.dismiss()
findNavController(R.id.nav_host_fragment).navigate(R.id.settingsFragment)
findNavController(R.id.nav_host_fragment).navigate(R.id.serverSelectorFragment)
}
.setPositiveButton(R.string.common_ok) { dialog, _ ->
// Add the demo server

6
ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EditServerFragment.kt
View File

@ -9,7 +9,6 @@ import android.widget.Button
import android.widget.ImageView
import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment
import androidx.lifecycle.Observer
import androidx.navigation.fragment.findNavController
import com.google.android.material.switchmaterial.SwitchMaterial
import com.google.android.material.textfield.TextInputLayout
@ -111,7 +110,7 @@ class EditServerFragment : Fragment(), OnBackPressedHandler {
val serverSetting = serverSettingsModel.getServerSetting(index)
serverSetting.observe(
viewLifecycleOwner,
Observer { t ->
{ t ->
if (t != null) {
currentServerSetting = t
if (!isInstanceStateSaved) setFields()
@ -147,6 +146,7 @@ class EditServerFragment : Fragment(), OnBackPressedHandler {
} else {
// Creating a new server
FragmentTitle.setTitle(this, R.string.server_editor_new_label)
updateColor(null)
currentServerSetting = ServerSetting()
saveButton!!.setOnClickListener {
if (getFields()) {
@ -167,7 +167,7 @@ class EditServerFragment : Fragment(), OnBackPressedHandler {
bubbleFlag.flagMode = FlagMode.LAST
ColorPickerDialog.Builder(context).apply {
this.colorPickerView.setInitialColor(currentColor)
this.colorPickerView.setFlagView(bubbleFlag)
this.colorPickerView.flagView = bubbleFlag
}
.attachAlphaSlideBar(false)
.setPositiveButton(

2
ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/ServerSelectorFragment.kt
View File

@ -88,7 +88,7 @@ class ServerSelectorFragment : Fragment() {
editServer(position + 1)
} else {
setActiveServer(position)
findNavController().navigateUp()
findNavController().popBackStack(R.id.mainFragment, false)
}
}

2
ultrasonic/src/main/res/values/strings.xml
View File

@ -108,7 +108,7 @@
<string name="main.genres_title">Genres</string>
<string name="main.music">Music</string>
<string name="main.offline">Offline</string>
<string name="main.setup_server">%s - Setup Server</string>
<string name="main.setup_server">%s - Set up Server</string>
<string name="main.shuffle">Shuffle Play</string>
<string name="main.songs_random">Random</string>
<string name="main.songs_starred">Starred</string>