erik/isolaatti-android
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
erik-everardo 2024-01-14 15:51:58 -06:00
parent 8f0ec29fbe
commit 24e8ff10bb
11 changed files with 396 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/isolaatti/settings/data/remote/AccountSettingsApi.kt Normal file
View File

@ -0,0 +1,4 @@
package com.isolaatti.settings.data.remote
interface AccountSettingsApi {
}

6
app/src/main/java/com/isolaatti/settings/data/repository/AccountSettingsRepositoryImpl.kt Normal file
View File

@ -0,0 +1,6 @@
package com.isolaatti.settings.data.repository
import com.isolaatti.settings.domain.AccountSettingsRepository
class AccountSettingsRepositoryImpl : AccountSettingsRepository {
}

5
app/src/main/java/com/isolaatti/settings/domain/AccountSettingsRepository.kt Normal file
View File

@ -0,0 +1,5 @@
package com.isolaatti.settings.domain
interface AccountSettingsRepository {
}

6
app/src/main/java/com/isolaatti/settings/presentation/ChangePasswordViewModel.kt Normal file
View File

@ -0,0 +1,6 @@
package com.isolaatti.settings.presentation
import androidx.lifecycle.ViewModel
class ChangePasswordViewModel : ViewModel() {
}

34
app/src/main/java/com/isolaatti/settings/ui/AccountSettingsFragment.kt
View File

@ -5,6 +5,9 @@ import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.navigation.fragment.findNavController
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.isolaatti.R
import com.isolaatti.databinding.FragmentAccountSettingsBinding import com.isolaatti.databinding.FragmentAccountSettingsBinding
class AccountSettingsFragment : Fragment() { class AccountSettingsFragment : Fragment() {
@ -19,4 +22,35 @@ class AccountSettingsFragment : Fragment() {
return binding.root return binding.root
} }
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
binding.toolbar.setNavigationOnClickListener {
findNavController().popBackStack()
}
binding.changePasswordButton.setOnClickListener {
findNavController().navigate(AccountSettingsFragmentDirections.actionAccountSettingsFragmentToChangePasswordFragment())
}
binding.currentSessionButton.setOnClickListener {
findNavController().navigate(AccountSettingsFragmentDirections.actionAccountSettingsFragmentToSessionsFragment())
}
binding.logOutButton.setOnClickListener {
logout()
}
}
private fun logout() {
MaterialAlertDialogBuilder(requireContext())
.setTitle("Log out?")
.setMessage("You will be taken to log in screen...")
.setPositiveButton("Yes, log out") { _, _ ->
}
.setNegativeButton(R.string.no, null)
.show()
}
} }

46
app/src/main/java/com/isolaatti/settings/ui/ChangePasswordFragment.kt
View File

@ -4,18 +4,62 @@ import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.core.widget.doOnTextChanged
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import androidx.navigation.fragment.findNavController
import com.isolaatti.databinding.FragmentSettingsChangePasswordBinding import com.isolaatti.databinding.FragmentSettingsChangePasswordBinding
import com.isolaatti.settings.presentation.ChangePasswordViewModel
class ChangePasswordFragment : Fragment() { class ChangePasswordFragment : Fragment() {
lateinit var viewBinding: FragmentSettingsChangePasswordBinding lateinit var viewBinding: FragmentSettingsChangePasswordBinding
private val viewModel: ChangePasswordViewModel by viewModels()
override fun onCreateView( override fun onCreateView(
inflater: LayoutInflater, inflater: LayoutInflater,
container: ViewGroup?, container: ViewGroup?,
savedInstanceState: Bundle? savedInstanceState: Bundle?
): View? { ): View {
viewBinding = FragmentSettingsChangePasswordBinding.inflate(inflater) viewBinding = FragmentSettingsChangePasswordBinding.inflate(inflater)
return viewBinding.root return viewBinding.root
} }
private fun flip() {
viewBinding.switcher.showPrevious()
}
private val clickListener = View.OnClickListener {
flip()
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
setupListeners()
viewBinding.continueCurrentPassword.isEnabled = !viewBinding.currentPasswordTextInput.editText?.text.isNullOrBlank()
}
private fun setupListeners() {
viewBinding.toolbar.setNavigationOnClickListener {
findNavController().popBackStack()
}
viewBinding.continueCurrentPassword.setOnClickListener(clickListener)
viewBinding.prevNewPasswordButton.setOnClickListener(clickListener)
viewBinding.currentPasswordTextInput.editText?.doOnTextChanged { text, start, before, count ->
viewBinding.continueCurrentPassword.isEnabled = !text.isNullOrBlank()
}
viewBinding.newPasswordInputText.editText?.doOnTextChanged { text, start, before, count ->
}
viewBinding.newPasswordInputTextConfirm.editText?.doOnTextChanged { text, start, before, count ->
}
}
} }

5
app/src/main/res/drawable/baseline_logout_24.xml Normal file
View File

@ -0,0 +1,5 @@
<vector android:autoMirrored="true" android:height="24dp"
android:tint="#000000" android:viewportHeight="24"
android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M17,7l-1.41,1.41L18.17,11H8v2h10.17l-2.58,2.58L17,17l5,-5zM4,5h8V3H4c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h8v-2H4V5z"/>
</vector>

5
app/src/main/res/drawable/baseline_password_24.xml Normal file
View File

@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#000000"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M2,17h20v2H2V17zM3.15,12.95L4,11.47l0.85,1.48l1.3,-0.75L5.3,10.72H7v-1.5H5.3l0.85,-1.47L4.85,7L4,8.47L3.15,7l-1.3,0.75L2.7,9.22H1v1.5h1.7L1.85,12.2L3.15,12.95zM9.85,12.2l1.3,0.75L12,11.47l0.85,1.48l1.3,-0.75l-0.85,-1.48H15v-1.5h-1.7l0.85,-1.47L12.85,7L12,8.47L11.15,7l-1.3,0.75l0.85,1.47H9v1.5h1.7L9.85,12.2zM23,9.22h-1.7l0.85,-1.47L20.85,7L20,8.47L19.15,7l-1.3,0.75l0.85,1.47H17v1.5h1.7l-0.85,1.48l1.3,0.75L20,11.47l0.85,1.48l1.3,-0.75l-0.85,-1.48H23V9.22z"/>
</vector>

126
app/src/main/res/layout/fragment_account_settings.xml
View File

@ -1,6 +1,130 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:navigationIcon="@drawable/baseline_arrow_back_24"
app:title="Account settings"
app:layout_constraintTop_toTopOf="parent"/>
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintTop_toBottomOf="@id/toolbar"
app:layout_constraintBottom_toBottomOf="parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<!-- Sessions -->
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="24dp"
style="@style/Widget.Material3.CardView.Filled">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="8dp">
<TextView
android:id="@+id/sessions_settings_card_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="24dp"
android:text="@string/sessions"
android:textSize="18sp"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/sessions_settings_card_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:text="@string/session_description"
app:layout_constraintTop_toBottomOf="@id/sessions_settings_card_title" />
<com.google.android.material.button.MaterialButton
android:id="@+id/current_session_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/current_sessions"
app:icon="@drawable/baseline_arrow_right_alt_24"
style="?attr/materialIconButtonFilledTonalStyle"
app:layout_constraintEnd_toStartOf="@+id/log_out_button"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/sessions_settings_card_message" />
<com.google.android.material.button.MaterialButton
android:id="@+id/log_out_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/log_out"
app:icon="@drawable/baseline_logout_24"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/current_session_button"
app:layout_constraintTop_toBottomOf="@id/sessions_settings_card_message" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
<!-- Password -->
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="24dp"
style="@style/Widget.Material3.CardView.Filled">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="8dp">
<TextView
android:id="@+id/password_settings_card_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="24dp"
android:text="@string/password"
android:textSize="18sp"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/password_settings_card_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:text="@string/password_description"
app:layout_constraintTop_toBottomOf="@id/password_settings_card_title" />
<com.google.android.material.button.MaterialButton
android:id="@+id/change_password_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/change_password"
app:icon="@drawable/baseline_password_24"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/password_settings_card_message" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
</LinearLayout>
</ScrollView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

155
app/src/main/res/layout/fragment_settings_change_password.xml
View File

@ -1,16 +1,163 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.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"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:navigationIcon="@drawable/baseline_arrow_back_24"
app:title="@string/change_password"/>
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintTop_toBottomOf="@id/toolbar"
app:layout_constraintBottom_toBottomOf="parent">
<ViewSwitcher
android:id="@+id/switcher"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:autoStart="false">
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView <TextView
android:id="@+id/textView4"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Change password" android:text="Your current password"
app:layout_constraintBottom_toBottomOf="parent" android:layout_margin="24dp"
app:layout_constraintEnd_toEndOf="parent" android:textSize="18sp"/>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/current_password_text_input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:hint="Current password"
app:passwordToggleEnabled="true">
<com.google.android.material.textfield.TextInputEditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"/>
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/continue_current_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="8dp"
android:text="Continue"/>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/linearLayout2"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/your_new_password_text_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="24dp"
android:text="Your new password"
android:textSize="18sp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/new_password_input_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="24dp"
android:hint="Create a new password"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/your_new_password_text_view"
app:passwordToggleEnabled="true">
<com.google.android.material.textfield.TextInputEditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/new_password_input_text_confirm"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:hint="Confirm your new password"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/new_password_input_text"
app:passwordToggleEnabled="true">
<com.google.android.material.textfield.TextInputEditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/prev_new_password_button"
style="?attr/materialIconButtonFilledTonalStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:text="Previous"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/continue_new_password_button"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/new_password_input_text_confirm" />
<com.google.android.material.button.MaterialButton
android:id="@+id/continue_new_password_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:text="Continue"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/prev_new_password_button" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
</ViewSwitcher>
</ScrollView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

6
app/src/main/res/values/strings.xml
View File

@ -146,4 +146,10 @@
<string name="privacy_settings_card_description">Set how other people see you on Isolaatti. Hide or show information</string> <string name="privacy_settings_card_description">Set how other people see you on Isolaatti. Hide or show information</string>
<string name="qr_code">QR Code</string> <string name="qr_code">QR Code</string>
<string name="squads">Squads</string> <string name="squads">Squads</string>
<string name="current_sessions">Current sessions</string>
<string name="log_out">Log out</string>
<string name="session_description">A session is what keeps your device able to connect to Isolaatti server without you entering your credential each time.</string>
<string name="change_password">Change password</string>
<string name="password_description">A password allows you to sign in securely. Keep this password safe.</string>
<string name="sessions">Sessions</string>
</resources> </resources>