Peertube/peertube-live-streaming
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adjust some layout elements and default visibility

Browse Source
This commit is contained in:
Anthony Chomienne 2021-07-07 17:53:50 +02:00
parent 48669ff2ac
commit d8642c9d15
2 changed files with 112 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/fr/mobdev/peertubelive/activity/CreateLiveActivity.kt
View File

@ -4,6 +4,10 @@ import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View
import android.widget.ArrayAdapter import android.widget.ArrayAdapter
import androidx.activity.result.ActivityResult
import androidx.activity.result.ActivityResultCallback
import androidx.activity.result.ActivityResultLauncher
import androidx.activity.result.contract.ActivityResultContracts
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.databinding.DataBindingUtil import androidx.databinding.DataBindingUtil
import fr.mobdev.peertubelive.R import fr.mobdev.peertubelive.R
@ -32,6 +36,7 @@ class CreateLiveActivity : AppCompatActivity() {
private var inError: Boolean = false private var inError: Boolean = false
private var showAdvancedSettings = true private var showAdvancedSettings = true
private lateinit var binding: ChannelListBinding private lateinit var binding: ChannelListBinding
private lateinit var startLive: ActivityResultLauncher<Intent>
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
@ -50,6 +55,11 @@ class CreateLiveActivity : AppCompatActivity() {
binding.privacy.visibility = View.GONE binding.privacy.visibility = View.GONE
binding.privacyList.visibility = View.GONE binding.privacyList.visibility = View.GONE
startLive = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
setResult(it.resultCode)
finish()
}
toggleAdvanceSettings() toggleAdvanceSettings()
binding.goLive.isEnabled = false binding.goLive.isEnabled = false
@ -266,7 +276,7 @@ class CreateLiveActivity : AppCompatActivity() {
val streamData = args.getParcelable<StreamData>(InstanceManager.EXTRA_DATA)!! val streamData = args.getParcelable<StreamData>(InstanceManager.EXTRA_DATA)!!
val intent = Intent(this@CreateLiveActivity, StreamActivity::class.java) val intent = Intent(this@CreateLiveActivity, StreamActivity::class.java)
intent.putExtra(InstanceManager.EXTRA_DATA,streamData) intent.putExtra(InstanceManager.EXTRA_DATA,streamData)
startActivityForResult(intent,2) startLive.launch(intent)
} }
} }
@ -308,9 +318,6 @@ class CreateLiveActivity : AppCompatActivity() {
binding.downloadEnabledTitle.visibility = status binding.downloadEnabledTitle.visibility = status
binding.nsfw.visibility = status binding.nsfw.visibility = status
binding.nsfwTitle.visibility = status binding.nsfwTitle.visibility = status
binding.saveReplay.visibility = status
binding.saveReplayTitle.visibility = status
binding.saveReplayInfo.visibility = status
} }
private fun restoreSettings() { private fun restoreSettings() {

169
app/src/main/res/layout/channel_list.xml
View File

@ -18,7 +18,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingBottom="100dp" android:paddingBottom="100dp"
android:clipToPadding="false"> android:clipToPadding="false"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:layout_marginEnd="10dp"
android:layout_marginStart="10dp"
android:fadeScrollbars="false"
>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -120,15 +126,54 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
android:layout_margin="5dp" android:layout_margin="5dp"
/> />
<LinearLayout
android:id="@+id/save_replay_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@id/privacy_list"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
>
<TextView
android:id="@+id/save_replay_title"
android:text="@string/save_replay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:layout_margin="5dp"
android:layout_weight="50"/>
<androidx.appcompat.widget.AppCompatCheckBox
android:id="@+id/save_replay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="5dp"
android:layout_weight="50"
/>
</LinearLayout>
<TextView
android:id="@+id/save_replay_info"
android:text="@string/save_replay_info"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/save_replay_layout"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_margin="5dp"/>
<TextView <TextView
android:id="@+id/advance_settings" android:id="@+id/advance_settings"
android:text="@string/advanced_settings" android:text="@string/advanced_settings"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/privacy_list" app:layout_constraintTop_toBottomOf="@id/save_replay_info"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
android:layout_margin="5dp"/> android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"/>
<TextView <TextView
android:id="@+id/category" android:id="@+id/category"
android:text="@string/stream_category" android:text="@string/stream_category"
@ -205,95 +250,81 @@
android:lines="4" android:lines="4"
android:gravity="top|start" android:gravity="top|start"
/> />
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/comments_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@id/description"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
>
<TextView <TextView
android:id="@+id/comments_enabled_title" android:id="@+id/comments_enabled_title"
android:text="@string/comments_enabled" android:text="@string/comments_enabled"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
app:layout_constraintTop_toBottomOf="@id/description" android:gravity="center_vertical"
app:layout_constraintStart_toStartOf="parent" android:layout_margin="5dp"
app:layout_constraintEnd_toStartOf="@id/comments_enabled" android:layout_weight="50"/>
app:layout_constraintBottom_toBottomOf="@id/comments_enabled"
android:layout_margin="5dp"/>
<androidx.appcompat.widget.AppCompatCheckBox <androidx.appcompat.widget.AppCompatCheckBox
android:id="@+id/comments_enabled" android:id="@+id/comments_enabled"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="5dp"
android:layout_weight="50"
/>
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/download_layout"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/description" android:orientation="horizontal"
app:layout_constraintStart_toEndOf="@id/comments_enabled_title" app:layout_constraintTop_toBottomOf="@id/comments_layout"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
android:layout_margin="5dp" >
/>
<TextView <TextView
android:id="@+id/download_enabled_title" android:id="@+id/download_enabled_title"
android:text="@string/download_enabled" android:text="@string/download_enabled"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
app:layout_constraintTop_toBottomOf="@id/comments_enabled_title" android:gravity="center_vertical"
app:layout_constraintStart_toStartOf="parent" android:layout_margin="5dp"
app:layout_constraintEnd_toStartOf="@id/download_enabled" android:layout_weight="50"/>
app:layout_constraintBottom_toBottomOf="@id/download_enabled"
android:layout_margin="5dp"/>
<androidx.appcompat.widget.AppCompatCheckBox <androidx.appcompat.widget.AppCompatCheckBox
android:id="@+id/download_enabled" android:id="@+id/download_enabled"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="5dp"
android:layout_weight="50"
/>
</androidx.appcompat.widget.LinearLayoutCompat>
<LinearLayout
android:id="@+id/nfsw_layout"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/comments_enabled_title" android:orientation="horizontal"
app:layout_constraintStart_toEndOf="@id/download_enabled_title" app:layout_constraintTop_toBottomOf="@id/download_layout"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
android:layout_margin="5dp" >
/>
<TextView <TextView
android:id="@+id/nsfw_title" android:id="@+id/nsfw_title"
android:text="@string/nsfw" android:text="@string/nsfw"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
app:layout_constraintTop_toBottomOf="@id/download_enabled_title" android:gravity="center_vertical"
app:layout_constraintStart_toStartOf="parent" android:layout_margin="5dp"
app:layout_constraintEnd_toStartOf="@id/nsfw" android:layout_weight="50"/>
app:layout_constraintBottom_toBottomOf="@id/nsfw"
android:layout_margin="5dp"/>
<androidx.appcompat.widget.AppCompatCheckBox <androidx.appcompat.widget.AppCompatCheckBox
android:id="@+id/nsfw" android:id="@+id/nsfw"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
app:layout_constraintTop_toBottomOf="@id/download_enabled_title"
app:layout_constraintStart_toEndOf="@id/nsfw_title"
app:layout_constraintEnd_toEndOf="parent"
android:layout_margin="5dp" android:layout_margin="5dp"
android:layout_weight="50"
/> />
<TextView </LinearLayout>
android:id="@+id/save_replay_title"
android:text="@string/save_replay"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/nsfw_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/save_replay"
app:layout_constraintBottom_toBottomOf="@id/save_replay"
android:layout_margin="5dp"/>
<androidx.appcompat.widget.AppCompatCheckBox
android:id="@+id/save_replay"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/nsfw_title"
app:layout_constraintStart_toEndOf="@id/save_replay_title"
app:layout_constraintEnd_toEndOf="parent"
android:layout_margin="5dp"
/>
<TextView
android:id="@+id/save_replay_info"
android:text="@string/save_replay_info"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/save_replay_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_margin="5dp"/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView> </ScrollView>