Skip to content

likorn / vocabulary_notebook

Go to a project
Commit ed16421e by Paktalin
Options

Refactoring in layouts

parent 2537be11
Inline Side-by-side
Showing with 36 additions and 42 deletions
app/src/main/res/layout/activity_main.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.DrawerLayout <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
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:id="@+id/drawerLayout" android:id="@+id/drawerLayout"
...@@ -8,11 +7,34 @@ ...@@ -8,11 +7,34 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:openDrawer="start"> tools:openDrawer="start">
<fragment <include layout="@layout/img_background" />
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical">
<fragment
android:id="@+id/fragment_new_word"
android:name="com.paktalin.vocabularynotebook.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.activities.VocabularyFragment" android:name="com.paktalin.vocabularynotebook.activities.VocabularyFragment"
android:id="@+id/fragment_vocabulary" /> android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<android.support.design.widget.NavigationView <android.support.design.widget.NavigationView
android:id="@+id/navigationView" android:id="@+id/navigationView"
......
app/src/main/res/layout/fragment_new_word.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent">
<LinearLayout 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="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -16,9 +12,9 @@ ...@@ -16,9 +12,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="8" android:layout_weight="8"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:hint="@string/hint_new_word"
android:inputType="text" android:inputType="text"
android:textSize="22sp" android:textSize="22sp"
android:hint="@string/hint_new_word"
tools:ignore="LabelFor" /> tools:ignore="LabelFor" />
<EditText <EditText
...@@ -27,9 +23,9 @@ ...@@ -27,9 +23,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="8" android:layout_weight="8"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:hint="@string/hint_translation"
android:inputType="text" android:inputType="text"
android:textSize="22sp" android:textSize="22sp"
android:hint="@string/hint_translation"
tools:ignore="LabelFor" /> tools:ignore="LabelFor" />
<ImageButton <ImageButton
...@@ -41,6 +37,4 @@ ...@@ -41,6 +37,4 @@
app:srcCompat="@drawable/ic_cancel_icon" app:srcCompat="@drawable/ic_cancel_icon"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
</android.support.constraint.ConstraintLayout>
app/src/main/res/layout/fragment_vocabulary.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
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="match_parent" android:layout_height="wrap_content"
app:layout_behavior="@string/appbar_scrolling_view_behavior" app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="com.paktalin.vocabularynotebook.activities.VocabularyFragment"> tools:context="com.paktalin.vocabularynotebook.activities.VocabularyFragment">
<include layout="@layout/img_background" />
<fragment
android:id="@+id/fragment"
android:name="com.paktalin.vocabularynotebook.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" />
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView" android:id="@+id/recyclerView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:layout_margin="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" />
</android.support.constraint.ConstraintLayout> </FrameLayout>
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