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
40c0da46
authored
Apr 20, 2019
by
Paktalin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Defined margins for word and translation fields
parent
0c67e41d
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
3 deletions
.idea/misc.xml
app/src/main/java/com/paktalin/vocabularynotebook/vocabulary/ModifiedVocabulary.kt
app/src/main/res/layout/fragment_editable_word.xml
app/src/main/res/layout/word_item.xml
app/src/main/res/values/dimens.xml
.idea/misc.xml
View file @
40c0da46
...
...
@@ -25,7 +25,7 @@
</value>
</option>
</component>
<component
name=
"ProjectRootManager"
version=
"2"
languageLevel=
"JDK_1_
8
"
project-jdk-name=
"1.8"
project-jdk-type=
"JavaSDK"
>
<component
name=
"ProjectRootManager"
version=
"2"
languageLevel=
"JDK_1_
7
"
project-jdk-name=
"1.8"
project-jdk-type=
"JavaSDK"
>
<output
url=
"file://$PROJECT_DIR$/build/classes"
/>
</component>
<component
name=
"ProjectType"
>
...
...
app/src/main/java/com/paktalin/vocabularynotebook/vocabulary/ModifiedVocabulary.kt
View file @
40c0da46
...
...
@@ -5,6 +5,7 @@ import com.paktalin.vocabularynotebook.firestoreitems.WordItem
import
com.paktalin.vocabularynotebook.utils.FirestoreManager
class
ModifiedVocabulary
:
Vocabulary
{
//TODO wordMap<ModifiedLabel, WordItem>
var
wordList
=
mutableListOf
<
WordItem
>()
private
val
maxPermitted
=
9
...
...
app/src/main/res/layout/fragment_editable_word.xml
View file @
40c0da46
...
...
@@ -41,10 +41,12 @@
android:layout_weight=
"1"
android:background=
"@android:color/transparent"
android:hint=
"@string/hint_word"
android:inputType=
"text"
android:inputType=
"text
MultiLine
"
android:textSize=
"@dimen/text_size"
app:fontFamily=
"@font/neucha"
android:textColor=
"@color/text_color"
android:layout_marginRight=
"@dimen/word_margin"
android:layout_marginEnd=
"@dimen/word_margin"
tools:ignore=
"LabelFor"
/>
<EditText
...
...
@@ -54,10 +56,12 @@
android:layout_weight=
"1"
android:background=
"@android:color/transparent"
android:hint=
"@string/hint_translation"
android:inputType=
"text"
android:inputType=
"text
MultiLine
"
android:textSize=
"@dimen/text_size"
app:fontFamily=
"@font/neucha"
android:textColor=
"@color/text_color"
android:layout_marginRight=
"16dp"
android:layout_marginEnd=
"16dp"
tools:ignore=
"LabelFor"
/>
</LinearLayout>
...
...
app/src/main/res/layout/word_item.xml
View file @
40c0da46
...
...
@@ -43,6 +43,8 @@
android:textSize=
"@dimen/text_size"
app:fontFamily=
"@font/neucha"
android:textColor=
"@color/text_color"
android:layout_marginRight=
"@dimen/word_margin"
android:layout_marginEnd=
"@dimen/word_margin"
tools:ignore=
"LabelFor"
/>
<TextView
...
...
app/src/main/res/values/dimens.xml
View file @
40c0da46
...
...
@@ -10,4 +10,5 @@
<dimen
name=
"medium_padding"
>
16dp
</dimen>
<dimen
name=
"medium_margin"
>
16dp
</dimen>
<dimen
name=
"text_size"
>
22sp
</dimen>
<dimen
name=
"word_margin"
>
8dp
</dimen>
</resources>
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