diff --git a/README.md b/README.md new file mode 100644 index 0000000..4a8a9e1 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# Проект команды дроидо коты +Открыть в студии и собрать как норм проект/n +В файле ```Constants.kt``` есть параметр ```SERVER_ADDRESS``` который отвечает за адрес сервера diff --git a/app/src/main/java/ru/myitschool/work/data/dto/LoginDto.kt b/app/src/main/java/ru/myitschool/work/data/dto/LoginDto.kt new file mode 100644 index 0000000..0168aa0 --- /dev/null +++ b/app/src/main/java/ru/myitschool/work/data/dto/LoginDto.kt @@ -0,0 +1,10 @@ +package ru.myitschool.work.data.dto + +import com.google.gson.annotations.SerializedName + +class LoginDto( + @SerializedName("username") + val username: String?, + @SerializedName("password") + val password: String? +) \ No newline at end of file diff --git a/app/src/main/java/ru/myitschool/work/data/source/AuthorizationApi.kt b/app/src/main/java/ru/myitschool/work/data/source/AuthorizationApi.kt index 38ce0e9..182edff 100644 --- a/app/src/main/java/ru/myitschool/work/data/source/AuthorizationApi.kt +++ b/app/src/main/java/ru/myitschool/work/data/source/AuthorizationApi.kt @@ -1,7 +1,9 @@ package ru.myitschool.work.data.source import retrofit2.Response +import retrofit2.http.Body import retrofit2.http.GET +import retrofit2.http.POST import retrofit2.http.Path interface AuthorizationApi { @@ -9,4 +11,9 @@ interface AuthorizationApi { suspend fun checkLogin( @Path("username") username: String ) : Response + + @GET("api/login") + suspend fun login( + @Body content: AccountApi + ): Response } \ No newline at end of file diff --git a/app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListFragment.kt b/app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListFragment.kt index 356f95e..b6285d9 100644 --- a/app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListFragment.kt +++ b/app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListFragment.kt @@ -40,7 +40,7 @@ class EntryListFragment : Fragment(R.layout.fragment_entry_list) { viewModel.action.collectWhenStarted(this) { action -> when (action) { is EntryListViewModel.Action.OpenProfile -> { - findNavController().navigate(LoginDestination) { + findNavController().navigate(ProfileDestination) { popUpTo { inclusive = true } } } diff --git a/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.kt b/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.kt index aea92d6..d9e937b 100644 --- a/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.kt +++ b/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.kt @@ -64,6 +64,11 @@ class LoginFragment : Fragment(R.layout.fragment_login) { viewModel.inputLogin(s.toString()) } }) + binding.password.addTextChangedListener(object : TextChangedListener() { + override fun afterTextChanged(s: Editable?) { + viewModel.inputLogin(s.toString()) + } + }) } override fun onDestroyView() { diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml index f6e3adf..3023fcb 100644 --- a/app/src/main/res/layout/fragment_profile.xml +++ b/app/src/main/res/layout/fragment_profile.xml @@ -1,151 +1,156 @@ - - - + + + + + - + - - - - app:layout_constraintBottom_toTopOf="@+id/scan" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - tools:src="@tools:sample/avatars" /> - - + - + + app:layout_constraintBottom_toTopOf="@+id/scan" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:src="@tools:sample/avatars" /> + - + + + + + - + - + - + - + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index cc9f550..81c0ab2 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -3,7 +3,7 @@