mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove bottom bar which was a added to make UI prettier with no function previously

Browse source
This commit is contained in:
neslihanturan 2017-12-28 14:26:13 +03:00 • committed by maskara
parent 6ca841fd18
commit 561a73acb2
5 changed files with 2 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
View file

@ -10,12 +10,10 @@ import android.support.design.widget.BottomSheetBehavior;
import android.support.design.widget.CoordinatorLayout;
import android.support.design.widget.FloatingActionButton;
import android.util.Log;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.ImageView;
@ -50,7 +48,7 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
private fr.free.nrw.commons.location.LatLng curLatLng;
private View bottomSheetList;
private View bottomSheetDetails;
private View moreInfo;
private BottomSheetBehavior bottomSheetListBehavior;
private BottomSheetBehavior bottomSheetDetailsBehavior;
private LinearLayout wikipediaButton;
@ -165,7 +163,6 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
rotate_backward = AnimationUtils.loadAnimation(getActivity(),R.anim.rotate_backward);
transparentView = getActivity().findViewById(R.id.transparentView);
moreInfo = getActivity().findViewById(R.id.more_info_button);
description = getActivity().findViewById(R.id.description);
title = getActivity().findViewById(R.id.title);
@ -337,11 +334,9 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
closeFabs(isFabOpen);
if (!fabPlus.isShown()) showFAB();
this.getView().requestFocus();
moreInfo.setVisibility(View.VISIBLE);
break;
case (BottomSheetBehavior.STATE_EXPANDED):
this.getView().requestFocus();
moreInfo.setVisibility(View.VISIBLE);
break;
case (BottomSheetBehavior.STATE_HIDDEN):
transparentView.setClickable(false);
@ -349,7 +344,6 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
closeFabs(isFabOpen);
hideFAB();
this.getView().requestFocus();
moreInfo.setVisibility(View.GONE);
break;
}

1
app/src/main/res/layout-land/activity_nearby.xml
View file

@ -51,7 +51,6 @@
<include layout="@layout/bottom_sheet_nearby" />
<include layout="@layout/bottom_sheet_details" android:id="@+id/bottom_sheet_details" />
<include layout="@layout/bar_more_info" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab_plus"

1
app/src/main/res/layout/activity_nearby.xml
View file

@ -68,7 +68,6 @@
</RelativeLayout>
<include layout="@layout/bottom_sheet_nearby" />
<include layout="@layout/bottom_sheet_details" android:id="@+id/bottom_sheet_details" />
<include layout="@layout/bar_more_info" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab_plus"

11
app/src/main/res/layout/bar_more_info.xml
View file

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="48dp"
android:id="@+id/more_info_button"
android:visibility="gone"
android:layout_gravity="bottom"
android:background="?attr/bottomBar"
>
</LinearLayout>

7
app/src/main/res/layout/bottom_sheet_details.xml
View file

@ -6,7 +6,7 @@
android:orientation="vertical"
android:background="?attr/mainBackground"
app:layout_behavior="@string/bottom_sheet_behavior"
app:behavior_peekHeight="128dp"
app:behavior_peekHeight="72dp"
app:behavior_hideable="true"
>
@ -186,10 +186,5 @@
android:layout_marginBottom="16dp"
android:textSize="16sp" />
<View xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="48dp"
>
</View>
</LinearLayout>