luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-05-14 14:02:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix the appearance of the toolbar in the scanner activity

Browse source
This commit is contained in:
Alexander Bakker 2021-01-27 12:36:48 +01:00
parent b91355da47
commit e6e2809c9c
3 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java
View file

@ -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<>();

19
app/src/main/res/layout/activity_scanner.xml
View file

@ -7,6 +7,23 @@
android:layout_height="match_parent"
tools:context="com.beemdevelopment.aegis.ui.ScannerActivity">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/toolbar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:translationZ="0.1dp"
app:elevation="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:theme="@style/ThemeOverlay.Aegis.AppBar">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.camera.view.PreviewView
android:id="@+id/preview_view"
android:layout_width="match_parent"
@ -14,6 +31,6 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toBottomOf="@+id/toolbar_layout" />
</androidx.constraintlayout.widget.ConstraintLayout>

6
app/src/main/res/values/styles.xml
View file

@ -45,7 +45,7 @@
<item name="android:statusBarColor">@android:color/black</item>
</style>
<style name="Theme.Aegis.Light.Fullscreen" parent="Theme.Aegis.Light.NoActionBar">
<style name="Theme.Aegis.Light.Fullscreen" parent="Theme.Aegis.Light.Default">
<item name="android:windowNoTitle">true</item>
<item name="android:windowFullscreen">true</item>
</style>
@ -91,7 +91,7 @@
<item name="android:navigationBarColor">?attr/background</item>
</style>
<style name="Theme.Aegis.Dark.Fullscreen" parent="Theme.Aegis.Dark.NoActionBar">
<style name="Theme.Aegis.Dark.Fullscreen" parent="Theme.Aegis.Dark.Default">
<item name="android:windowNoTitle">true</item>
<item name="android:windowFullscreen">true</item>
</style>
@ -124,7 +124,7 @@
<item name="android:navigationBarColor">?attr/background</item>
</style>
<style name="Theme.Aegis.TrueDark.Fullscreen" parent="Theme.Aegis.TrueDark.NoActionBar">
<style name="Theme.Aegis.TrueDark.Fullscreen" parent="Theme.Aegis.TrueDark.Default">
<item name="android:windowNoTitle">true</item>
<item name="android:windowFullscreen">true</item>
</style>