personal
This commit is contained in:
parent
c293c906d4
commit
059b17af9a
4 changed files with 30 additions and 0 deletions
|
@ -25,6 +25,7 @@ android {
|
||||||
testInstrumentationRunner = "com.nomadics9.ananas.HiltTestRunner"
|
testInstrumentationRunner = "com.nomadics9.ananas.HiltTestRunner"
|
||||||
buildConfigField( "String", "DEFAULT_SERVER_ADDRESS", "\" \"")
|
buildConfigField( "String", "DEFAULT_SERVER_ADDRESS", "\" \"")
|
||||||
buildConfigField( "String", "REQUEST_SERVER_ADDRESS", "\" \"")
|
buildConfigField( "String", "REQUEST_SERVER_ADDRESS", "\" \"")
|
||||||
|
buildConfigField("String", "FORGET_PASSWORD_ADDRESS", "\" \"")
|
||||||
}
|
}
|
||||||
|
|
||||||
applicationVariants.all {
|
applicationVariants.all {
|
||||||
|
@ -68,6 +69,7 @@ android {
|
||||||
isDefault = false
|
isDefault = false
|
||||||
buildConfigField( "String", "DEFAULT_SERVER_ADDRESS", "\"https://askar.tv\"")
|
buildConfigField( "String", "DEFAULT_SERVER_ADDRESS", "\"https://askar.tv\"")
|
||||||
buildConfigField( "String", "REQUEST_SERVER_ADDRESS", "\"https://r.askar.tv\"")
|
buildConfigField( "String", "REQUEST_SERVER_ADDRESS", "\"https://r.askar.tv\"")
|
||||||
|
buildConfigField("String", "FORGET_PASSWORD_ADDRESS", "\"https://user.askar.tv/my/account\"")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
package com.nomadics9.ananas.fragments
|
package com.nomadics9.ananas.fragments
|
||||||
|
|
||||||
|
import android.content.Intent
|
||||||
|
import android.net.Uri
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.text.Html.fromHtml
|
import android.text.Html.fromHtml
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
|
@ -17,6 +19,7 @@ import androidx.navigation.fragment.findNavController
|
||||||
import androidx.navigation.fragment.navArgs
|
import androidx.navigation.fragment.navArgs
|
||||||
import dagger.hilt.android.AndroidEntryPoint
|
import dagger.hilt.android.AndroidEntryPoint
|
||||||
import com.nomadics9.ananas.AppPreferences
|
import com.nomadics9.ananas.AppPreferences
|
||||||
|
import com.nomadics9.ananas.BuildConfig
|
||||||
import com.nomadics9.ananas.adapters.UserLoginListAdapter
|
import com.nomadics9.ananas.adapters.UserLoginListAdapter
|
||||||
import com.nomadics9.ananas.database.ServerDatabaseDao
|
import com.nomadics9.ananas.database.ServerDatabaseDao
|
||||||
import com.nomadics9.ananas.databinding.FragmentLoginBinding
|
import com.nomadics9.ananas.databinding.FragmentLoginBinding
|
||||||
|
@ -78,6 +81,17 @@ class LoginFragment : Fragment() {
|
||||||
(binding.editTextPassword as AppCompatEditText).requestFocus()
|
(binding.editTextPassword as AppCompatEditText).requestFocus()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if (BuildConfig.FLAVOR == "Ananas") {
|
||||||
|
binding.buttonForgetPassword.setOnClickListener {
|
||||||
|
val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(BuildConfig.FORGET_PASSWORD_ADDRESS))
|
||||||
|
startActivity(browserIntent)
|
||||||
|
}
|
||||||
|
binding.buttonForgetPassword.isVisible = true
|
||||||
|
} else {
|
||||||
|
binding.buttonForgetPassword.isVisible = false
|
||||||
|
}
|
||||||
|
|
||||||
viewLifecycleOwner.lifecycleScope.launch {
|
viewLifecycleOwner.lifecycleScope.launch {
|
||||||
viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
|
viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
|
||||||
viewModel.uiState.collect { uiState ->
|
viewModel.uiState.collect { uiState ->
|
||||||
|
|
|
@ -141,6 +141,19 @@
|
||||||
android:visibility="invisible" />
|
android:visibility="invisible" />
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginHorizontal="24dp">
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/button_forget_password"
|
||||||
|
style="@style/Widget.Material3.Button.OutlinedButton"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/forget_password" />
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/login_disclaimer"
|
android:id="@+id/login_disclaimer"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
<string name="add_server_error_not_found">Server not found</string>
|
<string name="add_server_error_not_found">Server not found</string>
|
||||||
<string name="add_server_error_no_id">Server has no id, something seems to be wrong with the server</string>
|
<string name="add_server_error_no_id">Server has no id, something seems to be wrong with the server</string>
|
||||||
<string name="login">Login</string>
|
<string name="login">Login</string>
|
||||||
|
<string name="forget_password">Forget Password?</string>
|
||||||
<string name="login_error_wrong_username_password">Wrong username or password</string>
|
<string name="login_error_wrong_username_password">Wrong username or password</string>
|
||||||
<string name="select_server">Select server</string>
|
<string name="select_server">Select server</string>
|
||||||
<string name="edit_text_server_address_hint">Server address</string>
|
<string name="edit_text_server_address_hint">Server address</string>
|
||||||
|
|
Loading…
Reference in a new issue