diff --git a/app/src/main/java/com/listerk/helible/MainActivity.kt b/app/src/main/java/com/listerk/helible/MainActivity.kt index ad40f42..a8fc630 100644 --- a/app/src/main/java/com/listerk/helible/MainActivity.kt +++ b/app/src/main/java/com/listerk/helible/MainActivity.kt @@ -9,12 +9,15 @@ import android.bluetooth.le.ScanResult import android.content.Context import android.content.Intent import android.content.pm.PackageManager +import android.graphics.drawable.Animatable import android.os.Build import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import android.os.Handler import android.util.Log +import android.view.View import android.widget.Button +import android.widget.ImageView import androidx.annotation.RequiresApi import androidx.core.app.ActivityCompat import androidx.recyclerview.widget.LinearLayoutManager @@ -35,10 +38,16 @@ class MainActivity : AppCompatActivity() { override fun onScanResult(callbackType: Int, result: ScanResult) { super.onScanResult(callbackType, result) val bleDevicesView = findViewById(R.id.bleDevicesView) + val loader = findViewById(R.id.bleDevicesLoader) if (result.device.name.isNullOrBlank()) { return } + if (loader.visibility == View.VISIBLE) { + (loader.drawable as? Animatable)?.stop() + loader.visibility = View.GONE + } + var deviceIndex = foundDevices.indexOfFirst { it.address == result.device.address } if (deviceIndex < 0) { deviceIndex = foundDevices.size @@ -60,6 +69,9 @@ class MainActivity : AppCompatActivity() { startActivity(intent) } + val loader = findViewById(R.id.bleDevicesLoader) + (loader.drawable as? Animatable)?.start() + val bleDevicesView = findViewById(R.id.bleDevicesView) bleDevicesView.layoutManager = LinearLayoutManager(this) bleDevicesView.adapter = BleDeviceAdapter(foundDevices, gotoControlButton) diff --git a/app/src/main/res/drawable/loader.xml b/app/src/main/res/drawable/loader.xml new file mode 100644 index 0000000..d3b9eae --- /dev/null +++ b/app/src/main/res/drawable/loader.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/signal_icon1.xml b/app/src/main/res/drawable/signal_icon1.xml index 4ff4532..2558b32 100644 --- a/app/src/main/res/drawable/signal_icon1.xml +++ b/app/src/main/res/drawable/signal_icon1.xml @@ -1,4 +1,15 @@ - + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/signal_icon2.xml b/app/src/main/res/drawable/signal_icon2.xml index 419d49a..a5aaa00 100644 --- a/app/src/main/res/drawable/signal_icon2.xml +++ b/app/src/main/res/drawable/signal_icon2.xml @@ -6,9 +6,15 @@ android:viewportHeight="500"> + + \ No newline at end of file diff --git a/app/src/main/res/drawable/signal_icon3.xml b/app/src/main/res/drawable/signal_icon3.xml index baa4222..ca6b1ce 100644 --- a/app/src/main/res/drawable/signal_icon3.xml +++ b/app/src/main/res/drawable/signal_icon3.xml @@ -6,12 +6,15 @@ android:viewportHeight="500"> + \ No newline at end of file diff --git a/app/src/main/res/drawable/signal_icon4.xml b/app/src/main/res/drawable/signal_icon4.xml index 03fc192..932ac4b 100644 --- a/app/src/main/res/drawable/signal_icon4.xml +++ b/app/src/main/res/drawable/signal_icon4.xml @@ -6,15 +6,15 @@ android:viewportHeight="500"> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index da61d44..8eb95a2 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -25,9 +25,18 @@ app:layout_constraintTop_toBottomOf="@id/devicesTitle" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" - android:layout_marginTop="4dp" + android:layout_marginTop="12dp" tools:listitem="@layout/item_ble_device" /> + +