Skip to content

Commit 396ed14

Browse files
committed
adapt activities to edge-to-edge
1 parent 5faea5e commit 396ed14

40 files changed

+202
-60
lines changed

src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ protected void onCreate(Bundle icicle, boolean ready) {
7777

7878
//noinspection ConstantConditions
7979
this.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
80+
getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
8081

8182
if (icicle == null) {
8283
initFragment(R.id.fragment, new ApplicationPreferenceFragment());

src/main/java/org/thoughtcrime/securesms/BlockedContactsActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public void onCreate(Bundle bundle, boolean ready) {
3333
setContentView(R.layout.activity_blocked_contacts);
3434
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
3535
getSupportActionBar().setTitle(R.string.pref_blocked_contacts);
36+
getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
3637
initFragment(R.id.fragment, new BlockedAndShareContactsFragment(), getIntent().getExtras());
3738
}
3839

src/main/java/org/thoughtcrime/securesms/ConversationActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -920,6 +920,7 @@ protected void initializeActionBar() {
920920
supportActionBar.setCustomView(R.layout.conversation_title_view);
921921
supportActionBar.setDisplayShowCustomEnabled(true);
922922
supportActionBar.setDisplayShowTitleEnabled(false);
923+
supportActionBar.setElevation(0); // TODO: use custom toolbar instead
923924

924925
Toolbar parent = (Toolbar) supportActionBar.getCustomView().getParent();
925926
parent.setPadding(0,0,0,0);

src/main/java/org/thoughtcrime/securesms/ConversationListArchiveActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public class ConversationListArchiveActivity extends PassphraseRequiredActionBar
2323
protected void onCreate(Bundle icicle, boolean ready) {
2424
setContentView(R.layout.activity_conversation_list_archive);
2525
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
26+
getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
2627
if (isRelayingMessageContent(this)) {
2728
getSupportActionBar().setTitle(isSharing(this) ? R.string.chat_share_with_title : R.string.forward_to);
2829
getSupportActionBar().setSubtitle(R.string.chat_archived_label);

src/main/java/org/thoughtcrime/securesms/CreateProfileActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ public void onCreate(Bundle bundle) {
7676
getSupportActionBar().setTitle(R.string.pref_profile_info_headline);
7777
getSupportActionBar().setDisplayHomeAsUpEnabled(!this.fromWelcome);
7878
getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
79+
getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
7980

8081
attachmentManager = new AttachmentManager(this, () -> {});
8182
avatarChanged = false;

src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ protected void onCreate(Bundle state, boolean ready) {
8080
unencrypted = getIntent().getBooleanExtra(UNENCRYPTED, false);
8181
Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
8282
getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
83+
getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
8384

8485
groupChatId = getIntent().getIntExtra(EDIT_GROUP_CHAT_ID, 0);
8586
attachmentManager = new AttachmentManager(this, () -> {});

src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ public void onCreate(Bundle bundle) {
9898

9999
Objects.requireNonNull(getSupportActionBar()).setTitle(R.string.onboarding_create_instant_account);
100100
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
101+
getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
101102

102103
boolean fromWelcome = getIntent().getBooleanExtra(FROM_WELCOME, false);
103104
if (DcHelper.getContext(this).isConfigured() == 1) {

src/main/java/org/thoughtcrime/securesms/LogViewActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ protected void onCreate(Bundle savedInstanceState) {
3636
transaction.commit();
3737

3838
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
39+
getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
3940
}
4041

4142
@Override

src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ public void onCreate(Bundle bundle) {
135135
actionBar.setTitle(R.string.login_header);
136136
actionBar.setDisplayHomeAsUpEnabled(true);
137137
actionBar.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
138+
actionBar.setElevation(0); // TODO: use custom toolbar instead
138139
}
139140

140141
emailInput.addTextChangedListener(new TextWatcher() {

src/main/java/org/thoughtcrime/securesms/WebViewActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ protected void onCreate(Bundle state, boolean ready) {
5555
ActionBar actionBar = getSupportActionBar();
5656
if (actionBar != null) {
5757
actionBar.setDisplayHomeAsUpEnabled(true);
58+
actionBar.setElevation(0); // TODO: use custom toolbar instead
5859
}
5960

6061
webView = findViewById(R.id.webview);

0 commit comments

Comments
 (0)