Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors
fix display of event log title on activity - it was not being set before due to change in AndroidX/Material
n8fr8f7da93c8aa2f
diff --git a/src/main/java/org/havenapp/main/ui/EventActivity.java b/src/main/java/org/havenapp/main/ui/EventActivity.javaindex 3829b80..99983fc 100644--- a/src/main/java/org/havenapp/main/ui/EventActivity.java+++ b/src/main/java/org/havenapp/main/ui/EventActivity.java@@ -6,7 +6,9 @@ import android.os.Bundle;import android.os.StrictMode;import android.text.TextUtils;import android.view.MenuItem;+import android.widget.TextView;+import com.google.android.material.appbar.CollapsingToolbarLayout;import com.google.android.material.floatingactionbutton.FloatingActionButton;import com.google.android.material.snackbar.Snackbar;import com.stfalcon.frescoimageviewer.ImageViewer;@@ -44,6 +46,7 @@ public class EventActivity extends AppCompatActivity implements EventTriggerAdapprivate Event mEvent;private List<EventTrigger> eventTriggerList = new ArrayList<>();private EventTriggerAdapter mAdapter;+ private Toolbar toolbar;private ArrayList<Uri> eventTriggerImagePaths;//private final static String AUTHORITY = "org.havenapp.main.fileprovider";@@ -65,7 +68,7 @@ public class EventActivity extends AppCompatActivity implements EventTriggerAdapsuper.onCreate(savedInstanceState);setContentView(R.layout.activity_event);- Toolbar toolbar = findViewById(R.id.toolbar);+ toolbar = findViewById(R.id.toolbar);setSupportActionBar(toolbar);getSupportActionBar().setDisplayHomeAsUpEnabled(true);@@ -109,7 +112,12 @@ public class EventActivity extends AppCompatActivity implements EventTriggerAdap*/private void onEventFetched(@NonNull Event event) {mEvent = event;- setTitle(mEvent.getStartTime().toLocaleString());+ String title = mEvent.getStartTime().toLocaleString();+ setTitle(title);+ CollapsingToolbarLayout collapsingToolbarLayout = findViewById(R.id.toolbar_layout);+ collapsingToolbarLayout.setTitle(title);++ //((TextView)findViewById(R.id.toolbar_title)).setText(mEvent.getStartTime().toLocaleString());}/**@@ -202,7 +210,7 @@ public class EventActivity extends AppCompatActivity implements EventTriggerAdapprivate String generateLog () {StringBuilder mEventLog = new StringBuilder();- setTitle("Event @ " + mEvent.getStartTime().toLocaleString());+// setTitle("Event @ " + mEvent.getStartTime().toLocaleString());for (EventTrigger eventTrigger : eventTriggerList) {diff --git a/src/main/res/layout/activity_event.xml b/src/main/res/layout/activity_event.xmlindex 55cc331..7530620 100644--- a/src/main/res/layout/activity_event.xml+++ b/src/main/res/layout/activity_event.xml@@ -29,7 +29,8 @@android:layout_width="match_parent"android:layout_height="?attr/actionBarSize"app:layout_collapseMode="pin"- app:popupTheme="@style/AppTheme.PopupOverlay" />+ app:popupTheme="@style/AppTheme.PopupOverlay" >+ </androidx.appcompat.widget.Toolbar></com.google.android.material.appbar.CollapsingToolbarLayout></com.google.android.material.appbar.AppBarLayout>