Skip to content
Snippets Groups Projects
Commit 55d8e6f8 authored by Ken Gubler's avatar Ken Gubler
Browse files

Auto dismiss bt scan dialog fragment, if bt gets connected automatically.

Visualizer restart onResume if it was on.
parent 06f8a5ca
Branches
Tags
No related merge requests found
......@@ -25,6 +25,7 @@ package ch.kentai.android.soundingsoil;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.databinding.DataBindingUtil;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProviders;
import android.Manifest;
......@@ -444,6 +445,8 @@ public class BlinkyActivity extends AppCompatActivity implements ScannerFragment
mConnexState.setText(btState.toUpperCase());
connexLED.setColorFilter(Color.GREEN);
dismissDeviceScanningDialog();
if (mViewModel.getMonState().getValue()) { // monitor on
vol_part.setAlpha(1.0f);
mVolDownButton.setEnabled(true);
......@@ -694,11 +697,21 @@ public class BlinkyActivity extends AppCompatActivity implements ScannerFragment
anim.end();
}
}
private void showDeviceScanningDialog() {
final ScannerFragment dialog = ScannerFragment.getInstance(); // Device that is advertising directly does not have the GENERAL_DISCOVERABLE nor LIMITED_DISCOVERABLE flag set.
dialog.show(getSupportFragmentManager(), "scan_fragment");
}
private void dismissDeviceScanningDialog() {
Fragment prev = getSupportFragmentManager().findFragmentByTag("scan_fragment");
if (prev != null) {
ScannerFragment df = (ScannerFragment) prev;
df.dismiss();
}
}
@Override
......
......@@ -57,6 +57,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:backgroundTint="#484848"
android:text="@string/scanner_action_cancel" />
android:text="@string/scanner_action_cancel"
app:cornerRadius="0dp" />
</LinearLayout>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment