Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ dependencies {

//Anko
implementation "org.jetbrains.anko:anko-commons:$anko_version"
implementation "org.jetbrains.anko:anko-design:$anko_version"

// Stetho
debugImplementation 'com.facebook.stetho:stetho:1.5.1'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.navigation.NavController
import androidx.navigation.fragment.NavHostFragment
import androidx.navigation.ui.NavigationUI.setupWithNavController
import com.google.android.material.snackbar.Snackbar
import kotlinx.android.synthetic.main.activity_main.navigation
import kotlinx.android.synthetic.main.activity_main.navigationAuth
import kotlinx.android.synthetic.main.activity_main.mainFragmentCoordinatorLayout
import org.fossasia.openevent.general.auth.EditProfileFragment
import org.fossasia.openevent.general.utils.Utils.navAnimGone
import org.fossasia.openevent.general.utils.Utils.navAnimVisible
import org.jetbrains.anko.design.snackbar

class MainActivity : AppCompatActivity() {
private lateinit var navController: NavController
Expand Down Expand Up @@ -67,9 +67,7 @@ class MainActivity : AppCompatActivity() {
R.id.loginFragment,
R.id.signUpFragment -> {
navController.popBackStack(R.id.eventsFragment, false)
Snackbar.make(
mainFragmentCoordinatorLayout, R.string.sign_in_canceled, Snackbar.LENGTH_SHORT
).show()
mainFragmentCoordinatorLayout.snackbar(R.string.sign_in_canceled)
}
R.id.orderCompletedFragment -> navController.popBackStack(R.id.eventDetailsFragment, false)
R.id.welcomeFragment -> finish()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import androidx.fragment.app.Fragment
import androidx.lifecycle.Observer
import androidx.navigation.fragment.navArgs
import com.google.android.material.appbar.AppBarLayout
import com.google.android.material.snackbar.Snackbar
import com.squareup.picasso.Picasso
import kotlinx.android.synthetic.main.fragment_about_event.view.appBar
import kotlinx.android.synthetic.main.fragment_about_event.view.progressBarAbout
Expand All @@ -27,6 +26,7 @@ import org.fossasia.openevent.general.utils.extensions.nonNull
import org.fossasia.openevent.general.utils.stripHtml
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.fossasia.openevent.general.utils.Utils.setToolbar
import org.jetbrains.anko.design.snackbar

class AboutEventFragment : Fragment() {
private lateinit var rootView: View
Expand All @@ -49,7 +49,7 @@ class AboutEventFragment : Fragment() {
aboutEventViewModel.error
.nonNull()
.observe(viewLifecycleOwner, Observer {
Snackbar.make(rootView, it, Snackbar.LENGTH_SHORT).show()
rootView.snackbar(it)
})

aboutEventViewModel.progressAboutEvent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.navigation.Navigation.findNavController
import androidx.navigation.fragment.navArgs
import com.google.android.material.snackbar.Snackbar
import com.google.android.material.textfield.TextInputLayout
import com.stripe.android.Stripe
import com.stripe.android.TokenCallback
Expand Down Expand Up @@ -83,6 +82,8 @@ import org.fossasia.openevent.general.utils.nullToEmpty
import org.koin.androidx.viewmodel.ext.android.viewModel
import java.util.Currency
import org.fossasia.openevent.general.utils.Utils.setToolbar
import org.jetbrains.anko.design.longSnackbar
import org.jetbrains.anko.design.snackbar

private const val STRIPE_KEY = "com.stripe.android.API_KEY"

Expand Down Expand Up @@ -335,7 +336,7 @@ class AttendeeFragment : Fragment() {
attendeeViewModel.message
.nonNull()
.observe(viewLifecycleOwner, Observer {
Snackbar.make(rootView, it, Snackbar.LENGTH_LONG).show()
rootView.longSnackbar(it)
})

attendeeViewModel.progress
Expand Down Expand Up @@ -433,13 +434,11 @@ class AttendeeFragment : Fragment() {

rootView.register.setOnClickListener {
if (!isNetworkConnected(context)) {
Snackbar.make(rootView.attendeeScrollView, getString(R.string.no_internet_connection_message),
Snackbar.LENGTH_LONG).show()
rootView.attendeeScrollView.longSnackbar(getString(R.string.no_internet_connection_message))
return@setOnClickListener
}
if (!rootView.acceptCheckbox.isChecked) {
Snackbar.make(rootView.attendeeScrollView,
getString(R.string.term_and_conditions), Snackbar.LENGTH_LONG).show()
rootView.attendeeScrollView.longSnackbar(getString(R.string.term_and_conditions))
return@setOnClickListener
}

Expand Down Expand Up @@ -476,13 +475,12 @@ class AttendeeFragment : Fragment() {
}
})
} else {
Snackbar.make(rootView.attendeeScrollView,
getString(R.string.invalid_email_address_message), Snackbar.LENGTH_LONG).show()
rootView.attendeeScrollView.longSnackbar(getString(R.string.invalid_email_address_message))
}
}

builder.setNegativeButton(android.R.string.no) { dialog, which ->
Snackbar.make(rootView, R.string.order_not_completed, Snackbar.LENGTH_SHORT).show()
rootView.snackbar(getString(R.string.order_not_completed))
}
builder.show()

Expand All @@ -499,7 +497,7 @@ class AttendeeFragment : Fragment() {
super.onResume()
if (!isNetworkConnected(context)) {
rootView.progressBarAttendee.isVisible = false
Snackbar.make(rootView.attendeeScrollView, "No internet connection!", Snackbar.LENGTH_LONG).show()
rootView.attendeeScrollView.longSnackbar(getString(R.string.no_internet_connection_message))
}
}

Expand All @@ -522,9 +520,7 @@ class AttendeeFragment : Fragment() {

val validDetails: Boolean? = card.validateCard()
if (validDetails != null && !validDetails)
Snackbar.make(
rootView, getString(R.string.invalid_card_data_message), Snackbar.LENGTH_SHORT
).show()
rootView.snackbar(getString(R.string.invalid_card_data_message))
else
Stripe(requireContext())
.createToken(card, API_KEY, object : TokenCallback {
Expand All @@ -535,9 +531,7 @@ class AttendeeFragment : Fragment() {
}

override fun onError(error: Exception) {
Snackbar.make(
rootView, error.localizedMessage.toString(), Snackbar.LENGTH_LONG
).show()
rootView.snackbar(error.localizedMessage.toString())
}
})
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import androidx.core.content.ContextCompat
import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import androidx.lifecycle.Observer
import com.google.android.material.snackbar.Snackbar
import com.squareup.picasso.Picasso
import kotlinx.android.synthetic.main.fragment_edit_profile.view.editProfileCoordinatorLayout
import kotlinx.android.synthetic.main.fragment_edit_profile.view.updateButton
Expand All @@ -40,6 +39,7 @@ import timber.log.Timber
import java.io.ByteArrayOutputStream
import java.io.FileNotFoundException
import org.fossasia.openevent.general.utils.Utils.setToolbar
import org.jetbrains.anko.design.snackbar

class EditProfileFragment : Fragment() {

Expand Down Expand Up @@ -114,7 +114,7 @@ class EditProfileFragment : Fragment() {
editProfileViewModel.message
.nonNull()
.observe(viewLifecycleOwner, Observer {
Snackbar.make(rootView.editProfileCoordinatorLayout, it, Snackbar.LENGTH_LONG).show()
rootView.editProfileCoordinatorLayout.snackbar(it)
if (it == getString(R.string.user_update_success_message)) {
val thisActivity = activity
if (thisActivity is MainActivity) thisActivity.onSuperBackPressed()
Expand Down Expand Up @@ -194,14 +194,10 @@ class EditProfileFragment : Fragment() {
if (requestCode == REQUEST_CODE) {
if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
permissionGranted = true
Snackbar.make(
rootView.editProfileCoordinatorLayout, getString(R.string.storage_permission_granted_message),
Snackbar.LENGTH_SHORT).show()
rootView.editProfileCoordinatorLayout.snackbar(getString(R.string.storage_permission_granted_message))
showFileChooser()
} else {
Snackbar.make(
rootView.editProfileCoordinatorLayout, getString(R.string.storage_permission_denied_message),
Snackbar.LENGTH_SHORT).show()
rootView.editProfileCoordinatorLayout.snackbar(getString(R.string.storage_permission_denied_message))
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import androidx.fragment.app.Fragment
import androidx.lifecycle.Observer
import androidx.navigation.Navigation.findNavController
import androidx.navigation.fragment.navArgs
import com.google.android.material.snackbar.Snackbar
import kotlinx.android.synthetic.main.activity_main.navigationAuth
import kotlinx.android.synthetic.main.fragment_login.email
import kotlinx.android.synthetic.main.fragment_login.password
Expand All @@ -31,6 +30,8 @@ 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.extensions.nonNull
import org.jetbrains.anko.design.longSnackbar
import org.jetbrains.anko.design.snackbar
import org.koin.androidx.viewmodel.ext.android.viewModel

class LoginFragment : Fragment() {
Expand Down Expand Up @@ -74,7 +75,7 @@ class LoginFragment : Fragment() {
loginViewModel.error
.nonNull()
.observe(viewLifecycleOwner, Observer {
Snackbar.make(rootView.loginCoordinatorLayout, it, Snackbar.LENGTH_LONG).show()
rootView.loginCoordinatorLayout.longSnackbar(it)
})

loginViewModel.loggedIn
Expand Down Expand Up @@ -152,7 +153,7 @@ class LoginFragment : Fragment() {

private fun popBackStack() {
findNavController(rootView).popBackStack()
Snackbar.make(rootView, R.string.welcome_back, Snackbar.LENGTH_SHORT).show()
rootView.snackbar(R.string.welcome_back)
}

private fun onEmailEntered(enable: Boolean) {
Expand All @@ -163,7 +164,7 @@ class LoginFragment : Fragment() {
return when (item.itemId) {
android.R.id.home -> {
findNavController(rootView).popBackStack(R.id.eventsFragment, false)
Snackbar.make(rootView, R.string.sign_in_canceled, Snackbar.LENGTH_SHORT).show()
rootView.snackbar(R.string.sign_in_canceled)
true
}
else -> super.onOptionsItemSelected(item)
Expand All @@ -172,7 +173,7 @@ class LoginFragment : Fragment() {

private fun showSnackbar() {
safeArgs.snackbarMessage?.let { textSnackbar ->
Snackbar.make(rootView.loginCoordinatorLayout, textSnackbar, Snackbar.LENGTH_SHORT).show()
rootView.snackbar(textSnackbar)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import androidx.lifecycle.Observer
import androidx.navigation.Navigation.findNavController
import com.google.android.material.snackbar.Snackbar
import com.squareup.picasso.Picasso
import kotlinx.android.synthetic.main.fragment_profile.view.profileCoordinatorLayout
import kotlinx.android.synthetic.main.fragment_profile.view.avatar
Expand All @@ -34,6 +33,7 @@ import org.fossasia.openevent.general.utils.extensions.nonNull
import org.fossasia.openevent.general.utils.nullToEmpty
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.fossasia.openevent.general.utils.Utils.setToolbar
import org.jetbrains.anko.design.snackbar

class ProfileFragment : Fragment() {
private val profileViewModel by viewModel<ProfileViewModel>()
Expand Down Expand Up @@ -78,7 +78,7 @@ class ProfileFragment : Fragment() {
profileViewModel.error
.nonNull()
.observe(viewLifecycleOwner, Observer {
Snackbar.make(rootView.profileCoordinatorLayout, it, Snackbar.LENGTH_SHORT).show()
rootView.profileCoordinatorLayout.snackbar(it)
})

profileViewModel.user
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import android.view.inputmethod.EditorInfo
import androidx.fragment.app.Fragment
import androidx.lifecycle.Observer
import androidx.navigation.Navigation.findNavController
import com.google.android.material.snackbar.Snackbar
import kotlinx.android.synthetic.main.fragment_signup.confirmPasswords
import kotlinx.android.synthetic.main.fragment_signup.firstNameText
import kotlinx.android.synthetic.main.fragment_signup.lastNameText
Expand Down Expand Up @@ -40,6 +39,8 @@ import android.text.SpannableStringBuilder
import android.text.TextPaint
import android.text.method.LinkMovementMethod
import android.text.style.ClickableSpan
import org.jetbrains.anko.design.longSnackbar
import org.jetbrains.anko.design.snackbar

class SignUpFragment : Fragment() {

Expand Down Expand Up @@ -117,7 +118,7 @@ class SignUpFragment : Fragment() {
rootView.signUpButton.setOnClickListener {

if (!rootView.signUpCheckbox.isChecked) {
Snackbar.make(rootView, R.string.accept_terms_and_conditions, Snackbar.LENGTH_SHORT).show()
rootView.snackbar(R.string.accept_terms_and_conditions)
return@setOnClickListener
} else {
signUp.email = usernameSignUp.text.toString()
Expand All @@ -144,15 +145,13 @@ class SignUpFragment : Fragment() {
signUpViewModel.error
.nonNull()
.observe(viewLifecycleOwner, Observer {
Snackbar.make(rootView.signupNestedScrollView, it, Snackbar.LENGTH_LONG).show()
rootView.signupNestedScrollView.longSnackbar(it)
})

signUpViewModel.signedUp
.nonNull()
.observe(viewLifecycleOwner, Observer {
Snackbar.make(
rootView.signupNestedScrollView, R.string.sign_up_success, Snackbar.LENGTH_SHORT
).show()
rootView.signupNestedScrollView.snackbar(R.string.sign_up_success)
signUpViewModel.login(signUp)
})

Expand Down Expand Up @@ -249,7 +248,7 @@ class SignUpFragment : Fragment() {

private fun redirectToMain() {
findNavController(rootView).popBackStack()
Snackbar.make(rootView, R.string.logged_in_automatically, Snackbar.LENGTH_SHORT).show()
rootView.snackbar(R.string.logged_in_automatically)
}

private fun validateRequiredFieldsEmpty(): Boolean {
Expand Down Expand Up @@ -279,7 +278,7 @@ class SignUpFragment : Fragment() {
return when (item.itemId) {
android.R.id.home -> {
findNavController(rootView).popBackStack(R.id.eventsFragment, false)
Snackbar.make(rootView, R.string.sign_in_canceled, Snackbar.LENGTH_SHORT).show()
rootView.snackbar(R.string.sign_in_canceled)
true
}
else -> super.onOptionsItemSelected(item)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import androidx.fragment.app.Fragment
import androidx.lifecycle.Observer
import androidx.recyclerview.widget.GridLayoutManager
import androidx.navigation.Navigation.findNavController
import com.google.android.material.snackbar.Snackbar
import kotlinx.android.synthetic.main.content_no_internet.view.noInternetCard
import kotlinx.android.synthetic.main.content_no_internet.view.retry
import kotlinx.android.synthetic.main.fragment_events.eventsNestedScrollView
Expand Down Expand Up @@ -39,6 +38,7 @@ import org.koin.androidx.scope.ext.android.getOrCreateScope
import org.koin.androidx.viewmodel.ext.android.viewModel
import timber.log.Timber
import org.fossasia.openevent.general.utils.Utils.setToolbar
import org.jetbrains.anko.design.longSnackbar

/**
* Enum class for different layout types in the adapter.
Expand Down Expand Up @@ -115,7 +115,7 @@ class EventsFragment : Fragment(), ScrollToTop {
eventsViewModel.error
.nonNull()
.observe(viewLifecycleOwner, Observer {
Snackbar.make(eventsNestedScrollView, it, Snackbar.LENGTH_LONG).show()
eventsNestedScrollView.longSnackbar(it)
})

eventsViewModel.loadLocation()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import androidx.lifecycle.Observer
import androidx.navigation.Navigation.findNavController
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.navigation.fragment.navArgs
import com.google.android.material.snackbar.Snackbar
import kotlinx.android.synthetic.main.fragment_similar_events.moreLikeThis
import kotlinx.android.synthetic.main.fragment_similar_events.progressBar
import kotlinx.android.synthetic.main.fragment_similar_events.similarEventsDivider
Expand All @@ -27,6 +26,7 @@ import org.fossasia.openevent.general.common.FavoriteFabClickListener
import org.fossasia.openevent.general.event.EventLayoutType
import org.fossasia.openevent.general.utils.Utils.getAnimSlide
import org.fossasia.openevent.general.utils.extensions.nonNull
import org.jetbrains.anko.design.longSnackbar
import org.koin.android.ext.android.get
import org.koin.androidx.scope.ext.android.bindScope
import org.koin.androidx.scope.ext.android.getOrCreateScope
Expand Down Expand Up @@ -77,7 +77,7 @@ class SimilarEventsFragment : Fragment() {
similarEventsViewModel.error
.nonNull()
.observe(viewLifecycleOwner, Observer {
Snackbar.make(rootView.similarEventsCoordinatorLayout, it, Snackbar.LENGTH_LONG).show()
rootView.similarEventsCoordinatorLayout.longSnackbar(it)
})

similarEventsViewModel.progress
Expand Down
Loading