diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 003ea46ceb..e2a8243541 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -17,6 +17,7 @@ Organic Maps contributions: Konstantin Pastbin Nishant Bhandari Sebastiao Sousa + Harry Bond Organic Maps translations: Karina Kordon diff --git a/android/app/src/main/cpp/app/organicmaps/editor/OsmOAuth.cpp b/android/app/src/main/cpp/app/organicmaps/editor/OsmOAuth.cpp index af07761833..90d320ef65 100644 --- a/android/app/src/main/cpp/app/organicmaps/editor/OsmOAuth.cpp +++ b/android/app/src/main/cpp/app/organicmaps/editor/OsmOAuth.cpp @@ -70,6 +70,15 @@ Java_app_organicmaps_editor_OsmOAuth_nativeGetOsmChangesetsCount(JNIEnv * env, j return -1; } +JNIEXPORT jstring JNICALL +Java_app_organicmaps_editor_OsmOAuth_nativeGetOsmProfilePictureUrl(JNIEnv * env, jclass, jstring oauthToken) +{ + UserPreferences prefs; + if (LoadOsmUserPreferences(jni::ToNativeString(env, oauthToken), prefs)) + return jni::ToJavaString(env, prefs.m_imageUrl); + return nullptr; +} + JNIEXPORT jstring JNICALL Java_app_organicmaps_editor_OsmOAuth_nativeGetHistoryUrl(JNIEnv * env, jclass, jstring user) { diff --git a/android/app/src/main/java/app/organicmaps/editor/OsmOAuth.java b/android/app/src/main/java/app/organicmaps/editor/OsmOAuth.java index 0dfccd59ea..d5d7dc8450 100644 --- a/android/app/src/main/java/app/organicmaps/editor/OsmOAuth.java +++ b/android/app/src/main/java/app/organicmaps/editor/OsmOAuth.java @@ -2,6 +2,7 @@ package app.organicmaps.editor; import android.content.Context; import android.content.SharedPreferences; +import android.graphics.Bitmap; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -68,6 +69,12 @@ public final class OsmOAuth return MwmApplication.prefs(context).getString(PREF_OSM_USERNAME, ""); } + public static Bitmap getProfilePicture(@NonNull Context context) + { + //TODO(HB): load and store image in cache here + return null; + } + public static void setAuthorization(@NonNull Context context, String oauthToken, String username) { MwmApplication.prefs(context).edit() @@ -103,6 +110,10 @@ public final class OsmOAuth @Nullable public static native String nativeGetOsmUsername(String oauthToken); + @WorkerThread + @Nullable + public static native String nativeGetOsmProfilePictureUrl(String oauthToken); + @WorkerThread @NonNull public static native String nativeGetHistoryUrl(String user); diff --git a/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java b/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java index 5c81a5e0e1..95ff55c045 100644 --- a/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java @@ -1,10 +1,12 @@ package app.organicmaps.editor; import android.content.Intent; +import android.graphics.Bitmap; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; @@ -18,11 +20,15 @@ import app.organicmaps.util.Utils; import app.organicmaps.util.concurrency.ThreadPool; import app.organicmaps.util.concurrency.UiThread; import com.google.android.material.dialog.MaterialAlertDialogBuilder; +import java.text.NumberFormat; public class ProfileFragment extends BaseMwmToolbarFragment { + private View mUserInfoBlock; private TextView mEditsSent; - private ProgressBar mEditsSentProgress; + private TextView mProfileName; + private ImageView mProfileImage; + private ProgressBar mProfileInfoLoading; @Nullable @Override @@ -44,13 +50,14 @@ public class ProfileFragment extends BaseMwmToolbarFragment { View logoutButton = getToolbarController().getToolbar().findViewById(R.id.logout); logoutButton.setOnClickListener((v) -> logout()); - View editsBlock = view.findViewById(R.id.block_edits); - UiUtils.show(editsBlock); - View sentBlock = editsBlock.findViewById(R.id.sent_edits); - mEditsSent = sentBlock.findViewById(R.id.edits_count); - mEditsSentProgress = sentBlock.findViewById(R.id.edits_count_progress); + mUserInfoBlock = view.findViewById(R.id.block_user_info); + mProfileInfoLoading = view.findViewById(R.id.user_profile_loading); + mEditsSent = mUserInfoBlock.findViewById(R.id.user_sent_edits); + mProfileName = mUserInfoBlock.findViewById(R.id.user_profile_name); + mProfileImage = mUserInfoBlock.findViewById(R.id.user_profile_image); view.findViewById(R.id.about_osm).setOnClickListener((v) -> Utils.openUrl(requireActivity(), getString(R.string.osm_wiki_about_url))); view.findViewById(R.id.osm_history).setOnClickListener((v) -> Utils.openUrl(requireActivity(), OsmOAuth.getHistoryUrl(requireContext()))); + } private void refreshViews() @@ -61,14 +68,25 @@ public class ProfileFragment extends BaseMwmToolbarFragment ThreadPool.getWorker().execute(() -> { if (mEditsSent.getText().equals("")) { - UiUtils.hide(mEditsSent); - UiUtils.show(mEditsSentProgress); + UiUtils.show(mProfileInfoLoading); + UiUtils.hide(mUserInfoBlock); } - final int count = OsmOAuth.getOsmChangesetsCount(requireContext(), getParentFragmentManager()); + final int profileEditCount = OsmOAuth.getOsmChangesetsCount(requireContext(), getParentFragmentManager()); + final String profileUsername = OsmOAuth.getUsername(requireContext()); + final Bitmap profilePicture = OsmOAuth.getProfilePicture(requireContext()); + UiThread.run(() -> { - mEditsSent.setText(String.valueOf(count)); - UiUtils.show(mEditsSent); - UiUtils.hide(mEditsSentProgress); + mEditsSent.setText(NumberFormat.getInstance().format(profileEditCount)); + mProfileName.setText(profileUsername); + + // Use generic image if user has no profile picture or it failed to load. + if (profilePicture != null) + mProfileImage.setImageBitmap(profilePicture); + else + mProfileImage.setImageResource(R.drawable.profile_generic); + + UiUtils.show(mUserInfoBlock); + UiUtils.hide(mProfileInfoLoading); }); }); } diff --git a/android/app/src/main/res/drawable/profile_generic.xml b/android/app/src/main/res/drawable/profile_generic.xml new file mode 100644 index 0000000000..3b3c087685 --- /dev/null +++ b/android/app/src/main/res/drawable/profile_generic.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/app/src/main/res/layout/fragment_osm_profile.xml b/android/app/src/main/res/layout/fragment_osm_profile.xml index 9174b62195..5c4f309060 100644 --- a/android/app/src/main/res/layout/fragment_osm_profile.xml +++ b/android/app/src/main/res/layout/fragment_osm_profile.xml @@ -24,103 +24,102 @@ android:scaleType="center" app:srcCompat="@drawable/ic_logout" android:contentDescription="@string/logout" /> - - - - + + android:layout_height="wrap_content" + android:padding="@dimen/margin_base" + android:background="?colorPrimary"> + + + + + + + + + + + - - - - - - - - - - - + - - - - - - + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:background="?clickableBackground" + android:gravity="center" + android:paddingTop="@dimen/margin_half" + android:paddingBottom="@dimen/margin_half" + android:text="@string/editor_more_about_osm" + android:textAppearance="@style/MwmTextAppearance.Body4" + android:textColor="?colorAccent" + android:textSize="@dimen/text_size_body_4" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@+id/osm_history" + app:layout_constraintVertical_bias="1" /> + + \ No newline at end of file