Skip to content

likorn / vocabulary_notebook

Go to a project
Commit 40c0da46 by Paktalin
Options

Defined margins for word and translation fields

parent 0c67e41d
Inline Side-by-side
Showing with 11 additions and 3 deletions
.idea/misc.xml
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</value> </value>
</option> </option>
</component> </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" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
......
app/src/main/java/com/paktalin/vocabularynotebook/vocabulary/ModifiedVocabulary.kt
...@@ -5,6 +5,7 @@ import com.paktalin.vocabularynotebook.firestoreitems.WordItem ...@@ -5,6 +5,7 @@ import com.paktalin.vocabularynotebook.firestoreitems.WordItem
import com.paktalin.vocabularynotebook.utils.FirestoreManager import com.paktalin.vocabularynotebook.utils.FirestoreManager
class ModifiedVocabulary : Vocabulary { class ModifiedVocabulary : Vocabulary {
//TODO wordMap<ModifiedLabel, WordItem>
var wordList = mutableListOf<WordItem>() var wordList = mutableListOf<WordItem>()
private val maxPermitted = 9 private val maxPermitted = 9
......
app/src/main/res/layout/fragment_editable_word.xml
...@@ -41,10 +41,12 @@ ...@@ -41,10 +41,12 @@
android:layout_weight="1" android:layout_weight="1"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:hint="@string/hint_word" android:hint="@string/hint_word"
android:inputType="text" android:inputType="textMultiLine"
android:textSize="@dimen/text_size" android:textSize="@dimen/text_size"
app:fontFamily="@font/neucha" app:fontFamily="@font/neucha"
android:textColor="@color/text_color" android:textColor="@color/text_color"
android:layout_marginRight="@dimen/word_margin"
android:layout_marginEnd="@dimen/word_margin"
tools:ignore="LabelFor" /> tools:ignore="LabelFor" />
<EditText <EditText
...@@ -54,10 +56,12 @@ ...@@ -54,10 +56,12 @@
android:layout_weight="1" android:layout_weight="1"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:hint="@string/hint_translation" android:hint="@string/hint_translation"
android:inputType="text" android:inputType="textMultiLine"
android:textSize="@dimen/text_size" android:textSize="@dimen/text_size"
app:fontFamily="@font/neucha" app:fontFamily="@font/neucha"
android:textColor="@color/text_color" android:textColor="@color/text_color"
android:layout_marginRight="16dp"
android:layout_marginEnd="16dp"
tools:ignore="LabelFor" /> tools:ignore="LabelFor" />
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/word_item.xml
...@@ -43,6 +43,8 @@ ...@@ -43,6 +43,8 @@
android:textSize="@dimen/text_size" android:textSize="@dimen/text_size"
app:fontFamily="@font/neucha" app:fontFamily="@font/neucha"
android:textColor="@color/text_color" android:textColor="@color/text_color"
android:layout_marginRight="@dimen/word_margin"
android:layout_marginEnd="@dimen/word_margin"
tools:ignore="LabelFor" /> tools:ignore="LabelFor" />
<TextView <TextView
......
app/src/main/res/values/dimens.xml
...@@ -10,4 +10,5 @@ ...@@ -10,4 +10,5 @@
<dimen name="medium_padding">16dp</dimen> <dimen name="medium_padding">16dp</dimen>
<dimen name="medium_margin">16dp</dimen> <dimen name="medium_margin">16dp</dimen>
<dimen name="text_size">22sp</dimen> <dimen name="text_size">22sp</dimen>
<dimen name="word_margin">8dp</dimen>
</resources> </resources>
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