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
7d0ccb2c
authored
Nov 13, 2018
by
Paktalin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed color scheme
parent
5ccfc374
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
6 deletions
app/src/main/java/com/paktalin/vocabularynotebook/ui/activities/MainActivity.kt
app/src/main/java/com/paktalin/vocabularynotebook/ui/fragments/EditWordFragment.kt
app/src/main/res/layout/activity_log_in.xml
app/src/main/res/values/colors.xml
app/src/main/java/com/paktalin/vocabularynotebook/ui/activities/MainActivity.kt
View file @
7d0ccb2c
...
@@ -33,6 +33,7 @@ class MainActivity : AppCompatActivity() {
...
@@ -33,6 +33,7 @@ class MainActivity : AppCompatActivity() {
setContentView
(
R
.
layout
.
activity_main
)
setContentView
(
R
.
layout
.
activity_main
)
FirestoreManager
.
vocabularyId
=
getSavedVocabularyId
(
this
@MainActivity
)
FirestoreManager
.
vocabularyId
=
getSavedVocabularyId
(
this
@MainActivity
)
swipeRefresh
.
setOnRefreshListener
{
refreshVocabulary
()
}
swipeRefresh
.
setOnRefreshListener
{
refreshVocabulary
()
}
swipeRefresh
.
setColorSchemeResources
(
R
.
color
.
colorAccent
)
hideKeyboard
()
hideKeyboard
()
setUpNavigationView
()
setUpNavigationView
()
extractVocabularyData
()
extractVocabularyData
()
...
...
app/src/main/java/com/paktalin/vocabularynotebook/ui/fragments/EditWordFragment.kt
View file @
7d0ccb2c
...
@@ -50,7 +50,6 @@ class EditWordFragment : WordFragment() {
...
@@ -50,7 +50,6 @@ class EditWordFragment : WordFragment() {
private
fun
setWordItemData
()
{
private
fun
setWordItemData
()
{
word
.
setText
(
wordItem
.
pojo
.
word
)
word
.
setText
(
wordItem
.
pojo
.
word
)
translation
.
setText
(
wordItem
.
pojo
.
translation
)
translation
.
setText
(
wordItem
.
pojo
.
translation
)
editable_word
.
setBackgroundColor
(
ContextCompat
.
getColor
(
mainActivity
,
R
.
color
.
green_highlight
))
}
}
private
fun
setFocusOnWord
()
{
private
fun
setFocusOnWord
()
{
...
...
app/src/main/res/layout/activity_log_in.xml
View file @
7d0ccb2c
...
@@ -115,7 +115,7 @@
...
@@ -115,7 +115,7 @@
android:background=
"@android:color/transparent"
android:background=
"@android:color/transparent"
android:fontFamily=
"@font/neucha"
android:fontFamily=
"@font/neucha"
android:textSize=
"@dimen/button_text_size"
android:textSize=
"@dimen/button_text_size"
android:textColor=
"@color/
sheet_color
"
android:textColor=
"@color/
colorPrimary
"
app:layout_constraintBottom_toBottomOf=
"@+id/btnLogIn"
app:layout_constraintBottom_toBottomOf=
"@+id/btnLogIn"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toEndOf=
"@+id/btnLogIn"
app:layout_constraintStart_toEndOf=
"@+id/btnLogIn"
...
...
app/src/main/res/values/colors.xml
View file @
7d0ccb2c
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<resources>
<color
name=
"colorPrimary"
>
#3F51B5
</color>
<color
name=
"colorPrimary"
>
#D34E21
</color>
<color
name=
"colorPrimaryDark"
>
#303F9F
</color>
<color
name=
"colorPrimaryDark"
>
#AD401C
</color>
<color
name=
"colorAccent"
>
#FF4081
</color>
<color
name=
"colorAccent"
>
#D34E21
</color>
<color
name=
"sheet_color"
>
#FAFAFA
</color>
<color
name=
"sheet_color"
>
#FAFAFA
</color>
<color
name=
"green_highlight"
>
#69B578
</color>
<color
name=
"text_color"
>
#000F55
</color>
<color
name=
"text_color"
>
#000F55
</color>
<color
name=
"background_color"
>
#66330E
</color>
<color
name=
"background_color"
>
#66330E
</color>
<!--D34E21-->
</resources>
</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