Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-09-28 12:45:55 +02:00
commit 442220debc
31 changed files with 346 additions and 309 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/res/layout-v18/fragment_videoitem_detail.xml
View file

@ -265,12 +265,13 @@
android:text="@string/similar_videos_btn_text"
android:layout_below="@id/detail_next_stream_content"
android:textAllCaps="true" />
<android.support.v7.widget.RecyclerView
<LinearLayout
android:id="@+id/similar_streams_view"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/detail_similar_title"/>
android:layout_below="@id/detail_similar_title">
</LinearLayout>
</RelativeLayout>
</RelativeLayout>
</RelativeLayout>

10
app/src/main/res/layout/dialog_url.xml
View file

@ -58,15 +58,21 @@
android:layout_marginBottom="24dp"
android:gravity="left"
android:orientation="horizontal">
<CheckBox android:id="@+id/video"
<RadioGroup
android:id="@+id/video_audio_group"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="horizontal">
<RadioButton android:id="@+id/video_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/video"
android:checked="true"/>
<CheckBox android:id="@+id/audio"
<RadioButton android:id="@+id/audio_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/audio" />
</RadioGroup>
</LinearLayout>
<LinearLayout

5
app/src/main/res/layout/fragment_videoitem_detail.xml
View file

@ -267,12 +267,13 @@
android:text="@string/similar_videos_btn_text"
android:layout_below="@id/detail_next_stream_content"
android:textAllCaps="true" />
<android.support.v7.widget.RecyclerView
<LinearLayout
android:id="@+id/similar_streams_view"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/detail_similar_title"/>
android:layout_below="@id/detail_similar_title">
</LinearLayout>
</RelativeLayout>
</RelativeLayout>
</RelativeLayout>