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
0be9c01d
authored
Sep 10, 2018
by
Paktalin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Finally fixed background issue
parent
1ca4ace2
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
20 additions
and
26 deletions
app/src/main/java/com/paktalin/vocabularynotebook/ui/MainActivity.kt
app/src/main/res/drawable/line_background.jpg
app/src/main/res/drawable/notepad.jpg
app/src/main/res/drawable/one_item2.png
app/src/main/res/drawable/word_item.png
app/src/main/res/layout/activity_word_info.xml
app/src/main/res/layout/fragment_new_word.xml
app/src/main/res/layout/img_background.xml
app/src/main/res/layout/notebook_sheet.xml
app/src/main/res/layout/word_item.xml
app/src/main/java/com/paktalin/vocabularynotebook/ui/MainActivity.kt
View file @
0be9c01d
...
@@ -44,7 +44,7 @@ class MainActivity : AppCompatActivity() {
...
@@ -44,7 +44,7 @@ class MainActivity : AppCompatActivity() {
}
}
private
fun
extractVocabularyData
()
{
private
fun
extractVocabularyData
()
{
val
userId
=
FirebaseAuth
.
getInstance
().
currentUser
!!
.
uid
val
userId
=
FirebaseAuth
.
getInstance
()
!!
.
currentUser
!!
.
uid
val
db
=
ConfiguredFirestore
.
instance
val
db
=
ConfiguredFirestore
.
instance
val
userDocument
=
db
.
collection
(
"users"
).
document
(
userId
)
val
userDocument
=
db
.
collection
(
"users"
).
document
(
userId
)
...
...
app/src/main/res/drawable/line_background.jpg
0 → 100644
View file @
0be9c01d
22.9 KB
app/src/main/res/drawable/notepad.jpg
deleted
100644 → 0
View file @
1ca4ace2
12.7 KB
app/src/main/res/drawable/one_item2.png
deleted
100644 → 0
View file @
1ca4ace2
5.33 KB
app/src/main/res/drawable/word_item.png
deleted
100644 → 0
View file @
1ca4ace2
5.33 KB
app/src/main/res/layout/activity_word_info.xml
View file @
0be9c01d
...
@@ -5,8 +5,6 @@
...
@@ -5,8 +5,6 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
android:layout_height=
"match_parent"
>
<include
layout=
"@layout/img_background"
/>
<TextView
<TextView
android:id=
"@+id/etWord"
android:id=
"@+id/etWord"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
...
...
app/src/main/res/layout/fragment_new_word.xml
View file @
0be9c01d
...
@@ -4,7 +4,14 @@
...
@@ -4,7 +4,14 @@
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=
"wrap_content"
android:layout_height=
"wrap_content"
android:orientation=
"horizontal"
>
android:orientation=
"horizontal"
android:background=
"@drawable/line_background"
android:paddingLeft=
"16dp"
android:paddingStart=
"16dp"
android:paddingRight=
"16dp"
android:paddingEnd=
"16dp"
android:paddingTop=
"8dp"
android:paddingBottom=
"8dp"
>
<EditText
<EditText
android:id=
"@+id/etWord"
android:id=
"@+id/etWord"
...
@@ -35,7 +42,7 @@
...
@@ -35,7 +42,7 @@
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:visibility=
"
invisibl
e"
android:visibility=
"
gon
e"
android:background=
"@android:color/transparent"
android:background=
"@android:color/transparent"
app:srcCompat=
"@drawable/ic_cancel_icon"
app:srcCompat=
"@drawable/ic_cancel_icon"
tools:ignore=
"ContentDescription"
/>
tools:ignore=
"ContentDescription"
/>
...
...
app/src/main/res/layout/img_background.xml
deleted
100644 → 0
View file @
1ca4ace2
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<ImageView
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:src=
"@drawable/notepad"
android:scaleType=
"fitXY"
tools:ignore=
"ContentDescription"
/>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/notebook_sheet.xml
View file @
0be9c01d
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android.support.constraint.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
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"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
android:layout_height=
"match_parent"
>
...
@@ -46,7 +47,8 @@
...
@@ -46,7 +47,8 @@
android:layout_marginEnd=
"8dp"
android:layout_marginEnd=
"8dp"
android:layout_marginRight=
"8dp"
android:layout_marginRight=
"8dp"
android:background=
"@android:color/transparent"
android:background=
"@android:color/transparent"
app:srcCompat=
"@drawable/ic_done_icon"
/>
app:srcCompat=
"@drawable/ic_done_icon"
tools:ignore=
"ContentDescription"
/>
</FrameLayout>
</FrameLayout>
...
...
app/src/main/res/layout/word_item.xml
View file @
0be9c01d
...
@@ -8,11 +8,13 @@
...
@@ -8,11 +8,13 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:orientation=
"horizontal"
android:orientation=
"horizontal"
android:background=
"@drawable/one_item2"
android:paddingLeft=
"16dp"
android:paddingRight=
"32dp"
android:paddingStart=
"16dp"
android:paddingLeft=
"56dp"
android:paddingRight=
"16dp"
android:paddingEnd=
"32dp"
android:paddingEnd=
"16dp"
android:paddingStart=
"56dp"
>
android:paddingTop=
"8dp"
android:paddingBottom=
"8dp"
android:background=
"@drawable/line_background"
>
<TextView
<TextView
android:id=
"@+id/etWord"
android:id=
"@+id/etWord"
...
...
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