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

Merge branch '2.9-release'

Browse source
This commit is contained in:
maskara 2018-11-27 22:38:20 +05:30
commit 4a2cdb70b9
21 changed files with 552 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/res/layout/nearby_permission_dialog.xml Normal file
View file

@ -0,0 +1,13 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content" >
<CheckBox
android:id="@+id/never_ask_again"
style="?android:attr/textAppearanceMedium"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/never_ask_again"
android:layout_margin="5dp" />
</FrameLayout>

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

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
@ -20,14 +19,16 @@
android:layout_height="wrap_content"
android:layout_weight="8">
<EditText
<fr.free.nrw.commons.ui.widget.CustomEditText
android:id="@+id/description_item_edit_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableEnd="@drawable/mapbox_info_icon_default"
android:drawableRight="@drawable/mapbox_info_icon_default"
android:hint="@string/share_description_hint"
android:imeOptions="flagNoExtractUi"
android:drawablePadding="4dp"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:drawableRight="@drawable/mapbox_info_icon_default"
android:inputType="textMultiLine" />
</android.support.design.widget.TextInputLayout>

2
app/src/main/res/layout/row_item_title.xml
View file

@ -7,7 +7,7 @@
android:layout_height="wrap_content"
tools:showIn="@layout/activity_upload">
<android.support.design.widget.TextInputEditText
<fr.free.nrw.commons.ui.widget.CustomEditText
android:id="@+id/description_item_edit_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"