Merge pull request #329 from thgoebel/design

Design & Material 3
simondankelmann · Jan 6, 2025 · ac41e63 · ac41e63
2 parents a89accb + 2483875
commit ac41e63
Show file tree

Hide file tree

Showing 13 changed files with 104 additions and 202 deletions.
diff --git a/app/src/main/java/de/simon/dankelmann/bluetoothlespam/MainActivity.kt b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/MainActivity.kt
@@ -20,6 +20,7 @@ import android.view.View
 import android.widget.SeekBar
 import android.widget.TextView
 import android.widget.Toast
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.core.content.ContextCompat
@@ -39,6 +40,7 @@ import de.simon.dankelmann.bluetoothlespam.Helpers.BluetoothHelpers
 import de.simon.dankelmann.bluetoothlespam.Helpers.QueueHandlerHelpers
 import de.simon.dankelmann.bluetoothlespam.PermissionCheck.PermissionCheck
 import de.simon.dankelmann.bluetoothlespam.databinding.ActivityMainBinding
+import de.simon.dankelmann.bluetoothlespam.ui.setupEdgeToEdge
 
 
 class MainActivity : AppCompatActivity() {
@@ -51,16 +53,20 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        // needs to be before setContentView
+        enableEdgeToEdge()
+
         // Initialize AppContext, Activity, Advertisement Service and QueHandler
         AppContext.setContext(applicationContext)
         AppContext.setActivity(this)
 
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        // Custom toolbar
-        val toolbar = findViewById<Toolbar>(R.id.customToolbar)
-        setSupportActionBar(toolbar)
+        setupEdgeToEdge(binding.appBar, bottom = false)
+
+        setSupportActionBar(binding.toolbar)
+        supportActionBar?.setDisplayShowTitleEnabled(false)
 
         // Listen to Preference changes
         var prefs = PreferenceManager.getDefaultSharedPreferences(this);

diff --git a/app/src/main/java/de/simon/dankelmann/bluetoothlespam/ui/EdgeToEdgeUtil.kt b/app/src/main/java/de/simon/dankelmann/bluetoothlespam/ui/EdgeToEdgeUtil.kt
@@ -0,0 +1,26 @@
+package de.simon.dankelmann.bluetoothlespam.ui
+
+import android.view.View
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
+
+
+fun setupEdgeToEdge(view: View, top: Boolean = true, bottom: Boolean = true) {
+    ViewCompat.setOnApplyWindowInsetsListener(view) { v, insets ->
+        val i = insets.getInsets(
+            WindowInsetsCompat.Type.systemBars() + WindowInsetsCompat.Type.displayCutout()
+        )
+        v.updatePadding(
+            left = i.left,
+            right = i.right,
+        )
+        if (top) {
+            v.updatePadding(top = i.top)
+        }
+        if (bottom) {
+            v.updatePadding(bottom = i.bottom)
+        }
+        WindowInsetsCompat.CONSUMED
+    }
+}
diff --git a/...c/main/java/de/simon/dankelmann/bluetoothlespam/ui/advertisement/AdvertisementFragment.kt b/...c/main/java/de/simon/dankelmann/bluetoothlespam/ui/advertisement/AdvertisementFragment.kt
@@ -26,6 +26,7 @@ import de.simon.dankelmann.bluetoothlespam.Models.AdvertisementSetCollection
 import de.simon.dankelmann.bluetoothlespam.Models.AdvertisementSetList
 import de.simon.dankelmann.bluetoothlespam.R
 import de.simon.dankelmann.bluetoothlespam.databinding.FragmentAdvertisementBinding
+import de.simon.dankelmann.bluetoothlespam.ui.setupEdgeToEdge
 
 
 class AdvertisementFragment : Fragment(), IAdvertisementServiceCallback, IAdvertisementSetQueueHandlerCallback {
@@ -206,6 +207,8 @@ class AdvertisementFragment : Fragment(), IAdvertisementServiceCallback, IAdvert
     }
 
     fun setupUi() {
+        setupEdgeToEdge(binding.root, top = false)
+
         // Views
         var playButton = binding.advertisementFragmentPlayButton
         var queueModeButtonSingle = binding.advertisementFragmentQueueModeSingleButton

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -13,20 +13,18 @@
         android:layout_height="wrap_content">
 
         <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:theme="@style/Theme.BluetoothLESpam.AppBarOverlay"
             app:elevation="0dp">
 
-            <include layout="@layout/custom_toolbar" />
-            <!--
-                    <androidx.appcompat.widget.Toolbar
-                        android:id="@+id/toolbar"
-                        android:layout_width="match_parent"
-                        android:layout_height="?attr/actionBarSize"
-                        android:background="?attr/colorPrimary"
-                        app:popupTheme="@style/Theme.BluetoothLESpam.PopupOverlay" />
-                -->
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
+                android:theme="@style/Theme.BluetoothLESpam.AppBarOverlay"
+                tools:title="@string/app_name" />
         </com.google.android.material.appbar.AppBarLayout>
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>

diff --git a/app/src/main/res/layout/advertisement_foreground_service_notification.xml b/app/src/main/res/layout/advertisement_foreground_service_notification.xml
@@ -1,101 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="fill_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:background="@color/background_color"
- >
+    android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/advertisementForegroundServiceNotificationTargetImageView"
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:padding="10dp"
         android:src="@drawable/ic_android"
-        app:tint="@color/tint_target_icon"
-        />
-
+        app:tint="@color/tint_target_icon" />
 
     <LinearLayout
         android:layout_width="0dp"
-        android:layout_weight="1"
         android:layout_height="wrap_content"
+        android:layout_weight="1"
         android:orientation="vertical">
+
         <TextView
             android:id="@+id/advertisementForegroundServiceNotificationTitleTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="50"
-            android:gravity="center"
-            android:text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod"
-            android:textSize="18dp"
             android:ellipsize="end"
+            android:gravity="center"
             android:singleLine="true"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="@color/color_title"/>
+            android:textColor="@color/color_title"
+            android:textSize="18dp"
+            tools:text="Title" />
 
         <TextView
             android:id="@+id/advertisementForegroundServiceNotificationSubTitleTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="50"
-            android:gravity="center"
-            android:text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod"
-            android:textSize="15dp"
             android:ellipsize="marquee"
-            android:textStyle="italic"
+            android:gravity="center"
             android:singleLine="true"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="@color/color_subtitle"/>
+            android:textColor="@color/color_subtitle"
+            android:textSize="15dp"
+            android:textStyle="italic"
+            tools:text="Subtitle" />
     </LinearLayout>
 
-    <LinearLayout
-        android:layout_width="100dp"
-        android:layout_height="match_parent"
-        android:orientation="horizontal"
-        android:layout_gravity="end"
-        >
-
-        <ImageView
-            android:padding="10dp"
-            android:id="@+id/advertisementForegroundServiceNotificationStopImageView"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:src="@drawable/stop"
-            app:tint="@color/tint_button_active"
-           />
-        <ImageView
-            android:padding="10dp"
-            android:id="@+id/advertisementForegroundServiceNotificationToggleImageView"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:src="@drawable/pause"
-            app:tint="@color/tint_button_active"
-            />
-
-
-
-        <!--
-        <ImageView
-            android:padding="10dp"
-            android:id="@+id/advertisementForegroundServiceNotificationPauseImageView"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:src="@drawable/pause"
-            app:tint="@color/tint_button_active"
-            >
-        </ImageView>
-
-        <ImageView
-            android:padding="10dp"
-            android:id="@+id/advertisementForegroundServiceNotificationPlayImageView"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:src="@drawable/play_arrow"
-            app:tint="@color/tint_button_active">
-        </ImageView>-->
+    <ImageView
+        android:id="@+id/advertisementForegroundServiceNotificationStopImageView"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:padding="10dp"
+        android:src="@drawable/stop"
+        app:tint="@color/tint_button_active" />
 
-    </LinearLayout>
+    <ImageView
+        android:id="@+id/advertisementForegroundServiceNotificationToggleImageView"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:padding="10dp"
+        android:src="@drawable/pause"
+        app:tint="@color/tint_button_active" />
 
-</LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/bluetooth_le_scan_foreground_service_notification.xml b/app/src/main/res/layout/bluetooth_le_scan_foreground_service_notification.xml
@@ -1,54 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="fill_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:id="@+id/bluetoothLeScanningForegroundNotificationLayout"
-    android:background="@color/background_color"
- >
+    android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/bluetoothLeScanningForegroundNotificationIcon"
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:padding="10dp"
         android:src="@drawable/bluetooth_searching"
-        app:tint="@color/tint_target_icon"
-        />
-
+        app:tint="@color/tint_target_icon" />
 
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_weight="1"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_weight="1"
         android:orientation="vertical">
+
         <TextView
-            android:id="@+id/bluetoothLeScanningForegroundNotificationTitle"            android:layout_width="wrap_content"
+            android:id="@+id/bluetoothLeScanningForegroundNotificationTitle"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="50"
-            android:gravity="center"
-            android:text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod"
-            android:textSize="18dp"
             android:ellipsize="end"
+            android:gravity="center"
             android:singleLine="true"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="@color/color_title"/>
+            android:textColor="@color/color_title"
+            android:textSize="18dp"
+            tools:text="Title" />
 
         <TextView
-            android:id="@+id/bluetoothLeScanningForegroundNotificationSubTitle"            android:layout_width="wrap_content"
+            android:id="@+id/bluetoothLeScanningForegroundNotificationSubTitle"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="50"
-            android:gravity="center"
-            android:text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod"
-            android:textSize="15dp"
             android:ellipsize="marquee"
-            android:textStyle="italic"
+            android:gravity="center"
             android:singleLine="true"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="@color/color_subtitle"/>
+            android:textColor="@color/color_subtitle"
+            android:textSize="15dp"
+            android:textStyle="italic"
+            tools:text="Subtitle" />
     </LinearLayout>
 
-
-
 </LinearLayout>
diff --git a/app/src/main/res/layout/custom_toolbar.xml b/app/src/main/res/layout/custom_toolbar.xml
diff --git a/app/src/main/res/layout/fragment_spam_detector.xml b/app/src/main/res/layout/fragment_spam_detector.xml
@@ -5,7 +5,6 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".ui.spamDetector.SpamDetectorFragment"
-    android:background="@color/background_color"
     android:id="@+id/spamDetectorLayout">
 
     <androidx.constraintlayout.widget.ConstraintLayout

diff --git a/app/src/main/res/layout/fragment_start.xml b/app/src/main/res/layout/fragment_start.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_color"
     android:clipToPadding="false"
     tools:context=".ui.start.StartFragment">