Skip to content

fix: Make name not mandatory and add progress dialog in edit profile #2310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 23, 2019
Merged

fix: Make name not mandatory and add progress dialog in edit profile #2310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 4 additions & 17 deletions app/src/main/java/org/fossasia/openevent/general/auth/EditProfileFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import android.view.ViewGroup
import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.ContextCompat
import androidx.core.graphics.drawable.toBitmap
import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import androidx.lifecycle.Observer
import androidx.navigation.Navigation.findNavController
Expand All @@ -39,16 +38,15 @@ import kotlinx.android.synthetic.main.dialog_edit_profile_image.view.replaceImag
import kotlinx.android.synthetic.main.dialog_edit_profile_image.view.removeImage
import kotlinx.android.synthetic.main.fragment_edit_profile.view.lastName
import kotlinx.android.synthetic.main.fragment_edit_profile.view.profilePhoto
import kotlinx.android.synthetic.main.fragment_edit_profile.view.progressBar
import kotlinx.android.synthetic.main.fragment_edit_profile.view.profilePhotoFab
import kotlinx.android.synthetic.main.fragment_edit_profile.view.firstNameLayout
import kotlinx.android.synthetic.main.fragment_edit_profile.view.lastNameLayout
import org.fossasia.openevent.general.CircleTransform
import org.fossasia.openevent.general.MainActivity
import org.fossasia.openevent.general.R
import org.fossasia.openevent.general.RotateBitmap
import org.fossasia.openevent.general.ComplexBackPressFragment
import org.fossasia.openevent.general.utils.Utils.show
import org.fossasia.openevent.general.utils.Utils.hideSoftKeyboard
import org.fossasia.openevent.general.utils.Utils.progressDialog
import org.fossasia.openevent.general.utils.Utils.requireDrawable
import org.fossasia.openevent.general.utils.extensions.nonNull
import org.fossasia.openevent.general.utils.nullToEmpty
Expand All @@ -61,7 +59,6 @@ import java.io.IOException
import java.io.FileNotFoundException
import org.fossasia.openevent.general.utils.Utils.setToolbar
import org.fossasia.openevent.general.utils.emptyToNull
import org.fossasia.openevent.general.utils.setRequired
import org.jetbrains.anko.design.snackbar

class EditProfileFragment : Fragment(), ComplexBackPressFragment {
Expand Down Expand Up @@ -109,10 +106,11 @@ class EditProfileFragment : Fragment(), ComplexBackPressFragment {
val currentUser = editProfileViewModel.user.value
if (currentUser == null) profileViewModel.getProfile() else loadUserUI(currentUser)

val progress = progressDialog(context)
editProfileViewModel.progress
.nonNull()
.observe(viewLifecycleOwner, Observer {
rootView.progressBar.isVisible = it
progress.show(it)
})

editProfileViewModel.getUpdatedTempFile()
Expand Down Expand Up @@ -156,9 +154,6 @@ class EditProfileFragment : Fragment(), ComplexBackPressFragment {
showEditPhotoDialog()
}

rootView.firstNameLayout.setRequired()
rootView.lastNameLayout.setRequired()

return rootView
}

Expand Down Expand Up @@ -187,14 +182,6 @@ class EditProfileFragment : Fragment(), ComplexBackPressFragment {

private fun isValidInput(): Boolean {
var valid = true
if (rootView.firstName.text.isNullOrBlank()) {
rootView.firstName.error = getString(R.string.empty_field_error_message)
valid = false
}
if (rootView.lastName.text.isNullOrBlank()) {
rootView.lastName.error = getString(R.string.empty_field_error_message)
valid = false
}
if (!rootView.instagram.text.isNullOrEmpty() && !Patterns.WEB_URL.matcher(rootView.instagram.text).matches()) {
rootView.instagram.error = getString(R.string.invalid_url_message)
valid = false
Expand Down
9 changes: 0 additions & 9 deletions app/src/main/res/layout/fragment_edit_profile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,6 @@
android:layout_gravity="center"
android:text="@string/update"
android:textColor="@android:color/white" />

<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="@dimen/padding_large"
android:visibility="gone" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout>