Skip to content

Open map of place where picture was taken #1360

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 11 commits into from
May 7, 2018
Merged

Open map of place where picture was taken #1360

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e553d7f
Intent to map added
tanvidadu Mar 24, 2018
c2468f8
Merge conflicts resolved
tanvidadu Mar 24, 2018
0c08382
Added the functionality to hide FAB incase of null coordinate
tanvidadu Apr 17, 2018
4184721
Merge Conflict resolved
tanvidadu Apr 17, 2018
45d7a68
Improve pr quality
tanvidadu Apr 17, 2018
cb699c0
Improve Quality
tanvidadu Apr 25, 2018
88166e6
Added nested FAB animations
tanvidadu Apr 26, 2018
bbec1d0
Nested FAB implemented
tanvidadu Apr 26, 2018
026c57d
Improve Quality
tanvidadu Apr 30, 2018
bbd80bc
Added up arrow
tanvidadu May 2, 2018
0c44da0
Javadocs Added
tanvidadu May 2, 2018
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
Prev Previous commit
Next Next commit
Nested FAB implemented
  • Loading branch information
@tanvidadu
tanvidadu committed May 4, 2018
commit bbec1d0e124857443916fb9e1292bd11d38e66e4
9 changes: 6 additions & 3 deletions app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,12 +399,13 @@ public void onClick(View v) {
private void showFABMenu(){
isFABOpen=true;

//if( imageObj != null && imageObj.imageCoordsExists == true)
maps_fragment.setVisibility(View.VISIBLE);
zoomInButton.setVisibility(View.VISIBLE);

mainFab.animate().rotationBy(180);
maps_fragment.animate().translationY(-getResources().getDimension(R.dimen.first_fab));
zoomInButton.animate().translationY(-getResources().getDimension(R.dimen.second_fab));
maps_fragment.animate().translationY(-getResources().getDimension(R.dimen.second_fab));
zoomInButton.animate().translationY(-getResources().getDimension(R.dimen.first_fab));
}

private void closeFABMenu(){
Expand Down Expand Up @@ -816,6 +817,8 @@ private void zoomImageFromThumb(final View thumbView, Uri imageuri ) {
CurrentAnimator.cancel();
}
ViewUtil.hideKeyboard(ShareActivity.this.findViewById(R.id.titleEdit | R.id.descEdit));
closeFABMenu();
mainFab.setVisibility(View.GONE);
InputStream input = null;
Bitmap scaled = null;
try {
Expand Down Expand Up @@ -945,7 +948,7 @@ public void onClick(View view) {
CurrentAnimator.cancel();
}
zoomOutButton.setVisibility(View.GONE);
zoomInButton.setVisibility(View.VISIBLE);
mainFab.setVisibility(View.VISIBLE);

// Animate the four positioning/sizing properties in parallel,
// back to their original values.
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/ic_keyboard_arrow_up_black_24dp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z"/>
</vector>
24 changes: 12 additions & 12 deletions app/src/main/res/layout/activity_share.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,41 +48,41 @@
android:layout_alignParentBottom="true"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginBottom="@dimen/standard_gap"
app:srcCompat="@drawable/ic_launcher"
app:srcCompat="@drawable/ic_keyboard_arrow_up_black_24dp"
android:id="@+id/main_fab"/>


<android.support.design.widget.FloatingActionButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_above="@+id/main_fab"
android:visibility="gone"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginBottom="@dimen/standard_gap"
app:srcCompat="@drawable/ic_map_white_24dp"
android:id="@+id/media_map"/>
android:src="@drawable/ic_zoom_in_white_24dp"
android:layout_above="@+id/main_fab"
android:id="@+id/media_upload_zoom_in"/>

<android.support.design.widget.FloatingActionButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:visibility="gone"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginBottom="@dimen/standard_gap"
android:src="@drawable/ic_zoom_in_white_24dp"
android:layout_above="@+id/media_map"
android:id="@+id/media_upload_zoom_in"/>
android:src="@drawable/ic_zoom_out_white_24dp"
android:layout_above="@+id/main_fab"
android:id="@+id/media_upload_zoom_out"/>

<android.support.design.widget.FloatingActionButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_above="@+id/media_upload_zoom_in"
android:visibility="gone"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginBottom="@dimen/standard_gap"
android:src="@drawable/ic_zoom_out_white_24dp"
android:layout_above="@+id/media_map"
android:id="@+id/media_upload_zoom_out"/>
app:srcCompat="@drawable/ic_map_white_24dp"
android:id="@+id/media_map"/>

</RelativeLayout>

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
<dimen name="subheading_text_size">20sp</dimen>
<dimen name="normal_text">16sp</dimen>
<dimen name="description_text_size">14sp</dimen>
<dimen name="first_fab">55dp</dimen>
<dimen name="second_fab">100dp</dimen>
<dimen name="first_fab">15dp</dimen>
<dimen name="second_fab">25dp</dimen>
</resources>