odrling/norn-talk
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Différencier le contenu de l'écran principal de celui des écrans de convs

Browse source
This commit is contained in:
odrling 2018-01-06 00:02:38 +01:00
parent 1b9069290c
commit a34bbf582c
4 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/xyz/johnny/norntalk/ConversationActivity.kt
View file

@ -9,7 +9,7 @@ import android.view.MenuItem
import android.view.View
import android.widget.AdapterView
import android.widget.ListView
import kotlinx.android.synthetic.main.content_main.*
import kotlinx.android.synthetic.main.content_conversation.*
import kotlinx.android.synthetic.main.fragment_message.view.*
import kotlinx.android.synthetic.main.view_compose.*
import xyz.johnny.norntalk.R.id.action_secure

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

@ -6,7 +6,7 @@
tools:context="xyz.johnny.norntalk.ConversationActivity">
<include
layout="@layout/content_main"
layout="@layout/content_conversation"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/compose_include" />

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

@ -1,15 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent" >
<ListView
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:transcriptMode="normal"
android:stackFromBottom="true"
android:divider="@null"
android:dividerHeight="4dp"/>
android:transcriptMode="normal" />
</FrameLayout>

6
app/src/main/res/layout/fragment_conversation.xml
View file

@ -1,7 +1,9 @@
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="5dp"
android:paddingBottom="5dp"
tools:context="xyz.johnny.norntalk.ui_components.ConversationFragment">
<include layout="@layout/conversation_view"
@ -10,4 +12,4 @@
android:layout_height="wrap_content" />
</android.support.constraint.ConstraintLayout>
</FrameLayout>