Skip to content

Commit a803d47

Browse files
adbenitezadbenitez
committed
don't use setStatusBarColor
1 parent 396ed14 commit a803d47

File tree

7 files changed

+2
-51
lines changed

7 files changed

+2
-51
lines changed

‎src/main/java/org/thoughtcrime/securesms/AllMediaDocumentsFragment.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import android.view.MenuItem;
1212
import android.view.View;
1313
import android.view.ViewGroup;
14-
import android.view.Window;
1514
import android.widget.TextView;
1615

1716
import androidx.annotation.NonNull;
@@ -221,16 +220,11 @@ private AllMediaDocumentsAdapter getListAdapter() {
221220

222221
private class ActionModeCallback implements ActionMode.Callback {
223222

224-
private int originalStatusBarColor;
225-
226223
@Override
227224
public boolean onCreateActionMode(ActionMode mode, Menu menu) {
228225
mode.getMenuInflater().inflate(R.menu.profile_context, menu);
229226
mode.setTitle("1");
230227

231-
Window window = getActivity().getWindow();
232-
originalStatusBarColor = window.getStatusBarColor();
233-
window.setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
234228
setCorrectMenuVisibility(menu);
235229
return true;
236230
}
@@ -279,8 +273,6 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem menuItem) {
279273
public void onDestroyActionMode(ActionMode mode) {
280274
actionMode = null;
281275
getListAdapter().clearSelection();
282-
283-
getActivity().getWindow().setStatusBarColor(originalStatusBarColor);
284276
}
285277
}
286278
}

‎src/main/java/org/thoughtcrime/securesms/AllMediaGalleryFragment.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import android.view.MenuItem;
1212
import android.view.View;
1313
import android.view.ViewGroup;
14-
import android.view.Window;
1514
import android.widget.TextView;
1615

1716
import androidx.annotation.NonNull;
@@ -212,16 +211,11 @@ private AllMediaGalleryAdapter getListAdapter() {
212211

213212
private class ActionModeCallback implements ActionMode.Callback {
214213

215-
private int originalStatusBarColor;
216-
217214
@Override
218215
public boolean onCreateActionMode(ActionMode mode, Menu menu) {
219216
mode.getMenuInflater().inflate(R.menu.profile_context, menu);
220217
mode.setTitle("1");
221218

222-
Window window = getActivity().getWindow();
223-
originalStatusBarColor = window.getStatusBarColor();
224-
window.setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
225219
setCorrectMenuVisibility(menu);
226220
return true;
227221
}
@@ -266,8 +260,6 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem menuItem) {
266260
public void onDestroyActionMode(ActionMode mode) {
267261
actionMode = null;
268262
getListAdapter().clearSelection();
269-
270-
getActivity().getWindow().setStatusBarColor(originalStatusBarColor);
271263
}
272264
}
273265
}

‎src/main/java/org/thoughtcrime/securesms/BaseConversationListFragment.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
import android.app.Activity;
1111
import android.content.Context;
1212
import android.content.Intent;
13-
import android.content.res.TypedArray;
1413
import android.graphics.Bitmap;
15-
import android.graphics.Color;
1614
import android.net.Uri;
1715
import android.os.AsyncTask;
1816
import android.view.Menu;
@@ -401,8 +399,6 @@ public boolean onCreateActionMode(ActionMode mode, Menu menu) {
401399

402400
mode.setTitle("1");
403401

404-
requireActivity().getWindow().setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
405-
406402
return true;
407403
}
408404

@@ -445,10 +441,6 @@ public void onDestroyActionMode(ActionMode mode) {
445441
actionMode = null;
446442
getListAdapter().initializeBatchMode(false);
447443

448-
TypedArray color = requireActivity().getTheme().obtainStyledAttributes(new int[]{android.R.attr.statusBarColor});
449-
requireActivity().getWindow().setStatusBarColor(color.getColor(0, Color.BLACK));
450-
color.recycle();
451-
452444
Context context = getContext();
453445
if (context != null) {
454446
fab.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_add_white_24dp));

‎src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
import android.annotation.SuppressLint;
2424
import android.app.Activity;
2525
import android.content.Intent;
26-
import android.content.res.TypedArray;
27-
import android.graphics.Color;
2826
import android.os.AsyncTask;
2927
import android.os.Bundle;
3028
import android.util.Log;
@@ -35,7 +33,6 @@
3533
import android.view.MenuItem;
3634
import android.view.View;
3735
import android.view.ViewGroup;
38-
import android.widget.Toast;
3936

4037
import androidx.annotation.NonNull;
4138
import androidx.appcompat.app.AlertDialog;
@@ -136,7 +133,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
136133
public boolean onCreateActionMode(ActionMode actionMode, Menu menu) {
137134
MenuInflater inflater = getActivity().getMenuInflater();
138135
inflater.inflate(R.menu.contact_list, menu);
139-
getActivity().getWindow().setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
140136
setCorrectMenuVisibility(menu);
141137
actionMode.setTitle("1");
142138
return true;
@@ -167,10 +163,6 @@ public boolean onActionItemClicked(ActionMode actionMode, MenuItem menuItem) {
167163
public void onDestroyActionMode(ActionMode actionMode) {
168164
ContactSelectionListFragment.this.actionMode = null;
169165
getContactSelectionListAdapter().resetActionModeSelection();
170-
171-
TypedArray color = getActivity().getTheme().obtainStyledAttributes(new int[]{android.R.attr.statusBarColor});
172-
getActivity().getWindow().setStatusBarColor(color.getColor(0, Color.BLACK));
173-
color.recycle();
174166
}
175167
};
176168

‎src/main/java/org/thoughtcrime/securesms/ConversationFragment.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import android.view.MenuItem;
3333
import android.view.View;
3434
import android.view.ViewGroup;
35-
import android.view.Window;
3635
import android.view.animation.Animation;
3736
import android.view.animation.AnimationUtils;
3837
import android.widget.TextView;
@@ -854,19 +853,13 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
854853

855854
private class ActionModeCallback implements ActionMode.Callback {
856855

857-
private int statusBarColor;
858-
859856
@Override
860857
public boolean onCreateActionMode(ActionMode mode, Menu menu) {
861858
MenuInflater inflater = mode.getMenuInflater();
862859
inflater.inflate(R.menu.conversation_context, menu);
863860

864861
mode.setTitle("1");
865862

866-
Window window = getActivity().getWindow();
867-
statusBarColor = window.getStatusBarColor();
868-
window.setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
869-
870863
Util.redMenuItem(menu, R.id.menu_context_delete_message);
871864
setCorrectMenuVisibility(menu);
872865
ConversationAdaptiveActionsToolbar.adjustMenuActions(menu, 10, requireActivity().getWindow().getDecorView().getMeasuredWidth());
@@ -883,8 +876,6 @@ public void onDestroyActionMode(ActionMode mode) {
883876
((ConversationAdapter)list.getAdapter()).clearSelection();
884877
list.getAdapter().notifyDataSetChanged();
885878

886-
getActivity().getWindow().setStatusBarColor(statusBarColor);
887-
888879
actionMode = null;
889880
hideAddReactionView();
890881
}

‎src/main/java/org/thoughtcrime/securesms/ProfileFragment.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
import android.app.Activity;
44
import android.content.Context;
55
import android.content.Intent;
6-
import android.content.res.Configuration;
76
import android.os.Bundle;
87
import android.view.LayoutInflater;
98
import android.view.Menu;
109
import android.view.MenuItem;
1110
import android.view.View;
1211
import android.view.ViewGroup;
13-
import android.view.Window;
1412
import android.widget.Toast;
1513

1614
import androidx.annotation.NonNull;
@@ -249,8 +247,6 @@ private void onSendMessage() {
249247

250248
private class ActionModeCallback implements ActionMode.Callback {
251249

252-
private int originalStatusBarColor;
253-
254250
@Override
255251
public boolean onCreateActionMode(ActionMode mode, Menu menu) {
256252
mode.getMenuInflater().inflate(R.menu.profile_context, menu);
@@ -263,9 +259,6 @@ public boolean onCreateActionMode(ActionMode mode, Menu menu) {
263259
menu.findItem(R.id.menu_select_all).setVisible(false);
264260
mode.setTitle("1");
265261

266-
Window window = requireActivity().getWindow();
267-
originalStatusBarColor = window.getStatusBarColor();
268-
window.setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
269262
return true;
270263
}
271264

@@ -306,7 +299,6 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem menuItem) {
306299
public void onDestroyActionMode(ActionMode mode) {
307300
actionMode = null;
308301
adapter.clearSelection();
309-
requireActivity().getWindow().setStatusBarColor(originalStatusBarColor);
310302
}
311303
}
312304

‎src/main/res/values/themes.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<item name="theme_type">light</item>
3838
<item name="actionBarStyle">@style/TextSecure.LightActionBar</item>
3939
<item name="actionBarTabBarStyle">@style/TextSecure.LightActionBar.TabBar</item>
40-
<item name="actionModeBackground">@color/action_mode_status_bar</item>
40+
<item name="actionModeBackground">@color/delta_primary</item>
4141
<item name="colorPrimary">@color/delta_primary</item>
4242
<item name="colorPrimaryDark">@color/delta_primary</item>
4343

@@ -152,7 +152,7 @@
152152
<item name="colorPrimary">@color/gray95</item>
153153
<item name="colorPrimaryDark">@color/gray95</item>
154154
<item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
155-
<item name="actionModeBackground">@color/action_mode_status_bar</item>
155+
<item name="actionModeBackground">@color/gray95</item>
156156
<item name="android:textColor">@color/text_color_dark_theme</item>
157157
<item name="android:textColorSecondary">@color/text_color_secondary_dark_theme</item>
158158

0 commit comments

Comments
 (0)