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

Fix merge conflicts

Browse source
This commit is contained in:
Dinu Kumarasiri 2017-05-20 11:58:26 +02:00
commit 43a707dad5
4 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/res/layout/activity_about.xml
View file

@ -4,9 +4,18 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<<<<<<< HEAD
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
=======
<ImageView
android:src="@drawable/ic_launcher"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:contentDescription= "@string/commons_logo"
/>
>>>>>>> origin/fix_lint_issues
<include
android:id="@+id/toolbar"

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

@ -7,7 +7,14 @@
<RelativeLayout
android:layout_width="match_parent"
<<<<<<< HEAD
android:layout_height="match_parent">
=======
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:contentDescription="@string/background_image"
/>
>>>>>>> origin/fix_lint_issues
<include
android:id="@+id/toolbar"

4
app/src/main/res/layout/layout_upload_item.xml
View file

@ -13,9 +13,13 @@
android:id="@+id/uploadImage"
android:layout_width="match_parent"
android:layout_height="192dp"
<<<<<<< HEAD
app:actualImageScaleType="centerCrop"
app:placeholderImage="@drawable/ic_image_black_24dp"
app:failureImage="@drawable/ic_error_outline_black_24dp"
=======
android:scaleType="centerCrop"
>>>>>>> origin/fix_lint_issues
android:contentDescription="@string/upload_image"
/>