mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 12:53:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix conflicts

Browse source
This commit is contained in:
neslihanturan 2017-12-13 16:59:09 +03:00
parent 3a6cb08c05
commit 90cd6d2511
5 changed files with 50 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/res/layout/bar_more_info.xml
View file

@ -2,17 +2,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="48dp"
android:id="@+id/more_info_bar"
android:id="@+id/more_info_button"
android:visibility="gone"
android:layout_gravity="bottom"
android:background="@color/default_circle_indicator_stroke_color"
>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/more_info_button"
android:text="More Info"
android:layout_marginLeft="16dp"
android:background="@color/default_circle_indicator_stroke_color"
/>
</LinearLayout>

7
app/src/main/res/layout/bottom_sheet_details.xml
View file

@ -148,9 +148,10 @@ Description Description Description
Description Description Description
" />
<FrameLayout
android:id="@+id/container_sheet"
<View xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"></FrameLayout>
android:layout_height="48dp"
>
</View>
</LinearLayout>