Commit d0ab0e95 by Paktalin

Changed the drawerLayout width

parent f984f623
...@@ -10,8 +10,8 @@ android { ...@@ -10,8 +10,8 @@ android {
applicationId "com.paktalin.vocabularynotebook" applicationId "com.paktalin.vocabularynotebook"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 28 targetSdkVersion 28
versionCode 3 versionCode 4
versionName "1.2" versionName "1.3"
multiDexEnabled true multiDexEnabled true
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
vectorDrawables { vectorDrawables {
......
...@@ -18,12 +18,14 @@ class LogInActivity : AppCompatActivity() { ...@@ -18,12 +18,14 @@ class LogInActivity : AppCompatActivity() {
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
if (mUserLoggedIn()) { startUserActivity() } if (mUserLoggedIn()) {
startUserActivity()
}
} }
fun login() { fun login() {
val (username, password) = getUsernameAndPassword() val (username, password) = getUsernameAndPassword()
if (fieldsNotEmpty(username, password, this)) if (fieldsNotEmpty(username, password, this)) {
addProgressBar() addProgressBar()
mLogIn( mLogIn(
{ removeProgressBar(supportFragmentManager) }, { removeProgressBar(supportFragmentManager) },
...@@ -31,6 +33,7 @@ class LogInActivity : AppCompatActivity() { ...@@ -31,6 +33,7 @@ class LogInActivity : AppCompatActivity() {
{ shortToast(this@LogInActivity, getString(R.string.toast_auth_failed)) }, { shortToast(this@LogInActivity, getString(R.string.toast_auth_failed)) },
username, password) username, password)
} }
}
private fun signUp() { private fun signUp() {
val (username, password) = getUsernameAndPassword() val (username, password) = getUsernameAndPassword()
...@@ -51,5 +54,7 @@ class LogInActivity : AppCompatActivity() { ...@@ -51,5 +54,7 @@ class LogInActivity : AppCompatActivity() {
private fun getUsernameAndPassword() = Pair(etUsername!!.text.toString(), etPassword!!.text.toString()) private fun getUsernameAndPassword() = Pair(etUsername!!.text.toString(), etPassword!!.text.toString())
companion object { private val TAG = "VN/" + LogInActivity::class.simpleName } companion object {
private val TAG = "VN/" + LogInActivity::class.simpleName
}
} }
\ No newline at end of file
...@@ -18,7 +18,7 @@ import com.paktalin.vocabularynotebook.Vocabulary.Companion.SORT_BY_TRANSLATION ...@@ -18,7 +18,7 @@ import com.paktalin.vocabularynotebook.Vocabulary.Companion.SORT_BY_TRANSLATION
import com.paktalin.vocabularynotebook.Vocabulary.Companion.SORT_BY_WORD import com.paktalin.vocabularynotebook.Vocabulary.Companion.SORT_BY_WORD
import com.paktalin.vocabularynotebook.ui.fragments.VocabularyFragment import com.paktalin.vocabularynotebook.ui.fragments.VocabularyFragment
import com.paktalin.vocabularynotebook.utils.* import com.paktalin.vocabularynotebook.utils.*
import kotlinx.android.synthetic.main.content_main.* import kotlinx.android.synthetic.main.content_main.swipeRefresh
class MainActivity : AppCompatActivity() { class MainActivity : AppCompatActivity() {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
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"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:openDrawer="start" tools:openDrawer="start"
android:background="@drawable/wood" android:background="@drawable/wood"
......
...@@ -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 xmlns:android="http://schemas.android.com/apk/res/android" <android.support.v4.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"
......
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