Skip to content

likorn / vocabulary_notebook

Go to a project
Commit 79b07129 by Paktalin
Options

Updated dependencies

parent 70172ad6
Inline Side-by-side
Showing with 114 additions and 140 deletions
.idea/codeStyles/Project.xml deleted 100644 → 0
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<Objective-C-extensions>
<file>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
</file>
<class>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
</class>
<extensions>
<pair source="cpp" header="h" fileNamingConvention="NONE" />
<pair source="c" header="h" fileNamingConvention="NONE" />
</extensions>
</Objective-C-extensions>
</code_scheme>
</component>
\ No newline at end of file
.idea/encodings.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" addBOMForNewFiles="with NO BOM" />
</project>
\ No newline at end of file
.idea/misc.xml
...@@ -5,22 +5,32 @@ ...@@ -5,22 +5,32 @@
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" /> <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<option name="myNullables"> <option name="myNullables">
<value> <value>
<list size="5"> <list size="10">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" /> <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" /> <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" /> <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
<item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" /> <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" /> <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
<item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
<item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
<item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
<item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
</list> </list>
</value> </value>
</option> </option>
<option name="myNotNulls"> <option name="myNotNulls">
<value> <value>
<list size="4"> <list size="9">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" /> <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" /> <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" /> <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" /> <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
<item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
<item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
<item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
<item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
</list> </list>
</value> </value>
</option> </option>
......
app/build.gradle
...@@ -29,26 +29,27 @@ android { ...@@ -29,26 +29,27 @@ android {
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'com.android.support:design:28.0.0' implementation 'com.google.android.material:material:1.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'com.android.support:recyclerview-v7:28.0.0' implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'com.android.support:support-annotations:28.0.0' implementation 'androidx.annotation:annotation:1.0.2'
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
implementation 'com.android.support:multidex:1.0.3' implementation 'androidx.multidex:multidex:2.0.1'
implementation 'org.apache.commons:commons-lang3:3.6' implementation 'org.apache.commons:commons-lang3:3.6'
implementation 'com.google.firebase:firebase-core:16.0.5' implementation 'com.google.firebase:firebase-core:16.0.8'
implementation 'com.google.firebase:firebase-database:16.0.5' implementation 'com.google.firebase:firebase-database:16.1.0'
implementation 'com.google.firebase:firebase-auth:16.0.5' implementation 'com.google.firebase:firebase-auth:16.2.1'
implementation 'com.firebase:firebase-client-android:2.3.1' implementation 'com.firebase:firebase-client-android:2.3.1'
implementation 'com.google.firebase:firebase-firestore:17.1.3' implementation 'com.google.firebase:firebase-firestore:18.2.0'
implementation 'com.crashlytics.sdk.android:crashlytics:2.9.6' implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9'
implementation 'androidx.recyclerview:recyclerview-selection:1.0.0'
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'androidx.test:runner:1.1.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
androidTestImplementation 'androidx.test:rules:1.1.1' androidTestImplementation 'androidx.test:rules:1.1.1'
......
app/src/androidTest/java/com/paktalin/vocabularynotebook/ExampleInstrumentedTest.java
package com.paktalin.vocabularynotebook; package com.paktalin.vocabularynotebook;
import android.content.Context; import android.content.Context;
import android.support.test.InstrumentationRegistry; import androidx.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
......
app/src/main/java/com/paktalin/vocabularynotebook/OnQueryTextListener.kt
package com.paktalin.vocabularynotebook package com.paktalin.vocabularynotebook
import android.support.v7.widget.SearchView import androidx.appcompat.widget.SearchView
import com.paktalin.vocabularynotebook.ui.VocabularyAdapter import com.paktalin.vocabularynotebook.ui.VocabularyAdapter
class OnQueryTextListener(var adapter: VocabularyAdapter) : SearchView.OnQueryTextListener { class OnQueryTextListener(var adapter: VocabularyAdapter) : SearchView.OnQueryTextListener {
......
app/src/main/java/com/paktalin/vocabularynotebook/appsetup/ConfiguredFirestore.kt
...@@ -8,9 +8,7 @@ object ConfiguredFirestore { ...@@ -8,9 +8,7 @@ object ConfiguredFirestore {
val instance: FirebaseFirestore val instance: FirebaseFirestore
get() { get() {
val firestore = FirebaseFirestore.getInstance() val firestore = FirebaseFirestore.getInstance()
val settings = FirebaseFirestoreSettings.Builder() val settings = FirebaseFirestoreSettings.Builder().build()
.setTimestampsInSnapshotsEnabled(true)
.build()
firestore.firestoreSettings = settings firestore.firestoreSettings = settings
return firestore return firestore
} }
......
app/src/main/java/com/paktalin/vocabularynotebook/appsetup/VocabularyApplication.java
package com.paktalin.vocabularynotebook.appsetup; package com.paktalin.vocabularynotebook.appsetup;
import android.support.multidex.MultiDexApplication; import androidx.multidex.MultiDexApplication;
import com.firebase.client.Firebase; import com.firebase.client.Firebase;
......
app/src/main/java/com/paktalin/vocabularynotebook/ui/ViewHolder.kt
package com.paktalin.vocabularynotebook.ui package com.paktalin.vocabularynotebook.ui
import android.support.v7.widget.RecyclerView import android.graphics.Color
import androidx.recyclerview.widget.RecyclerView
import android.view.View import android.view.View
import android.widget.LinearLayout import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
import com.paktalin.vocabularynotebook.firestoreitems.WordPojo import com.paktalin.vocabularynotebook.firestoreitems.WordPojo
import com.paktalin.vocabularynotebook.ui.activities.MainActivity
import com.paktalin.vocabularynotebook.utils.Log
import kotlinx.android.synthetic.main.word_item.view.* import kotlinx.android.synthetic.main.word_item.view.*
class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
override fun onClick(p0: View?) {
Log.d(TAG, "click")
p0?.setBackgroundColor(Color.GREEN)
}
private val tvWord: TextView = itemView.word private val tvWord: TextView = itemView.word
private val tvTranslation: TextView = itemView.translation private val tvTranslation: TextView = itemView.translation
val layout: LinearLayout = itemView.layout val layout: LinearLayout = itemView.layout
fun init(wordPojo: WordPojo, position: Int, showPopupMenu: (View, Int) -> Unit) { fun bind(wordPojo: WordPojo, position: Int, showPopupMenu: (View, Int) -> Unit) {
tvWord.text = wordPojo.word tvWord.text = wordPojo.word
tvTranslation.text = wordPojo.translation tvTranslation.text = wordPojo.translation
itemView.setOnClickListener { showPopupMenu(itemView, position) } itemView.setOnClickListener { showPopupMenu(itemView, position) }
} }
companion object {
private val TAG = "VN/" + ViewHolder::class.simpleName
}
} }
app/src/main/java/com/paktalin/vocabularynotebook/ui/VocabularyAdapter.kt
package com.paktalin.vocabularynotebook.ui package com.paktalin.vocabularynotebook.ui
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.graphics.Color
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.support.v7.widget.PopupMenu import androidx.appcompat.widget.PopupMenu
import android.support.v7.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import android.view.* import android.view.*
import com.paktalin.vocabularynotebook.OnQueryTextListener import com.paktalin.vocabularynotebook.OnQueryTextListener
import com.paktalin.vocabularynotebook.R import com.paktalin.vocabularynotebook.R
...@@ -47,7 +46,7 @@ class VocabularyAdapter(private val vocabulary: VocabSet, private val mainActivi ...@@ -47,7 +46,7 @@ class VocabularyAdapter(private val vocabulary: VocabSet, private val mainActivi
override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) { override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
val wordItem = vocabulary.displayedAt(position) val wordItem = vocabulary.displayedAt(position)
viewHolder.init(wordItem, position) { view, p -> showPopupMenu(view, p)} viewHolder.bind(wordItem, position) { view, p -> showPopupMenu(view, p)}
this.viewHolder = viewHolder this.viewHolder = viewHolder
//todo set click listener to menu //todo set click listener to menu
} }
......
app/src/main/java/com/paktalin/vocabularynotebook/ui/activities/LogInActivity.kt
package com.paktalin.vocabularynotebook.ui.activities package com.paktalin.vocabularynotebook.ui.activities
import android.support.v7.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle import android.os.Bundle
import com.paktalin.vocabularynotebook.* import com.paktalin.vocabularynotebook.*
......
app/src/main/java/com/paktalin/vocabularynotebook/ui/activities/MainActivity.kt
...@@ -2,8 +2,8 @@ package com.paktalin.vocabularynotebook.ui.activities ...@@ -2,8 +2,8 @@ package com.paktalin.vocabularynotebook.ui.activities
import android.app.Activity import android.app.Activity
import android.os.Bundle import android.os.Bundle
import android.support.v7.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import android.support.v7.widget.SearchView import androidx.appcompat.widget.SearchView
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import android.view.View import android.view.View
...@@ -128,4 +128,6 @@ class MainActivity : AppCompatActivity() { ...@@ -128,4 +128,6 @@ class MainActivity : AppCompatActivity() {
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/fragments/ProgressFragment.kt
package com.paktalin.vocabularynotebook.ui.fragments package com.paktalin.vocabularynotebook.ui.fragments
import android.os.Bundle import android.os.Bundle
import android.support.v4.app.Fragment import androidx.fragment.app.Fragment
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
......
app/src/main/java/com/paktalin/vocabularynotebook/ui/fragments/WordFragment.kt
package com.paktalin.vocabularynotebook.ui.fragments package com.paktalin.vocabularynotebook.ui.fragments
import android.os.Bundle import android.os.Bundle
import android.support.v4.app.Fragment import androidx.fragment.app.Fragment
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
......
app/src/main/java/com/paktalin/vocabularynotebook/ui/views/LockableLayoutManager.kt
package com.paktalin.vocabularynotebook.ui.views package com.paktalin.vocabularynotebook.ui.views
import android.content.Context import android.content.Context
import android.support.v7.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
class LockableLayoutManager(context: Context) : LinearLayoutManager(context) { class LockableLayoutManager(context: Context) : LinearLayoutManager(context) {
private var isScrollEnabled = true private var isScrollEnabled = true
......
app/src/main/java/com/paktalin/vocabularynotebook/utils/ActivityUtil.kt
...@@ -3,8 +3,8 @@ package com.paktalin.vocabularynotebook.utils ...@@ -3,8 +3,8 @@ package com.paktalin.vocabularynotebook.utils
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.support.v4.app.Fragment import androidx.fragment.app.Fragment
import android.support.v4.app.FragmentManager import androidx.fragment.app.FragmentManager
import android.view.View import android.view.View
import android.widget.Toast import android.widget.Toast
import com.paktalin.vocabularynotebook.R import com.paktalin.vocabularynotebook.R
......
app/src/main/res/layout/activity_log_in.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/container_login" android:id="@+id/container_login"
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"
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
tools:context=".ui.activities.LogInActivity" tools:context=".ui.activities.LogInActivity"
android:background="@drawable/wood"> android:background="@drawable/wood">
<android.support.constraint.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/usernamePasswordLayout" android:id="@+id/usernamePasswordLayout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
app:layout_constraintTop_toBottomOf="@+id/etPassword" app:layout_constraintTop_toBottomOf="@+id/etPassword"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
</android.support.constraint.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<Button <Button
android:id="@+id/btnLogIn" android:id="@+id/btnLogIn"
...@@ -121,4 +121,4 @@ ...@@ -121,4 +121,4 @@
app:layout_constraintStart_toEndOf="@+id/btnLogIn" app:layout_constraintStart_toEndOf="@+id/btnLogIn"
app:layout_constraintTop_toTopOf="@+id/btnLogIn" /> app:layout_constraintTop_toTopOf="@+id/btnLogIn" />
</android.support.constraint.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file \ No newline at end of file
app/src/main/res/layout/activity_main.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.drawerlayout.widget.DrawerLayout 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" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/drawerLayout" android:id="@+id/drawerLayout"
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<include layout="@layout/content_main" /> <include layout="@layout/content_main" />
</FrameLayout> </FrameLayout>
<android.support.design.widget.NavigationView <com.google.android.material.navigation.NavigationView
android:id="@+id/navigationView" android:id="@+id/navigationView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
...@@ -26,4 +26,4 @@ ...@@ -26,4 +26,4 @@
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
app:menu="@menu/activity_main_drawer" /> app:menu="@menu/activity_main_drawer" />
</android.support.v4.widget.DrawerLayout> </androidx.drawerlayout.widget.DrawerLayout>
app/src/main/res/layout/content_main.xml
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
android:layout_marginStart="@dimen/small_margin" android:layout_marginStart="@dimen/small_margin"
android:layout_marginTop="@dimen/small_margin"/> android:layout_marginTop="@dimen/small_margin"/>
<android.support.v4.widget.SwipeRefreshLayout <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipeRefresh" android:id="@+id/swipeRefresh"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -35,12 +35,12 @@ ...@@ -35,12 +35,12 @@
android:layout_marginStart="@dimen/small_margin" android:layout_marginStart="@dimen/small_margin"
app:layout_behavior="@string/appbar_scrolling_view_behavior"> app:layout_behavior="@string/appbar_scrolling_view_behavior">
<android.support.v7.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView" android:id="@+id/recyclerView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
</android.support.v4.widget.SwipeRefreshLayout> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
......
app/src/main/res/layout/fragment_editable_word.xml
<?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" <androidx.constraintlayout.widget.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" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/editable_word_layout" android:id="@+id/editable_word_layout"
...@@ -25,14 +25,15 @@ ...@@ -25,14 +25,15 @@
android:id="@+id/editable_word" android:id="@+id/editable_word"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="16dp"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingRight="16dp" android:paddingLeft="16dp"
android:paddingEnd="16dp"
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingEnd="16dp"
android:paddingRight="16dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:background="@android:color/transparent"> app:layout_constraintTop_toTopOf="parent">
<EditText <EditText
android:id="@+id/word" android:id="@+id/word"
...@@ -42,11 +43,11 @@ ...@@ -42,11 +43,11 @@
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:hint="@string/hint_word" android:hint="@string/hint_word"
android:inputType="textMultiLine" android:inputType="textMultiLine"
android:textSize="@dimen/text_size"
app:fontFamily="@font/neucha"
android:textColor="@color/text_color"
android:paddingEnd="@dimen/word_margin" android:paddingEnd="@dimen/word_margin"
android:paddingRight="@dimen/word_margin" android:paddingRight="@dimen/word_margin"
android:textColor="@color/text_color"
android:textSize="@dimen/text_size"
app:fontFamily="@font/neucha"
tools:ignore="LabelFor,RtlSymmetry" /> tools:ignore="LabelFor,RtlSymmetry" />
<EditText <EditText
...@@ -57,11 +58,11 @@ ...@@ -57,11 +58,11 @@
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:hint="@string/hint_translation" android:hint="@string/hint_translation"
android:inputType="textMultiLine" android:inputType="textMultiLine"
android:textSize="@dimen/text_size"
app:fontFamily="@font/neucha"
android:textColor="@color/text_color"
android:paddingEnd="16dp" android:paddingEnd="16dp"
android:paddingRight="16dp" android:paddingRight="16dp"
android:textColor="@color/text_color"
android:textSize="@dimen/text_size"
app:fontFamily="@font/neucha"
tools:ignore="LabelFor,RtlSymmetry" /> tools:ignore="LabelFor,RtlSymmetry" />
</LinearLayout> </LinearLayout>
...@@ -82,4 +83,4 @@ ...@@ -82,4 +83,4 @@
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
</android.support.constraint.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file \ No newline at end of file
app/src/main/res/layout/nav_header_main.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="100dp"
android:background="@color/colorAccent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/colorPrimaryDark"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="This is" />
</android.support.constraint.ConstraintLayout>
app/src/main/res/layout/word_item.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" 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" xmlns:tools="http://schemas.android.com/tools"
...@@ -27,23 +27,24 @@ ...@@ -27,23 +27,24 @@
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:paddingLeft="16dp"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingRight="16dp" android:paddingLeft="16dp"
android:paddingEnd="16dp"
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingBottom="8dp"> android:paddingEnd="16dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
app:layout_constraintTop_toTopOf="parent">
<TextView <TextView
android:id="@+id/word" android:id="@+id/word"
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:textSize="@dimen/text_size"
app:fontFamily="@font/neucha"
android:textColor="@color/text_color"
android:paddingEnd="@dimen/word_margin" android:paddingEnd="@dimen/word_margin"
android:paddingRight="@dimen/word_margin" android:paddingRight="@dimen/word_margin"
android:textColor="@color/text_color"
android:textSize="@dimen/text_size"
app:fontFamily="@font/neucha"
tools:ignore="LabelFor,RtlSymmetry" /> tools:ignore="LabelFor,RtlSymmetry" />
<TextView <TextView
...@@ -51,10 +52,10 @@ ...@@ -51,10 +52,10 @@
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:textColor="@color/text_color"
android:textSize="@dimen/text_size" android:textSize="@dimen/text_size"
app:fontFamily="@font/neucha" app:fontFamily="@font/neucha"
android:textColor="@color/text_color"
tools:ignore="LabelFor" /> tools:ignore="LabelFor" />
</LinearLayout> </LinearLayout>
</android.support.constraint.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file \ No newline at end of file
app/src/main/res/menu/options_menu.xml
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
android:id="@+id/search" android:id="@+id/search"
android:icon="@drawable/ic_search_brown" android:icon="@drawable/ic_search_brown"
android:title="@string/search" android:title="@string/search"
app:actionViewClass="android.support.v7.widget.SearchView" app:actionViewClass="androidx.appcompat.widget.SearchView"
app:showAsAction="ifRoom|collapseActionView" /> app:showAsAction="ifRoom|collapseActionView" />
<item <item
......
app/src/main/res/values-ru/strings.xml
...@@ -17,10 +17,9 @@ ...@@ -17,10 +17,9 @@
<string name="toast_empty_vocabulary">Ваш словарь пока пуст. Добавьте первое слово!</string> <string name="toast_empty_vocabulary">Ваш словарь пока пуст. Добавьте первое слово!</string>
<string name="toast_auth_failed">Ошибка авторизации</string> <string name="toast_auth_failed">Ошибка авторизации</string>
<string name="toast_new_word_fail">Ошибка при добавлении слова</string>
<string name="toast_update_word_failed">Ошибка при изменении слова</string>
<string name="toast_successful_sign_up">Поздравляем! Теперь вы можете использовать словарь с любого устройства</string> <string name="toast_successful_sign_up">Поздравляем! Теперь вы можете использовать словарь с любого устройства</string>
<string name="toast_enter_username_password">Пожалуйста, введите логин и пароль</string> <string name="toast_enter_username_password">Пожалуйста, введите логин и пароль</string>
<string name="toast_invalid_username">Пожалуйста, придумайте логин, используя символы a–z, цифры 0–9 и символы -_.</string> <string name="toast_invalid_username">Пожалуйста, придумайте логин, используя символы a–z, цифры 0–9 и символы -_.</string>
<string name="toast_incorrect_username_password">Неверный логин или пароль</string> <string name="add_tag">Добавить тег</string>
<string name="toast_select_words_to_tag">Выберите слова для тега</string>
</resources> </resources>
\ No newline at end of file
app/src/main/res/values/colors.xml
...@@ -7,6 +7,5 @@ ...@@ -7,6 +7,5 @@
<color name="sheet_color">#FAFAFA</color> <color name="sheet_color">#FAFAFA</color>
<color name="text_color">#000F55</color> <color name="text_color">#000F55</color>
<color name="dark_brown">#4A2A14</color>
<color name="shadedPrimary">#BBAD401C</color> <color name="shadedPrimary">#BBAD401C</color>
</resources> </resources>
app/src/main/res/values/dimens.xml
<resources> <resources>
<!-- Default screen margins, per the Android Design guidelines. --> <!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="corner_radius">5dp</dimen>
<dimen name="zero_corner_radius">0dp</dimen>
<dimen name="small_margin">8dp</dimen> <dimen name="small_margin">8dp</dimen>
<dimen name="small_padding">8dp</dimen> <dimen name="small_padding">8dp</dimen>
<dimen name="button_text_size">24sp</dimen> <dimen name="button_text_size">24sp</dimen>
......
app/src/main/res/values/strings.xml
...@@ -18,11 +18,8 @@ ...@@ -18,11 +18,8 @@
<!--Toast messages--> <!--Toast messages-->
<string name="toast_empty_vocabulary">Your vocabulary is empty. Add your fist word!</string> <string name="toast_empty_vocabulary">Your vocabulary is empty. Add your fist word!</string>
<string name="toast_auth_failed">Authentication failed</string> <string name="toast_auth_failed">Authentication failed</string>
<string name="toast_new_word_fail">Couldn\'t add the word</string>
<string name="toast_update_word_failed">Couldn\'t update the word</string>
<string name="toast_successful_sign_up">Congratulations! You can now access your vocabulary from any device</string> <string name="toast_successful_sign_up">Congratulations! You can now access your vocabulary from any device</string>
<string name="toast_enter_username_password">Please, enter username and password</string> <string name="toast_enter_username_password">Please, enter username and password</string>
<string name="toast_invalid_username">Please, create a username using letters a–z, numbers 0–9 and characters -_.</string> <string name="toast_invalid_username">Please, create a username using letters a–z, numbers 0–9 and characters -_.</string>
<string name="toast_incorrect_username_password">Username or password is incorrect</string>
<string name="toast_select_words_to_tag">Select words to tag</string> <string name="toast_select_words_to_tag">Select words to tag</string>
</resources> </resources>
build.gradle
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlin_version = '1.3.10' ext.kotlin_version = '1.3.21'
repositories { repositories {
google() google()
...@@ -12,10 +12,10 @@ buildscript { ...@@ -12,10 +12,10 @@ buildscript {
} }
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.2.1' classpath 'com.android.tools.build:gradle:3.4.0'
classpath 'com.google.gms:google-services:4.1.0' classpath 'com.google.gms:google-services:4.2.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'io.fabric.tools:gradle:1.26.1' classpath 'io.fabric.tools:gradle:1.28.0'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
......
gradle.properties
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
# Specifies the JVM arguments used for the daemon process. # Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings. # The setting is particularly useful for tweaking memory settings.
android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode. # When configured, Gradle will run in incubating parallel mode.
......
gradle/wrapper/gradle-wrapper.properties
#Mon Nov 19 18:59:13 CET 2018 #Sat Apr 20 18:48:34 EEST 2019
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
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