Pixelfed
/
Pixelcat-App-Android
mirror of https://github.com/pixelcatapp/Pixelcat
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'develop' into test-ci2

This commit is contained in:
Conny Duck 2020-09-30 20:03:27 +02:00
parent 56960230a1 be0b164089
commit 36f1a5f6c0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/kotlin/at/connyduck/pixelcat/components/bottomsheet/accountselection/AccountSelectionBottomSheet.kt
View File

@ -43,7 +43,8 @@ class AccountSelectionBottomSheet(
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?) : View {
savedInstanceState: Bundle?
): View {
_binding = BottomsheetAccountsBinding.inflate(inflater, container, false)
return binding.root
}

3
app/src/main/kotlin/at/connyduck/pixelcat/components/bottomsheet/menu/MenuBottomSheet.kt
View File

@ -37,7 +37,8 @@ class MenuBottomSheet : BottomSheetDialogFragment() {
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?) : View {
savedInstanceState: Bundle?
): View {
_binding = BottomsheetMenuBinding.inflate(inflater, container, false)
return binding.root
}