kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-15 06:40:30 +05:30
Code Issues Projects Releases Wiki Activity

[Welcome Activity] Scrollbars, CDN indicator, note about instance regions

Browse Source
This commit is contained in:
Bnyro 2023-06-04 16:42:23 +02:00
parent 50a695a906
commit b4e3c977fd
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/github/libretube/ui/adapters/InstancesAdapter.kt
View File

@ -26,7 +26,8 @@ class InstancesAdapter(
override fun onBindViewHolder(holder: InstancesViewHolder, position: Int) { override fun onBindViewHolder(holder: InstancesViewHolder, position: Int) {
val instance = instances[position] val instance = instances[position]
holder.binding.apply { holder.binding.apply {
radioButton.text = "${instance.name} ${instance.locations}" val cdnText = if (instance.cdn) " (\uD83C\uDF10 CDN)" else ""
radioButton.text = "${instance.name} ${instance.locations} $cdnText"
radioButton.setOnCheckedChangeListener(null) radioButton.setOnCheckedChangeListener(null)
radioButton.isChecked = selectedInstanceIndex == position radioButton.isChecked = selectedInstanceIndex == position
radioButton.setOnCheckedChangeListener { _, isChecked -> radioButton.setOnCheckedChangeListener { _, isChecked ->

6
app/src/main/res/layout/activity_welcome.xml
View File

@ -31,7 +31,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginHorizontal="20dp" android:layout_marginHorizontal="20dp"
android:text="@string/choose_instance" /> android:text="@string/choose_instance_long" />
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -42,7 +42,9 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/instances_recycler" android:id="@+id/instances_recycler"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:fadeScrollbars="false"
android:scrollbars="vertical" />
<ProgressBar <ProgressBar
android:id="@+id/progress" android:id="@+id/progress"

6
app/src/main/res/layout/instance_row.xml
View File

@ -4,12 +4,14 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingHorizontal="10dp"> android:paddingHorizontal="12dp">
<com.google.android.material.radiobutton.MaterialRadioButton <com.google.android.material.radiobutton.MaterialRadioButton
android:id="@+id/radio_button" android:id="@+id/radio_button"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="10dp"
tools:ignore="RtlSymmetry"
tools:text="kavin.rocks" /> tools:text="kavin.rocks" />
</LinearLayout> </LinearLayout>

4
app/src/main/res/values/strings.xml
View File

@ -413,7 +413,9 @@
<string name="alphabetic">Alphabetic</string> <string name="alphabetic">Alphabetic</string>
<string name="alphabetic_reversed">Alphabetic (reversed)</string> <string name="alphabetic_reversed">Alphabetic (reversed)</string>
<string name="welcome">Welcome to LibreTube</string> <string name="welcome">Welcome to LibreTube</string>
<string name="choose_instance">Please choose a Piped instance to use below. The Piped instance will act as a middle man between you and YouTube. You can still change it later in the instance settings.</string> <string name="choose_instance">Please choose an instance first!</string>
<string name="choose_instance_long">Please choose a Piped instance to use below. The Piped instance will act as a middle man between you and YouTube. These servers are located at different physical places (indicated with flags). Instances that are close to where you live, are likely faster than others. You can still change it later in the instance settings.</string>
<string name="registration_disabled">Registration disabled</string>
<!-- Backup & Restore Settings --> <!-- Backup & Restore Settings -->
<string name="import_subscriptions_from">Import subscriptions from</string> <string name="import_subscriptions_from">Import subscriptions from</string>