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
620fd6c4
authored
Sep 10, 2018
by
Paktalin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed background
parent
86480fca
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
14 deletions
app/src/main/java/com/paktalin/vocabularynotebook/VocabularyAdapter.kt
app/src/main/java/com/paktalin/vocabularynotebook/ui/MainActivity.kt
app/src/main/java/com/paktalin/vocabularynotebook/ui/VocabularyFragment.kt
app/src/main/res/drawable/background_small.jpg
app/src/main/res/drawable/notepad.jpg
app/src/main/res/layout/img_background.xml
app/src/main/java/com/paktalin/vocabularynotebook/VocabularyAdapter.kt
View file @
620fd6c4
...
@@ -34,9 +34,7 @@ class VocabularyAdapter(private val wordItems: MutableList<WordItem>, private va
...
@@ -34,9 +34,7 @@ class VocabularyAdapter(private val wordItems: MutableList<WordItem>, private va
//todo set click listener to menu
//todo set click listener to menu
}
}
override
fun
getItemCount
():
Int
{
override
fun
getItemCount
():
Int
{
return
wordItems
.
size
}
return
wordItems
.
size
}
private
fun
openWordItemInfo
(
wordItem
:
WordItem
)
{
private
fun
openWordItemInfo
(
wordItem
:
WordItem
)
{
val
intentWordItemInfo
=
Intent
(
context
,
WordItemInfoActivity
::
class
.
java
)
val
intentWordItemInfo
=
Intent
(
context
,
WordItemInfoActivity
::
class
.
java
)
...
...
app/src/main/java/com/paktalin/vocabularynotebook/ui/MainActivity.kt
View file @
620fd6c4
...
@@ -15,7 +15,6 @@ import android.app.Activity
...
@@ -15,7 +15,6 @@ import android.app.Activity
import
android.view.View
import
android.view.View
import
android.view.inputmethod.InputMethodManager
import
android.view.inputmethod.InputMethodManager
class
MainActivity
:
AppCompatActivity
()
{
class
MainActivity
:
AppCompatActivity
()
{
lateinit
var
vocabularyId
:
String
lateinit
var
vocabularyId
:
String
...
@@ -73,7 +72,5 @@ class MainActivity : AppCompatActivity() {
...
@@ -73,7 +72,5 @@ class MainActivity : AppCompatActivity() {
imm
.
hideSoftInputFromWindow
(
view
.
windowToken
,
0
)
imm
.
hideSoftInputFromWindow
(
view
.
windowToken
,
0
)
}
}
companion
object
{
companion
object
{
private
val
TAG
=
"VN/"
+
MainActivity
::
class
.
simpleName
}
private
val
TAG
=
"VN/"
+
MainActivity
::
class
.
simpleName
}
}
\ No newline at end of file
}
app/src/main/java/com/paktalin/vocabularynotebook/ui/VocabularyFragment.kt
View file @
620fd6c4
...
@@ -9,9 +9,7 @@ import android.view.ViewGroup
...
@@ -9,9 +9,7 @@ import android.view.ViewGroup
import
com.google.firebase.auth.FirebaseAuth
import
com.google.firebase.auth.FirebaseAuth
import
com.google.firebase.firestore.DocumentSnapshot
import
com.google.firebase.firestore.DocumentSnapshot
import
com.google.firebase.firestore.FirebaseFirestore
import
com.google.firebase.firestore.FirebaseFirestore
import
com.paktalin.vocabularynotebook.R
import
com.paktalin.vocabularynotebook.*
import
com.paktalin.vocabularynotebook.VocabularyAdapter
import
com.paktalin.vocabularynotebook.WordItem
import
kotlinx.android.synthetic.main.fragment_vocabulary.*
import
kotlinx.android.synthetic.main.fragment_vocabulary.*
class
VocabularyFragment
:
Fragment
()
{
class
VocabularyFragment
:
Fragment
()
{
...
...
app/src/main/res/drawable/background_small.jpg
deleted
100644 → 0
View file @
86480fca
66.7 KB
app/src/main/res/drawable/notepad.jpg
0 → 100644
View file @
620fd6c4
12.7 KB
app/src/main/res/layout/img_background.xml
View file @
620fd6c4
...
@@ -3,12 +3,16 @@
...
@@ -3,12 +3,16 @@
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:android=
"http://schemas.android.com/apk/res/android"
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:paddingTop=
"16dp"
android:paddingBottom=
"16dp"
android:paddingLeft=
"4dp"
android:paddingRight=
"4dp"
>
<ImageView
<ImageView
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:src=
"@drawable/
background_small
"
android:src=
"@drawable/
notepad
"
android:scaleType=
"
centerCrop
"
android:scaleType=
"
fitXY
"
tools:ignore=
"ContentDescription"
/>
tools:ignore=
"ContentDescription"
/>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
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