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
17762c4f
authored
Nov 12, 2018
by
Paktalin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Background sheet is set to refreshLayout instead of LinearLayout
parent
6b2e1892
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
15 deletions
app/src/main/java/com/paktalin/vocabularynotebook/ui/activities/MainActivity.kt
app/src/main/res/layout/content_main.xml
app/src/main/java/com/paktalin/vocabularynotebook/ui/activities/MainActivity.kt
View file @
17762c4f
...
@@ -79,7 +79,7 @@ class MainActivity : AppCompatActivity() {
...
@@ -79,7 +79,7 @@ class MainActivity : AppCompatActivity() {
vocabularyFragment
=
VocabularyFragment
()
vocabularyFragment
=
VocabularyFragment
()
val
arguments
=
Bundle
()
val
arguments
=
Bundle
()
arguments
.
putString
(
"vocabularyId"
,
vocabularyId
)
arguments
.
putString
(
"vocabularyId"
,
vocabularyId
)
addFragment
(
supportFragmentManager
,
vocabularyFragment
,
R
.
id
.
container_vocabulary
,
arguments
)
addFragment
(
supportFragmentManager
,
vocabularyFragment
,
R
.
id
.
scrollView
,
arguments
)
}
}
private
fun
hideKeyboard
()
{
private
fun
hideKeyboard
()
{
...
...
app/src/main/res/layout/content_main.xml
View file @
17762c4f
...
@@ -40,28 +40,23 @@
...
@@ -40,28 +40,23 @@
android:layout_marginLeft=
"@dimen/small_margin"
android:layout_marginLeft=
"@dimen/small_margin"
android:layout_marginRight=
"@dimen/small_margin"
android:layout_marginRight=
"@dimen/small_margin"
android:layout_marginStart=
"@dimen/small_margin"
android:layout_marginStart=
"@dimen/small_margin"
android:layout_marginBottom=
"@dimen/small_margin"
app:layout_constraintBottom_toTopOf=
"@+id/btnSubmitLayout"
app:layout_constraintBottom_toTopOf=
"@+id/btnSubmitLayout"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/container_main"
>
app:layout_constraintTop_toBottomOf=
"@+id/container_main"
android:background=
"@drawable/sheet_bottom"
>
<com.paktalin.vocabularynotebook.ui.views.LockableScrollView
<com.paktalin.vocabularynotebook.ui.views.LockableScrollView
android:id=
"@+id/scrollView"
android:id=
"@+id/scrollView"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
android:layout_height=
"0dp"
android:scrollbars=
"vertical"
>
android:scrollbars=
"vertical"
android:paddingBottom=
"@dimen/small_padding"
<LinearLayout
android:paddingEnd=
"@dimen/small_padding"
android:id=
"@+id/container_vocabulary"
android:paddingLeft=
"@dimen/small_padding"
android:layout_width=
"match_parent"
android:paddingRight=
"@dimen/small_padding"
android:layout_height=
"wrap_content"
android:paddingStart=
"@dimen/small_padding"
>
android:background=
"@drawable/sheet_bottom"
android:orientation=
"vertical"
android:paddingBottom=
"@dimen/small_padding"
android:paddingEnd=
"@dimen/small_padding"
android:paddingLeft=
"@dimen/small_padding"
android:paddingRight=
"@dimen/small_padding"
android:paddingStart=
"@dimen/small_padding"
/>
</com.paktalin.vocabularynotebook.ui.views.LockableScrollView>
</com.paktalin.vocabularynotebook.ui.views.LockableScrollView>
</android.support.v4.widget.SwipeRefreshLayout>
</android.support.v4.widget.SwipeRefreshLayout>
...
...
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