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 merge conflicts

Browse source
This commit is contained in:
Dinu Kumarasiri 2017-05-20 12:28:39 +02:00
parent 43a707dad5
commit 7629e00f33
4 changed files with 1 additions and 27 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,18 +4,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<<<<<<< HEAD
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="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 <include
android:id="@+id/toolbar" android:id="@+id/toolbar"

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

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

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

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

8
app/src/main/res/values/strings.xml
View file

@ -183,10 +183,7 @@ Tap this message (or hit back) to skip this step.</string>
<string name="maximum_limit_alert">Unable to display more than 500</string> <string name="maximum_limit_alert">Unable to display more than 500</string>
<string name="set_limit">Set Recent Upload Limit</string> <string name="set_limit">Set Recent Upload Limit</string>
<string name="login_failed_2fa_not_supported">Two factor authentication is currently not supported.</string> <string name="login_failed_2fa_not_supported">Two factor authentication is currently not supported.</string>
<<<<<<< HEAD
<string name="logout_verification">Do you really want to logout?</string> <string name="logout_verification">Do you really want to logout?</string>
=======
>>>>>>> origin/fix_lint_issues
<string name="commons_logo">Commons Logo</string> <string name="commons_logo">Commons Logo</string>
<string name="background_image">Background Image</string> <string name="background_image">Background Image</string>
<string name="mediaimage_failed">Media Image Failed</string> <string name="mediaimage_failed">Media Image Failed</string>
@ -201,11 +198,6 @@ Tap this message (or hit back) to skip this step.</string>
<string name="welcome_image_welcome_wikipedia">Welcome Wikipedia</string> <string name="welcome_image_welcome_wikipedia">Welcome Wikipedia</string>
<string name="welcome_image_welcome_copyright">Welcome Copyright</string> <string name="welcome_image_welcome_copyright">Welcome Copyright</string>
<string name="welcome_image_sydney_opera_house">Sydney Opera House</string> <string name="welcome_image_sydney_opera_house">Sydney Opera House</string>
<<<<<<< HEAD
>>>>>>> [Lint] Add content description to image views
=======
>>>>>>> origin/fix_lint_issues
<string name="cancel">Cancel</string> <string name="cancel">Cancel</string>
<string name="navigation_drawer_open">Open</string> <string name="navigation_drawer_open">Open</string>
<string name="navigation_drawer_close">Close</string> <string name="navigation_drawer_close">Close</string>