JCE-Projects/the-social-notebook-android
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

- filters do not take space anymore when they are invisible

Browse source
This commit is contained in:
Matan Bar Yosef 2016-07-09 20:00:20 +03:00
parent 1f866ae494
commit 9a7680c489
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java
View file

@ -147,7 +147,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
// Log.d(TAG, "" + v.getId()); // Log.d(TAG, "" + v.getId());
if (dateFilterIsVisible) { if (dateFilterIsVisible) {
dateFilterIsVisible = false; dateFilterIsVisible = false;
mapFilters.setVisibility(View.INVISIBLE); mapFilters.setVisibility(View.GONE);
} else { } else {
mapFilters.setVisibility(View.VISIBLE); mapFilters.setVisibility(View.VISIBLE);
dateFilterIsVisible = true; dateFilterIsVisible = true;
@ -167,7 +167,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
public void onClick(View v) { public void onClick(View v) {
if (locationFilterIsVisible) { if (locationFilterIsVisible) {
locationFilterIsVisible = false; locationFilterIsVisible = false;
mapFilters.setVisibility(View.INVISIBLE); mapFilters.setVisibility(View.GONE);
} else { } else {
mapFilters.setVisibility(View.VISIBLE); mapFilters.setVisibility(View.VISIBLE);
locationFilterIsVisible = true; locationFilterIsVisible = true;
@ -187,7 +187,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
public void onClick(View v) { public void onClick(View v) {
if (userFilterIsVisible) { if (userFilterIsVisible) {
userFilterIsVisible = false; userFilterIsVisible = false;
mapFilters.setVisibility(View.INVISIBLE); mapFilters.setVisibility(View.GONE);
} else { } else {
mapFilters.setVisibility(View.VISIBLE); mapFilters.setVisibility(View.VISIBLE);
userFilterIsVisible = true; userFilterIsVisible = true;

4
app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
View file

@ -132,7 +132,7 @@ public class PersonalFragment extends Fragment {
public void onClick(View v) { public void onClick(View v) {
if (dateFilterIsVisible) { if (dateFilterIsVisible) {
dateFilterIsVisible = false; dateFilterIsVisible = false;
personalSpaceFilters.setVisibility(View.INVISIBLE); personalSpaceFilters.setVisibility(View.GONE);
} else { } else {
personalSpaceFilters.setVisibility(View.VISIBLE); personalSpaceFilters.setVisibility(View.VISIBLE);
dateFilterIsVisible = true; dateFilterIsVisible = true;
@ -151,7 +151,7 @@ public class PersonalFragment extends Fragment {
public void onClick(View v) { public void onClick(View v) {
if (userFilterIsVisible) { if (userFilterIsVisible) {
userFilterIsVisible = false; userFilterIsVisible = false;
personalSpaceFilters.setVisibility(View.INVISIBLE); personalSpaceFilters.setVisibility(View.GONE);
} else { } else {
personalSpaceFilters.setVisibility(View.VISIBLE); personalSpaceFilters.setVisibility(View.VISIBLE);
userFilterIsVisible = true; userFilterIsVisible = true;

13
app/src/main/res/layout/fragment_personal.xml
View file

@ -34,7 +34,8 @@
android:id="@+id/personalSpace_date_filter" android:id="@+id/personalSpace_date_filter"
android:layout_weight="1" android:layout_weight="1"
android:src="@drawable/date_icon" android:src="@drawable/date_icon"
android:scaleType="fitCenter" /> android:scaleType="fitCenter"
android:focusable="false" />
<ImageButton <ImageButton
android:layout_width="50dp" android:layout_width="50dp"
@ -42,7 +43,9 @@
android:id="@+id/personalSpace_premission_filter" android:id="@+id/personalSpace_premission_filter"
android:layout_weight="1" android:layout_weight="1"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/permission_icon" /> android:src="@drawable/permission_icon"
android:focusable="false"
android:focusableInTouchMode="false" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -51,8 +54,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contextClickable="false" android:contextClickable="false"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:visibility="invisible" android:visibility="gone"
android:id="@+id/personalSpace_filter_options" > android:id="@+id/personalSpace_filter_options"
android:clickable="false"
android:focusableInTouchMode="false">
<Button <Button
android:layout_width="50dp" android:layout_width="50dp"