diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java index c6722de3..30a855fd 100644 --- a/app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java +++ b/app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java @@ -8,6 +8,7 @@ import android.view.MenuItem; import android.widget.Toast; import androidx.annotation.NonNull; +import androidx.appcompat.widget.Toolbar; import androidx.camera.core.CameraInfoUnavailableException; import androidx.camera.core.CameraSelector; import androidx.camera.core.ImageAnalysis; @@ -51,6 +52,7 @@ public class ScannerActivity extends AegisActivity implements QrCodeAnalyzer.Lis public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_scanner); + setSupportActionBar(findViewById(R.id.toolbar)); _entries = new ArrayList<>(); _lenses = new ArrayList<>(); diff --git a/app/src/main/res/layout/activity_scanner.xml b/app/src/main/res/layout/activity_scanner.xml index d834e551..2516c89a 100644 --- a/app/src/main/res/layout/activity_scanner.xml +++ b/app/src/main/res/layout/activity_scanner.xml @@ -7,6 +7,23 @@ android:layout_height="match_parent" tools:context="com.beemdevelopment.aegis.ui.ScannerActivity"> + + + + + app:layout_constraintTop_toBottomOf="@+id/toolbar_layout" /> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 6f937ad8..def28dad 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -45,7 +45,7 @@ @android:color/black - @@ -91,7 +91,7 @@ ?attr/background - @@ -124,7 +124,7 @@ ?attr/background -