Skip to content
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

fix: Edit Profile Crashing and ScrollView in signup resolved #2729

Open
wants to merge 6 commits into
base: development
Choose a base branch
from
Open

fix: Edit Profile Crashing and ScrollView in signup resolved #2729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1e5e2d1
Edit Profile Crashing resolved
rcs10 Jun 16, 2020
c038649
Sign-Up ScrollView Enabled
rcs10 Jun 16, 2020
545557e
Merge branch 'development' into development
rcs10 Jun 17, 2020
b4d3d95
Merge branch 'development' into development
rcs10 Jun 19, 2020
abebff0
Merge branch 'development' into development
liveHarshit Sep 12, 2020
faa2ad9
Merge branch 'development' into development
rcs10 Sep 12, 2020
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
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
android:theme="@style/AppTheme">
<activity
android:name=".MainActivity"
android:windowSoftInputMode="adjustPan"
android:windowSoftInputMode="adjustResize"
android:theme="@style/SplashTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/org/fossasia/openevent/general/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import org.fossasia.openevent.general.utils.AppLinkUtils
import org.fossasia.openevent.general.utils.Utils.navAnimGone
import org.fossasia.openevent.general.utils.Utils.navAnimVisible
import org.jetbrains.anko.design.snackbar
import org.koin.androidx.scope.BuildConfig
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why build config is required here?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad,
ignore it bro

import org.koin.androidx.viewmodel.ext.android.viewModel

const val PLAY_STORE_BUILD_FLAVOR = "playStore"
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -208,7 +208,7 @@ class EditProfileFragment : Fragment(), ComplexBackPressFragment {
userTwitter = user.twitterUrl.nullToEmpty()
userInstagram = user.instagramUrl.nullToEmpty()

if (safeArgs.croppedImage.isEmpty()) {
if (safeArgs.croppedImage.equals("''")) {
if (!editProfileViewModel.userAvatar.isNullOrEmpty() && !editProfileViewModel.avatarUpdated) {
val drawable = requireDrawable(requireContext(), R.drawable.ic_account_circle_grey)
Picasso.get()
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/fossasia/openevent/general/utils/ImageUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ object ImageUtils {
}

fun decodeBitmap(encodedBitmap: String): Bitmap {
val decodedString = Base64.decode(encodedBitmap, Base64.DEFAULT)
val decodedString = Base64.decode(encodedBitmap, Base64.DEFAULT or Base64.NO_WRAP)
return BitmapFactory.decodeByteArray(decodedString, 0, decodedString.size)
}
}