Merge branch 'dev'

Author: denny0223

app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
         applicationId = "app.opass.ccip"
         minSdk = 24
         targetSdk = 36
-        versionCode = 58
-        versionName = "3.8.0"
+        versionCode = 59
+        versionName = "3.8.1"
 
         manifestPlaceholders["manifestApplicationId"] = "$applicationId"
     }

app/src/main/res/layout/activity_about.xml

@@ -9,7 +9,9 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar"
         android:layout_width="match_parent"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior"
         android:layout_height="wrap_content"
+        android:fitsSystemWindows="true"
         android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
 
         <androidx.appcompat.widget.Toolbar
@@ -27,6 +29,7 @@
         android:layout_height="match_parent"
         android:layout_marginTop="?attr/actionBarSize"
         android:orientation="vertical"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
         android:gravity="center_horizontal">
 
         <ImageView

app/src/main/res/layout/activity_session_detail.xml

@@ -12,7 +12,7 @@
         android:layout_height="@dimen/app_bar_height"
         android:fitsSystemWindows="true"
         android:theme="@style/AppTheme.AppBarOverlay"
-        app:layout_behavior=".ui.sessiondetail.ScrollingControlAppBarLayoutBehavior">
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/toolbar_layout"

app/src/main/res/layout/content_session_detail.xml

@@ -11,7 +11,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:paddingBottom="@dimen/padding_safe_area">
 
         <androidx.cardview.widget.CardView
             android:layout_width="match_parent"

app/src/main/res/values/dimens.xml

@@ -7,4 +7,5 @@
     <dimen name="fab_margin">16dp</dimen>
     <dimen name="text_margin">16dp</dimen>
     <dimen name="icon_size">24dp</dimen>
+    <dimen name="padding_safe_area">100dp</dimen>
 </resources>