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
5c782835
authored
Sep 11, 2018
by
Paktalin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed margins in ScrollView
parent
2749c05a
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
17 deletions
.idea/assetWizardSettings.xml
app/src/main/res/drawable/ic_close_icon.xml
app/src/main/res/drawable/background.xml → app/src/main/res/drawable/sheet_background.xml
app/src/main/res/layout/fragment_new_word.xml
app/src/main/res/layout/fragment_vocabulary.xml
app/src/main/res/layout/notebook_sheet.xml
.idea/assetWizardSettings.xml
View file @
5c782835
...
@@ -14,8 +14,8 @@
...
@@ -14,8 +14,8 @@
<option
name=
"values"
>
<option
name=
"values"
>
<map>
<map>
<entry
key=
"assetSourceType"
value=
"FILE"
/>
<entry
key=
"assetSourceType"
value=
"FILE"
/>
<entry
key=
"outputName"
value=
"ic_
don
e_icon"
/>
<entry
key=
"outputName"
value=
"ic_
clos
e_icon"
/>
<entry
key=
"sourceFile"
value=
"C:\Users\litak\Desktop\
don
e_icon.svg"
/>
<entry
key=
"sourceFile"
value=
"C:\Users\litak\Desktop\
clos
e_icon.svg"
/>
</map>
</map>
</option>
</option>
</PersistentState>
</PersistentState>
...
...
app/src/main/res/drawable/ic_close_icon.xml
0 → 100644
View file @
5c782835
<vector
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:width=
"24dp"
android:height=
"24dp"
android:viewportWidth=
"24"
android:viewportHeight=
"24"
>
<path
android:fillColor=
"#FF000000"
android:pathData=
"M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"
/>
</vector>
app/src/main/res/drawable/background.xml
→
app/src/main/res/drawable/
sheet_
background.xml
View file @
5c782835
File moved
app/src/main/res/layout/fragment_new_word.xml
View file @
5c782835
...
@@ -70,7 +70,7 @@
...
@@ -70,7 +70,7 @@
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:srcCompat=
"@drawable/ic_c
ancel
_icon"
app:srcCompat=
"@drawable/ic_c
lose
_icon"
tools:ignore=
"ContentDescription"
/>
tools:ignore=
"ContentDescription"
/>
...
...
app/src/main/res/layout/fragment_vocabulary.xml
View file @
5c782835
...
@@ -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=
"
match_par
ent"
android:layout_height=
"
wrap_cont
ent"
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/notebook_sheet.xml
View file @
5c782835
...
@@ -4,43 +4,39 @@
...
@@ -4,43 +4,39 @@
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:background=
"
@color/colorPrimary
"
>
android:background=
"
#66330E
"
>
<ScrollView
<ScrollView
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginBottom=
"8dp"
android:layout_marginEnd=
"8dp"
android:layout_marginLeft=
"8dp"
android:layout_marginRight=
"8dp"
android:layout_marginStart=
"8dp"
android:layout_marginTop=
"8dp"
android:scrollbars=
"vertical"
android:scrollbars=
"vertical"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
>
app:layout_constraintTop_toTopOf=
"parent"
android:layout_margin=
"8dp"
>
<LinearLayout
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
android:padding=
"8dp"
android:background=
"@drawable/background"
>
android:background=
"@drawable/sheet_background"
android:orientation=
"vertical"
>
<fragment
<fragment
android:id=
"@+id/fragment_new_word"
android:id=
"@+id/fragment_new_word"
android:name=
"com.paktalin.vocabularynotebook.ui.NewWordFragment"
android:name=
"com.paktalin.vocabularynotebook.ui.NewWordFragment"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"8dp"
/>
android:layout_marginTop=
"8dp"
/>
<fragment
<fragment
android:id=
"@+id/fragment_vocabulary"
android:id=
"@+id/fragment_vocabulary"
android:name=
"com.paktalin.vocabularynotebook.ui.VocabularyFragment"
android:name=
"com.paktalin.vocabularynotebook.ui.VocabularyFragment"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
/>
android:layout_height=
"wrap_content"
/>
</LinearLayout>
</LinearLayout>
</ScrollView>
</ScrollView>
<FrameLayout
<FrameLayout
...
...
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