Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
likorn
/
vocabulary_notebook
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
ed16421e
authored
Sep 09, 2018
by
Paktalin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactoring in layouts
parent
2537be11
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
42 deletions
app/src/main/res/layout/activity_main.xml
app/src/main/res/layout/fragment_new_word.xml
app/src/main/res/layout/fragment_vocabulary.xml
app/src/main/res/layout/activity_main.xml
View file @
ed16421e
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.DrawerLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android.support.v4.widget.DrawerLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
android:id=
"@+id/drawerLayout"
...
...
@@ -8,11 +7,34 @@
android:layout_height=
"match_parent"
tools:openDrawer=
"start"
>
<fragment
<include
layout=
"@layout/img_background"
/>
<LinearLayout
android:layout_width=
"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:id=
"@+id/fragment_vocabulary"
/>
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
</LinearLayout>
<android.support.design.widget.NavigationView
android:id=
"@+id/navigationView"
...
...
app/src/main/res/layout/fragment_new_word.xml
View file @
ed16421e
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<LinearLayout
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:orientation=
"horizontal"
>
...
...
@@ -16,9 +12,9 @@
android:layout_height=
"wrap_content"
android:layout_weight=
"8"
android:background=
"@android:color/transparent"
android:hint=
"@string/hint_new_word"
android:inputType=
"text"
android:textSize=
"22sp"
android:hint=
"@string/hint_new_word"
tools:ignore=
"LabelFor"
/>
<EditText
...
...
@@ -27,9 +23,9 @@
android:layout_height=
"wrap_content"
android:layout_weight=
"8"
android:background=
"@android:color/transparent"
android:hint=
"@string/hint_translation"
android:inputType=
"text"
android:textSize=
"22sp"
android:hint=
"@string/hint_translation"
tools:ignore=
"LabelFor"
/>
<ImageButton
...
...
@@ -41,6 +37,4 @@
app:srcCompat=
"@drawable/ic_cancel_icon"
tools:ignore=
"ContentDescription"
/>
</LinearLayout>
</android.support.constraint.ConstraintLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/fragment_vocabulary.xml
View file @
ed16421e
<?xml version="1.0" encoding="utf-8"?>
<
android.support.constraint.Constraint
Layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<
Frame
Layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_height=
"
match_par
ent"
android:layout_height=
"
wrap_cont
ent"
app:layout_behavior=
"@string/appbar_scrolling_view_behavior"
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:id=
"@+id/recyclerView"
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"
/>
android:layout_margin=
"8dp"
/>
</
android.support.constraint.Constraint
Layout>
</
Frame
Layout>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment