Skip to content

chore: bump target SDK version to 35 #212

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+60 −51
Open

chore: bump target SDK version to 35 #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d8d5d2f
chore: bump target SDK version to 35
naveensingh Jul 29, 2025
49b5f69
chore: bump target SDK version to 36
naveensingh Oct 18, 2025
eeca6e8
refactor: update edge-to-edge implementation
naveensingh Oct 21, 2025
a75e454
refactor: update edge-to-edge implementation
naveensingh Oct 21, 2025
db198f4
refactor: update edge-to-edge implementation
naveensingh Oct 21, 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
12 changes: 3 additions & 9 deletions app/src/main/kotlin/org/fossify/keyboard/activities/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,15 @@ class MainActivity : SimpleActivity() {
private val binding by viewBinding(ActivityMainBinding::inflate)

override fun onCreate(savedInstanceState: Bundle?) {
isMaterialActivity = true
super.onCreate(savedInstanceState)
setContentView(binding.root)
appLaunched(BuildConfig.APPLICATION_ID)
setupOptionsMenu()
refreshMenuItems()

binding.apply {
updateMaterialActivityViews(
mainCoordinator,
mainHolder,
useTransparentNavigation = false,
useTopSearchMenu = false
)
setupMaterialScrollListener(mainNestedScrollview, mainToolbar)
setupEdgeToEdge(padBottomSystem = listOf(mainNestedScrollview))
setupMaterialScrollListener(binding.mainNestedScrollview, binding.mainAppbar)

changeKeyboardHolder.setOnClickListener {
inputMethodManager.showInputMethodPicker()
Expand All @@ -49,7 +43,7 @@ class MainActivity : SimpleActivity() {

override fun onResume() {
super.onResume()
setupToolbar(binding.mainToolbar)
setupTopAppBar(binding.mainAppbar)
if (!isKeyboardEnabled()) {
ConfirmationAdvancedDialog(
activity = this,
Expand Down
7 changes: 3 additions & 4 deletions app/src/main/kotlin/org/fossify/keyboard/activities/ManageClipboardItemsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,15 @@ class ManageClipboardItemsActivity : SimpleActivity(), RefreshRecyclerViewListen
private val binding by viewBinding(ActivityManageClipboardItemsBinding::inflate)

override fun onCreate(savedInstanceState: Bundle?) {
isMaterialActivity = true
super.onCreate(savedInstanceState)
setContentView(binding.root)
setupOptionsMenu()
updateTextColors(binding.suggestionsItemsHolder)
updateClips()

binding.apply {
updateMaterialActivityViews(clipboardCoordinator, clipboardItemsList, useTransparentNavigation = true, useTopSearchMenu = false)
setupMaterialScrollListener(clipboardNestedScrollview, clipboardToolbar)
setupEdgeToEdge(padBottomSystem = listOf(clipboardItemsList))
setupMaterialScrollListener(binding.clipboardItemsList, binding.clipboardAppbar)

clipboardItemsPlaceholder.text = "${getText(R.string.manage_clipboard_empty)}\n\n${getText(R.string.manage_clips)}"
clipboardItemsPlaceholder2.apply {
Expand All @@ -57,7 +56,7 @@ class ManageClipboardItemsActivity : SimpleActivity(), RefreshRecyclerViewListen

override fun onResume() {
super.onResume()
setupToolbar(binding.clipboardToolbar, NavigationIcon.Arrow)
setupTopAppBar(binding.clipboardAppbar, NavigationIcon.Arrow)
}

override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
Expand Down
12 changes: 3 additions & 9 deletions app/src/main/kotlin/org/fossify/keyboard/activities/SettingsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,24 +36,18 @@ class SettingsActivity : SimpleActivity() {
private val binding by viewBinding(ActivitySettingsBinding::inflate)

override fun onCreate(savedInstanceState: Bundle?) {
isMaterialActivity = true
super.onCreate(savedInstanceState)
setContentView(binding.root)

binding.apply {
updateMaterialActivityViews(
mainCoordinatorLayout = settingsCoordinator,
nestedView = settingsHolder,
useTransparentNavigation = true,
useTopSearchMenu = false
)
setupMaterialScrollListener(settingsNestedScrollview, settingsToolbar)
setupEdgeToEdge(padBottomSystem = listOf(settingsNestedScrollview))
setupMaterialScrollListener(binding.settingsNestedScrollview, binding.settingsAppbar)
}
}

override fun onResume() {
super.onResume()
setupToolbar(binding.settingsToolbar, NavigationIcon.Arrow)
setupTopAppBar(binding.settingsAppbar, NavigationIcon.Arrow)

setupCustomizeColors()
setupUseEnglish()
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/org/fossify/keyboard/services/SimpleKeyboardIME.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ class SimpleKeyboardIME : InputMethodService(), OnKeyboardActionListener, Shared
private fun updateBackgroundColors() {
val backgroundColor = safeStorageContext.getKeyboardBackgroundColor()
binding.keyboardHolder.setBackgroundColor(backgroundColor)
window.window?.updateNavigationBarColors(backgroundColor)
window.window?.setSystemBarsAppearance(backgroundColor)
}

private fun Bitmap.toIcon(): Icon {
Expand Down
23 changes: 15 additions & 8 deletions app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,28 @@
android:layout_width="match_parent"
android:layout_height="match_parent">

<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/main_toolbar"
<org.fossify.commons.views.MyAppBarLayout
android:id="@+id/main_appbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/color_primary"
app:menu="@menu/menu_main"
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
android:layout_height="wrap_content">

<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/main_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/color_primary"
app:menu="@menu/menu_main"
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />

</org.fossify.commons.views.MyAppBarLayout>

<androidx.core.widget.NestedScrollView
android:id="@+id/main_nested_scrollview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="?attr/actionBarSize"
android:fillViewport="true"
android:scrollbars="none">
android:scrollbars="none"
app:layout_behavior="@string/appbar_scrolling_view_behavior">

<RelativeLayout
android:id="@+id/main_holder"
Expand Down
25 changes: 16 additions & 9 deletions app/src/main/res/layout/activity_manage_clipboard_items.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,29 @@
android:layout_width="match_parent"
android:layout_height="match_parent">

<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/clipboard_toolbar"
<org.fossify.commons.views.MyAppBarLayout
android:id="@+id/clipboard_appbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/color_primary"
app:menu="@menu/menu_manage_clipboard_items"
app:title="@string/manage_clipboard_items"
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
android:layout_height="wrap_content">

<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/clipboard_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/color_primary"
app:menu="@menu/menu_manage_clipboard_items"
app:title="@string/manage_clipboard_items"
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />

</org.fossify.commons.views.MyAppBarLayout>

<androidx.core.widget.NestedScrollView
android:id="@+id/clipboard_nested_scrollview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="?attr/actionBarSize"
android:fillViewport="true"
android:scrollbars="none">
android:scrollbars="none"
app:layout_behavior="@string/appbar_scrolling_view_behavior">

<RelativeLayout
android:id="@+id/suggestions_items_holder"
Expand Down
23 changes: 15 additions & 8 deletions app/src/main/res/layout/activity_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,28 @@
android:layout_width="match_parent"
android:layout_height="match_parent">

<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/settings_toolbar"
<org.fossify.commons.views.MyAppBarLayout
android:id="@+id/settings_appbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/color_primary"
app:title="@string/settings"
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
android:layout_height="wrap_content">

<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/settings_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/color_primary"
app:title="@string/settings"
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />

</org.fossify.commons.views.MyAppBarLayout>

<androidx.core.widget.NestedScrollView
android:id="@+id/settings_nested_scrollview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="?attr/actionBarSize"
android:fillViewport="true"
android:scrollbars="none">
android:scrollbars="none"
app:layout_behavior="@string/appbar_scrolling_view_behavior">

<LinearLayout
android:id="@+id/settings_holder"
Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ detektCompose = "0.4.27"
#Room
room = "2.8.2"
#Fossify
commons = "5.3.0"
commons = "6.0.0"
#Gradle
gradlePlugins-agp = "8.11.1"
#build
app-build-compileSDKVersion = "34"
app-build-targetSDK = "34"
app-build-compileSDKVersion = "36"
app-build-targetSDK = "36"
app-build-minimumSDK = "26"
app-build-javaVersion = "VERSION_17"
app-build-kotlinJVMTarget = "17"
Expand Down
1 change: 1 addition & 0 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ dependencyResolutionManagement {
google()
mavenCentral()
maven { setUrl("https://jitpack.io") }
mavenLocal()
}
}
include(":app")