Skip to content

likorn / vocabulary_notebook

Go to a project
Commit b244f6d6 by Paktalin
Options

Layout matches background

parent 620fd6c4
Inline Side-by-side
Showing with 65 additions and 59 deletions
app/src/main/res/layout/activity_main.xml
...@@ -9,60 +9,7 @@ ...@@ -9,60 +9,7 @@
<include layout="@layout/img_background" /> <include layout="@layout/img_background" />
<android.support.constraint.ConstraintLayout <include layout="@layout/notebook_sheet" />
android:layout_width="match_parent"
android:layout_height="match_parent">
<fragment
android:id="@+id/fragment_new_word"
android:name="com.paktalin.vocabularynotebook.ui.NewWordFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<fragment
android:id="@+id/fragment_vocabulary"
android:name="com.paktalin.vocabularynotebook.ui.VocabularyFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fragment_new_word" />
<FrameLayout
android:id="@+id/btnAddWordLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
android:background="@color/colorPrimary"
android:visibility="invisible">
<ImageButton
android:id="@+id/btnAddWord"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:background="@android:color/transparent"
android:layout_gravity="end"
app:srcCompat="@drawable/ic_done_icon" />
</FrameLayout>
</android.support.constraint.ConstraintLayout>
<android.support.design.widget.NavigationView <android.support.design.widget.NavigationView
android:id="@+id/navigationView" android:id="@+id/navigationView"
......
app/src/main/res/layout/fragment_vocabulary.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="com.paktalin.vocabularynotebook.ui.VocabularyFragment"> tools:context="com.paktalin.vocabularynotebook.ui.VocabularyFragment">
......
app/src/main/res/layout/img_background.xml
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingTop="16dp" android:paddingTop="4dp"
android:paddingBottom="16dp" android:paddingBottom="4dp"
android:paddingLeft="4dp" android:paddingLeft="4dp"
android:paddingRight="4dp"> android:paddingRight="4dp">
......
app/src/main/res/layout/notebook_sheet.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
<include layout="@layout/img_background" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="24dp"
android:layout_marginEnd="32dp"
android:layout_marginLeft="56dp"
android:layout_marginRight="32dp"
android:layout_marginStart="56dp"
android:layout_marginTop="24dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<fragment
android:id="@+id/fragment_new_word"
android:name="com.paktalin.vocabularynotebook.ui.NewWordFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<fragment
android:id="@+id/fragment_vocabulary"
android:name="com.paktalin.vocabularynotebook.ui.VocabularyFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
<FrameLayout
android:id="@+id/btnAddWordLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
android:background="@color/colorPrimary"
android:visibility="invisible">
<ImageButton
android:id="@+id/btnAddWord"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:background="@android:color/transparent"
android:layout_gravity="end"
app:srcCompat="@drawable/ic_done_icon" />
</FrameLayout>
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/word_item.xml
...@@ -7,8 +7,7 @@ ...@@ -7,8 +7,7 @@
android:id="@+id/tableLayout" android:id="@+id/tableLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal">
android:padding="8dp">
<TextView <TextView
android:id="@+id/etWord" android:id="@+id/etWord"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment