Skip to content
This repository was archived by the owner on Jul 25, 2024. It is now read-only.

Commit 242f785

Browse files
kunall17timabbott
authored andcommitted
Added margin to show snackbar notifications below toolbar
1 parent 900c472 commit 242f785

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

app/src/main/java/com/zulip/android/activities/ZulipActivity.java

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@
55
import java.util.Arrays;
66
import java.util.HashMap;
77
import java.util.List;
8-
import java.util.Locale;
98
import java.util.concurrent.Callable;
109
import java.util.ArrayList;
11-
import java.util.concurrent.TimeUnit;
1210

1311
import android.animation.Animator;
1412
import android.annotation.SuppressLint;
@@ -58,6 +56,7 @@
5856
import android.text.TextUtils;
5957
import android.text.TextWatcher;
6058
import android.util.Log;
59+
import android.util.TypedValue;
6160
import android.view.Gravity;
6261
import android.view.Menu;
6362
import android.view.MenuItem;
@@ -168,6 +167,8 @@ public class ZulipActivity extends BaseActivity implements
168167
private AsyncGetEvents event_poll;
169168
private Handler statusUpdateHandler;
170169
private Runnable statusUpdateRunnable;
170+
171+
private int mToolbarHeightInPx;
171172
private MessageListFragment narrowedList;
172173
private MessageListFragment homeList;
173174
private AutoCompleteTextView streamActv;
@@ -2057,14 +2058,17 @@ public void onNewMessages(Message[] messages) {
20572058
}
20582059

20592060
Snackbar snackbar;
2060-
2061+
CoordinatorLayout.LayoutParams snackBarParams;
20612062
private void setupSnackBar() {
20622063
final CoordinatorLayout coordinatorLayout = (CoordinatorLayout) findViewById(R.id.coordinatorLayout);
20632064
snackbar = Snackbar.make(coordinatorLayout, "", Snackbar.LENGTH_LONG);
20642065
View v = snackbar.getView();
2065-
CoordinatorLayout.LayoutParams params = (CoordinatorLayout.LayoutParams) v.getLayoutParams();
2066-
params.gravity = Gravity.TOP;
2067-
v.setLayoutParams(params);
2066+
snackBarParams = (CoordinatorLayout.LayoutParams) v.getLayoutParams();
2067+
snackBarParams.gravity = Gravity.TOP;
2068+
v.setLayoutParams(snackBarParams);
2069+
TypedValue tv = new TypedValue();
2070+
if (getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true))
2071+
mToolbarHeightInPx = TypedValue.complexToDimensionPixelSize(tv.data, getResources().getDisplayMetrics());
20682072
}
20692073

20702074
NarrowFilter narrowFilter;
@@ -2112,6 +2116,11 @@ public void onClick(View view) {
21122116
}
21132117
});
21142118
}
2119+
if (appBarLayout.getVisibility() == View.GONE) {
2120+
snackBarParams.setMargins(0, 0, 0, 0);
2121+
} else {
2122+
snackBarParams.setMargins(0, mToolbarHeightInPx, 0, 0);
2123+
}
21152124
snackbar.show();
21162125
}
21172126

0 commit comments

Comments
 (0)