mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-11-23 13:26:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source 
# Conflicts:
#	app/src/main/res/layout/activity_edit.xml
This commit is contained in:
stefan-niedermann 2020-01-10 17:24:09 +01:00
commit fdf46b6274
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/res/layout/activity_edit.xml
View file

@ -8,13 +8,12 @@
tools:context="it.niedermann.owncloud.notes.android.activity.EditNoteActivity">
<com.yydcdut.rxmarkdown.RxMDEditText
android:id="@+id/editContent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:ems="10"
android:gravity="top"
android:inputType="textMultiLine|textCapSentences"
android:padding="16dp"
android:textColor="@color/fg_default" />
android:id="@+id/editContent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="top"
android:ems="10"
android:inputType="textMultiLine|textCapSentences"
android:padding="16dp"
android:textColor="@color/fg_default"/>
</ScrollView>