🚀 Release 3.9.6 (396000)

.github/workflows/buildCi.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Setup cmake
         uses: jwlawson/actions-setup-cmake@v2
         with:
-          cmake-version: '4.0.2'
+          cmake-version: '4.0.3'
 
       - name: Setup Ninja
         run: sudo apt-get install ninja-build
@@ -34,7 +34,7 @@ jobs:
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r28b
+          ndk-version: r28c
 
       - name: Get Commit Message
         id: commitMessage
@@ -161,7 +161,7 @@ jobs:
       - name: Setup cmake
         uses: jwlawson/actions-setup-cmake@v2
         with:
-          cmake-version: '4.0.2'
+          cmake-version: '4.0.3'
 
       - name: Setup Ninja
         run: sudo apt-get install ninja-build
@@ -171,7 +171,7 @@ jobs:
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r28b
+          ndk-version: r28c
 
       - name: Get Commit Message
         id: commitMessage
@@ -304,7 +304,7 @@ jobs:
       - name: Setup cmake
         uses: jwlawson/actions-setup-cmake@v2
         with:
-          cmake-version: '4.0.2'
+          cmake-version: '4.0.3'
 
       - name: Setup Ninja
         run: sudo apt-get install ninja-build
@@ -314,7 +314,7 @@ jobs:
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r28b
+          ndk-version: r28c
 
       - name: Get Commit Message
         id: commitMessage

.github/workflows/buildPro.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup cmake
         uses: jwlawson/actions-setup-cmake@v2
         with:
-          cmake-version: '4.0.2'
+          cmake-version: '4.0.3'
 
       - name: Setup Ninja
         run: sudo apt-get install ninja-build
@@ -26,7 +26,7 @@ jobs:
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r28b
+          ndk-version: r28c
 
       - name: Get Commit Message
         id: commitMessage

.github/workflows/pullRequest.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Setup cmake
         uses: jwlawson/actions-setup-cmake@v2
         with:
-          cmake-version: '4.0.2'
+          cmake-version: '4.0.3'
 
       - name: Setup Ninja
         run: sudo apt-get install ninja-build
@@ -34,7 +34,7 @@ jobs:
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r28b
+          ndk-version: r28c
 
       - name: Setup JDK
         uses: actions/setup-java@v4

app/build.gradle.kts

@@ -12,16 +12,16 @@ android {
     compileSdk = 36
     buildToolsVersion = "36.0.0"
     buildFeatures.dataBinding = true
-    ndkVersion = "28.1.13356709"
+    ndkVersion = "28.2.13676358"
     buildFeatures.viewBinding = true
     buildFeatures.buildConfig = true
 
     defaultConfig {
         applicationId = "de.dertyp7214.rboardthememanager"
         minSdk = 23
         targetSdk = 36
-        versionCode = 395008
-        versionName = "3.9.5"
+        versionCode = 396000
+        versionName = "3.9.6"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -83,8 +83,6 @@ dependencies {
     implementation(project(":mathc"))
     implementation(project(":rboardcomponents"))
     implementation(platform(libs.firebase.bom))
-    implementation(libs.firebase.messaging.ktx)
-    implementation(libs.firebase.analytics.ktx)
 
     implementation(libs.protobuf.dynamic)
 

app/src/main/java/de/dertyp7214/rboardthememanager/adapter/ManageRepoThemePackAdapter.kt

@@ -1,19 +1,29 @@
 package de.dertyp7214.rboardthememanager.adapter
 
+import android.content.Context
+import android.os.Build
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.core.view.marginBottom
+import androidx.core.view.marginTop
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.card.MaterialCardView
+import com.tbuonomo.viewpagerdotsindicator.setBackgroundCompat
 import de.dertyp7214.rboardthememanager.R
+import de.dertyp7214.rboardthememanager.core.dpToPxRounded
+import de.dertyp7214.rboardthememanager.core.setMargin
 import de.dertyp7214.rboardthememanager.data.ThemePack
 
-class ManageRepoThemePackAdapter(private val items: List<ThemePack>) :
+class ManageRepoThemePackAdapter(private val context: Context,private val items: List<ThemePack>) :
     RecyclerView.Adapter<ManageRepoThemePackAdapter.ViewHolder>() {
 
     class ViewHolder(v: View) : RecyclerView.ViewHolder(v) {
         val title: TextView = v.findViewById(R.id.title)
         val author: TextView = v.findViewById(R.id.author)
+        val card: MaterialCardView = v.findViewById(R.id.card)
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
@@ -26,6 +36,70 @@ class ManageRepoThemePackAdapter(private val items: List<ThemePack>) :
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val item = items[position]
 
+        when (position) {
+            0 -> {
+                if (items.size == 1){
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N){
+                        holder.card.setBackgroundResource(R.drawable.color_surface_overlay_background_rounded)
+                        val param = holder.card.layoutParams as ViewGroup.MarginLayoutParams
+                        param.setMargins(16.dpToPxRounded(context), 0.dpToPxRounded(context), 16.dpToPxRounded(context), 0.dpToPxRounded(context))
+                        holder.card.layoutParams = param
+
+                    }
+                    else{
+                        holder.card.setBackgroundCompat(ContextCompat.getDrawable(context,R.drawable.color_surface_overlay_background_rounded))
+                        val param = holder.card.layoutParams as ViewGroup.MarginLayoutParams
+                        param.setMargins(16.dpToPxRounded(context), 0.dpToPxRounded(context), 16.dpToPxRounded(context), 0.dpToPxRounded(context))
+                        holder.card.layoutParams = param
+
+                    }
+                }
+                else{
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N){
+                        holder.card.setBackgroundResource(R.drawable.color_surface_overlay_background_top)
+                        val param = holder.card.layoutParams as ViewGroup.MarginLayoutParams
+                        param.setMargins(16.dpToPxRounded(context), 0.dpToPxRounded(context), 16.dpToPxRounded(context), 0.dpToPxRounded(context))
+                        holder.card.layoutParams = param
+
+                    }
+                    else{
+                        holder.card.setBackgroundCompat(ContextCompat.getDrawable(context,R.drawable.color_surface_overlay_background_top))
+                        val param = holder.card.layoutParams as ViewGroup.MarginLayoutParams
+                        param.setMargins(16.dpToPxRounded(context), 0.dpToPxRounded(context), 16.dpToPxRounded(context), 0.dpToPxRounded(context))
+                        holder.card.layoutParams = param
+
+                    }
+                }
+            }
+            items.lastIndex -> {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N){
+                    holder.card.setBackgroundResource(R.drawable.color_surface_overlay_background_bottom)
+                    val param = holder.card.layoutParams as ViewGroup.MarginLayoutParams
+                    param.setMargins(16.dpToPxRounded(context), 0.dpToPxRounded(context), 16.dpToPxRounded(context), 4.dpToPxRounded(context))
+                    holder.card.layoutParams = param
+                }
+                else{
+                    holder.card.setBackgroundCompat(ContextCompat.getDrawable(context,R.drawable.color_surface_overlay_background_bottom))
+                    val param = holder.card.layoutParams as ViewGroup.MarginLayoutParams
+                    param.setMargins(16.dpToPxRounded(context), 0.dpToPxRounded(context), 16.dpToPxRounded(context), 4.dpToPxRounded(context))
+                    holder.card.layoutParams = param
+                }
+            }
+            else -> {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N){
+                    holder.card.setBackgroundResource(R.drawable.color_surface_overlay_background)
+                    val param = holder.card.layoutParams as ViewGroup.MarginLayoutParams
+                    param.setMargins(16.dpToPxRounded(context), 0.dpToPxRounded(context), 16.dpToPxRounded(context), 0.dpToPxRounded(context))
+                    holder.card.layoutParams = param
+                }
+                else{
+                    holder.card.setBackgroundCompat(ContextCompat.getDrawable(context,R.drawable.color_surface_overlay_background))
+                    val param = holder.card.layoutParams as ViewGroup.MarginLayoutParams
+                    param.setMargins(16.dpToPxRounded(context), 0.dpToPxRounded(context), 16.dpToPxRounded(context), 0.dpToPxRounded(context))
+                    holder.card.layoutParams = param
+                }
+            }
+        }
         holder.title.text = item.name
         holder.author.text = item.author
     }

app/src/main/java/de/dertyp7214/rboardthememanager/adapter/ShareFlagsAdapter.kt

@@ -1,16 +1,26 @@
 package de.dertyp7214.rboardthememanager.adapter
 
 import android.annotation.SuppressLint
+import android.content.Context
+import android.os.Build
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.core.view.marginBottom
+import androidx.core.view.marginTop
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.card.MaterialCardView
 import com.google.android.material.checkbox.MaterialCheckBox
+import com.tbuonomo.viewpagerdotsindicator.setBackgroundCompat
 import de.dertyp7214.rboardthememanager.R
+import de.dertyp7214.rboardthememanager.core.dpToPxRounded
+import de.dertyp7214.rboardthememanager.core.setMargin
 import java.util.*
 
-class ShareFlagsAdapter(val flags: List<String>, private val onClick: (key: String) -> Unit) :
+class ShareFlagsAdapter(
+    private val context: Context, val flags: List<String>, private val onClick: (key: String) -> Unit) :
     RecyclerView.Adapter<ShareFlagsAdapter.ViewHolder>() {
 
     init {
@@ -42,6 +52,7 @@ class ShareFlagsAdapter(val flags: List<String>, private val onClick: (key: Stri
         val title: TextView = v.findViewById(R.id.title)
         val summary: TextView = v.findViewById(R.id.summary)
         val checkBox: MaterialCheckBox = v.findViewById(R.id.checkBox)
+        val card: MaterialCardView = v.findViewById(R.id.share_flags_card)
     }
 
     override fun getItemId(position: Int): Long {
@@ -56,6 +67,70 @@ class ShareFlagsAdapter(val flags: List<String>, private val onClick: (key: Stri
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val flag = flags[position]
+        when (position) {
+            0 -> {
+                if (flags.size == 1){
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N){
+                        holder.card.setBackgroundResource(R.drawable.color_surface_overlay_background_rounded)
+                        val param = holder.card.layoutParams as ViewGroup.MarginLayoutParams
+                        param.setMargins(16.dpToPxRounded(context), 0.dpToPxRounded(context), 16.dpToPxRounded(context), 0.dpToPxRounded(context))
+                        holder.card.layoutParams = param
+
+                    }
+                    else{
+                        holder.card.setBackgroundCompat(ContextCompat.getDrawable(context,R.drawable.color_surface_overlay_background_rounded))
+                        val param = holder.card.layoutParams as ViewGroup.MarginLayoutParams
+                        param.setMargins(16.dpToPxRounded(context), 0.dpToPxRounded(context), 16.dpToPxRounded(context), 0.dpToPxRounded(context))
+                        holder.card.layoutParams = param
+
+                    }
+                }
+                else{
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N){
+                        holder.card.setBackgroundResource(R.drawable.color_surface_overlay_background_top)
+                        val param = holder.card.layoutParams as ViewGroup.MarginLayoutParams
+                        param.setMargins(16.dpToPxRounded(context), 0.dpToPxRounded(context), 16.dpToPxRounded(context), 0.dpToPxRounded(context))
+                        holder.card.layoutParams = param
+
+                    }
+                    else{
+                        holder.card.setBackgroundCompat(ContextCompat.getDrawable(context,R.drawable.color_surface_overlay_background_top))
+                        val param = holder.card.layoutParams as ViewGroup.MarginLayoutParams
+                        param.setMargins(16.dpToPxRounded(context), 0.dpToPxRounded(context), 16.dpToPxRounded(context), 0.dpToPxRounded(context))
+                        holder.card.layoutParams = param
+
+                    }
+                }
+            }
+            flags.lastIndex -> {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N){
+                    holder.card.setBackgroundResource(R.drawable.color_surface_overlay_background_bottom)
+                    val param = holder.card.layoutParams as ViewGroup.MarginLayoutParams
+                    param.setMargins(16.dpToPxRounded(context), 0.dpToPxRounded(context), 16.dpToPxRounded(context), 4.dpToPxRounded(context))
+                    holder.card.layoutParams = param
+                }
+                else{
+                    holder.card.setBackgroundCompat(ContextCompat.getDrawable(context,R.drawable.color_surface_overlay_background_bottom))
+                    val param = holder.card.layoutParams as ViewGroup.MarginLayoutParams
+                    param.setMargins(16.dpToPxRounded(context), 0.dpToPxRounded(context), 16.dpToPxRounded(context), 4.dpToPxRounded(context))
+                    holder.card.layoutParams = param
+                }
+            }
+            else -> {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N){
+                    holder.card.setBackgroundResource(R.drawable.color_surface_overlay_background)
+                    val param = holder.card.layoutParams as ViewGroup.MarginLayoutParams
+                    param.setMargins(16.dpToPxRounded(context), 0.dpToPxRounded(context), 16.dpToPxRounded(context), 0.dpToPxRounded(context))
+                    holder.card.layoutParams = param
+                }
+                else{
+                    holder.card.setBackgroundCompat(ContextCompat.getDrawable(context,R.drawable.color_surface_overlay_background))
+                    val param = holder.card.layoutParams as ViewGroup.MarginLayoutParams
+                    param.setMargins(16.dpToPxRounded(context), 0.dpToPxRounded(context), 16.dpToPxRounded(context), 0.dpToPxRounded(context))
+                    holder.card.layoutParams = param
+                }
+            }
+        }
 
         holder.checkBox.isChecked = states[flag] == true
         holder.checkBox.setOnClickListener {

app/src/main/java/de/dertyp7214/rboardthememanager/adapter/ThemeAdapter.kt

@@ -3,7 +3,6 @@ package de.dertyp7214.rboardthememanager.adapter
 import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.GradientDrawable
 import android.view.LayoutInflater
 import android.view.View
@@ -15,20 +14,20 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toBitmap
+import androidx.core.graphics.drawable.toDrawable
 import androidx.core.graphics.get
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.card.MaterialCardView
 import com.google.android.material.color.MaterialColors
 import de.dertyp7214.colorutilsc.ColorUtilsC
+import de.dertyp7214.rboardcomponents.utils.doAsync
 import de.dertyp7214.rboardthememanager.R
 import de.dertyp7214.rboardthememanager.core.getAttr
 import de.dertyp7214.rboardthememanager.core.setAll
 import de.dertyp7214.rboardthememanager.data.ThemeDataClass
 import de.dertyp7214.rboardthememanager.utils.TraceWrapper
-import de.dertyp7214.rboardcomponents.utils.doAsync
 import de.dertyp7214.rboardthememanager.utils.getActiveTheme
-import androidx.core.graphics.drawable.toDrawable
 
 class ThemeAdapter(
     private val context: Context,