Skip to content

DEV-540 ShimmerCapture (Android) UI Issue on Android 15 & 16 #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 28, 2025
Merged

DEV-540 ShimmerCapture (Android) UI Issue on Android 15 & 16 #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
63da454
UI fix for Android 15,16
MAzalya Oct 27, 2025
061e349
Fix bottom inset padding
MAzalya Oct 28, 2025
165a990
tidy up
MAzalya Oct 28, 2025
662155c
more tidy up
MAzalya Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ShimmerAndroidInstrumentDriver/shimmerServiceExample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,5 @@ dependencies {
implementation 'androidx.multidex:multidex:2.0.1'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation 'com.google.android.material:material:1.12.0' // or latest stable
}
69 changes: 69 additions & 0 deletions .../shimmerServiceExample/src/main/java/com/shimmerresearch/shimmercapture/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
import android.os.Message;

import androidx.annotation.NonNull;
import androidx.appcompat.widget.Toolbar;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import androidx.core.graphics.Insets;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowCompat;
import androidx.core.view.WindowInsetsCompat;
import androidx.fragment.app.FragmentManager;


Expand All @@ -33,16 +39,19 @@
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Log;
import android.view.Gravity;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast;
import com.androidplot.xy.XYPlot;
import com.clj.fastble.BleManager;
import com.google.android.material.tabs.TabLayout;
import com.shimmerresearch.android.Shimmer;
import com.shimmerresearch.android.Shimmer4Android;
import com.shimmerresearch.android.guiUtilities.supportfragments.ConnectedShimmersListFragment;
Expand Down Expand Up @@ -76,6 +85,7 @@
import com.shimmerresearch.verisense.communication.SyncProgressDetails;

import java.io.File;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -181,13 +191,72 @@ public void requestPermissions(){
startServiceandBTManager();
}

WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
setContentView(R.layout.activity_main);

Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);

SectionsPagerAdapter1 sectionsPagerAdapter = new SectionsPagerAdapter1(getSupportFragmentManager());
ViewPager viewPager = findViewById(R.id.container);
viewPager.setAdapter(sectionsPagerAdapter);

TabLayout tabs = findViewById(R.id.tabs);
tabs.setupWithViewPager(viewPager);

// Insets listener — apply a fraction of status bar top as toolbar top padding
ViewCompat.setOnApplyWindowInsetsListener(toolbar, (v, insets) -> {
Insets bars = insets.getInsets(WindowInsetsCompat.Type.statusBars());
toolbar.post(() -> {
int targetPaddingTop = (int) (bars.top * 0.35f);
toolbar.setPadding(toolbar.getPaddingLeft(), targetPaddingTop, toolbar.getPaddingRight(), toolbar.getPaddingBottom());
});
return insets;
});

// ✅ Align title and overflow icons consistently
toolbar.post(() -> {
try {
// Center title vertically and slightly lower it
Field f = toolbar.getClass().getDeclaredField("mTitleTextView");
f.setAccessible(true);
TextView titleTextView = (TextView) f.get(toolbar);
if (titleTextView != null) {
Toolbar.LayoutParams lp = (Toolbar.LayoutParams) titleTextView.getLayoutParams();
lp.gravity = Gravity.CENTER_VERTICAL | Gravity.START;
titleTextView.setLayoutParams(lp);
// Slight downward offset (adjust 16–22 if needed)
titleTextView.setPadding(
titleTextView.getPaddingLeft(),
40,
titleTextView.getPaddingRight(),
0
);
}
} catch (Exception ignore) { /* Safe fallback if reflection fails */ }

// Move the overflow (⋮) menu slightly DOWN for perfect alignment
for (int i = 0; i < toolbar.getChildCount(); i++) {
View child = toolbar.getChildAt(i);
if (child.getClass().getSimpleName().equals("ActionMenuView")) {
child.setTranslationY(30f);
}
}
});

// Create the adapter that will return a fragment for each of the three
// primary sections of the activity.
mSectionsPagerAdapter1 = new SectionsPagerAdapter1(getSupportFragmentManager());
// Set up the ViewPager with the sections adapter.
mViewPager = (ViewPager) findViewById(R.id.container);
mViewPager.setAdapter(mSectionsPagerAdapter1);

// Apply bottom inset padding
ViewCompat.setOnApplyWindowInsetsListener(viewPager, (v, insets) -> {
Insets bars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
v.setPadding(v.getPaddingLeft(), v.getPaddingTop(), v.getPaddingRight(), bars.bottom);
return insets;
});
mViewPager.setOffscreenPageLimit(5); //Ensure none of the fragments has their view destroyed when off-screen
btAdapter = BluetoothAdapter.getDefaultAdapter();
dialog = new ShimmerDialogConfigurations();
Expand Down
92 changes: 27 additions & 65 deletions ShimmerAndroidInstrumentDriver/shimmerServiceExample/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,75 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.drawerlayout.widget.DrawerLayout
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.shimmerresearch.shimmercapture.MainActivity"
android:orientation="vertical"
android:id="@+id/content_frame">
android:layout_width="match_parent"
android:layout_height="match_parent">

<!-->
<TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
android:text="Shimmer Service Example" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<Button
android:id="@+id/button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:onClick="openMenu"
android:text="Menu" />

<Button
android:id="@+id/button2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="connectShimmer"
android:text="Connect Shimmer" />

<Button
android:id="@+id/button3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="testButton"
android:text="Test Button" />

<Button
android:id="@+id/button4"
android:layout_width="wrap_content"
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="72dp"
android:layout_marginTop="?attr/actionBarInsetTop"
android:background="?attr/colorPrimary"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:titleTextAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
app:titleTextColor="@android:color/white" />

<com.google.android.material.tabs.TabLayout
android:id="@+id/tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Test Button 2"
android:onClick="testButton2"/>
<-->
android:background="#33b5e5"
app:tabMode="scrollable"
app:tabGravity="fill"
app:tabIndicatorColor="@android:color/white"
app:tabTextColor="@android:color/white"
app:tabSelectedTextColor="@android:color/white"
app:tabIndicatorFullWidth="false"
app:tabTextAppearance="@style/TabTextAppearance" />

<androidx.viewpager.widget.ViewPager
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent">

<androidx.viewpager.widget.PagerTitleStrip
android:id="@+id/pager_title_strip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:background="#33b5e5"
android:textColor="#fff"
android:paddingTop="4dp"
android:paddingBottom="4dp" />

</androidx.viewpager.widget.ViewPager>

<!-- The navigation drawer -->
<ListView android:id="@+id/left_drawer"
android:layout_width="240dp"
android:layout_height="match_parent"
android:layout_gravity="start"
android:choiceMode="singleChoice"
android:divider="@android:color/transparent"
android:dividerHeight="0dp"
android:background="#ffffff"/>
<!-- android:background="#111"/> -->
android:layout_height="match_parent" />

</androidx.drawerlayout.widget.DrawerLayout>
</LinearLayout>
5 changes: 5 additions & 0 deletions ShimmerAndroidInstrumentDriver/shimmerServiceExample/src/main/res/values/attrs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Custom attribute used to fine-tune toolbar inset for Android 15+ -->
<attr name="actionBarInsetTop" format="dimension" />
</resources>
1 change: 1 addition & 0 deletions ShimmerAndroidInstrumentDriver/shimmerServiceExample/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="text_margin">16dp</dimen>
<dimen name="actionBarInsetTop">32dp</dimen>
</resources>
12 changes: 10 additions & 2 deletions ShimmerAndroidInstrumentDriver/shimmerServiceExample/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
<resources>

<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- Customize your theme here. -->
<style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="actionOverflowMenuStyle">@style/Widget.AppCompat.PopupMenu.Overflow</item>
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
<item name="actionBarInsetTop">0dp</item>
</style>

<style name="TabTextAppearance" parent="TextAppearance.Design.Tab">
<item name="textAllCaps">false</item>
</style>

</resources>