mirror of
				https://github.com/commons-app/apps-android-commons.git
				synced 2025-10-30 22:34:02 +01:00 
			
		
		
		
	Merge branch 'main' into issue-6171
This commit is contained in:
		
						commit
						442c20ec1e
					
				
					 1 changed files with 7 additions and 3 deletions
				
			
		|  | @ -59,10 +59,12 @@ | ||||||
|       <fr.free.nrw.commons.ui.PasteSensitiveTextInputEditText |       <fr.free.nrw.commons.ui.PasteSensitiveTextInputEditText | ||||||
|         android:id="@+id/caption_item_edit_text" |         android:id="@+id/caption_item_edit_text" | ||||||
|         android:layout_width="match_parent" |         android:layout_width="match_parent" | ||||||
|         android:layout_height="match_parent" |         android:layout_height="wrap_content" | ||||||
|  |         android:minLines="1" | ||||||
|  |         android:maxLines="10" | ||||||
|         android:hint="@string/share_caption_hint" |         android:hint="@string/share_caption_hint" | ||||||
|         android:imeOptions="actionNext|flagNoExtractUi" |         android:imeOptions="actionNext|flagNoExtractUi" | ||||||
|         android:inputType="text" |         android:inputType="textMultiLine" | ||||||
|         app:allowFormatting="false" /> |         app:allowFormatting="false" /> | ||||||
|     </com.google.android.material.textfield.TextInputLayout> |     </com.google.android.material.textfield.TextInputLayout> | ||||||
| 
 | 
 | ||||||
|  | @ -103,7 +105,9 @@ | ||||||
|       <fr.free.nrw.commons.ui.PasteSensitiveTextInputEditText |       <fr.free.nrw.commons.ui.PasteSensitiveTextInputEditText | ||||||
|         android:id="@+id/description_item_edit_text" |         android:id="@+id/description_item_edit_text" | ||||||
|         android:layout_width="match_parent" |         android:layout_width="match_parent" | ||||||
|         android:layout_height="match_parent" |         android:layout_height="wrap_content" | ||||||
|  |         android:minLines="1" | ||||||
|  |         android:maxLines="10" | ||||||
|         android:hint="@string/share_description_hint" |         android:hint="@string/share_description_hint" | ||||||
|         android:imeOptions="actionNext|flagNoExtractUi" |         android:imeOptions="actionNext|flagNoExtractUi" | ||||||
|         android:inputType="textMultiLine" |         android:inputType="textMultiLine" | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Nicolas Raoul
						Nicolas Raoul