Skip to content

Commit eea5a27

Browse files
Merge pull request #15430 from nextcloud/release/version-bumps-3.33.0
add: version bumps to android 8.1
2 parents b11093e + 0fc6617 commit eea5a27

File tree

6 files changed

+17
-55
lines changed

6 files changed

+17
-55
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ android {
110110

111111
defaultConfig {
112112
applicationId = "com.nextcloud.client"
113-
minSdk = 26
113+
minSdk = 27
114114
targetSdk = 35
115115
compileSdk = 35
116116

app/src/androidTest/java/com/owncloud/android/datamodel/ContentResolverHelperIT.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ class ContentResolverHelperIT {
4343
}
4444

4545
@Test
46-
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
4746
fun contentResolver_onAndroid26_usesNewAPI() {
4847
ContentResolverHelper
4948
.queryResolver(resolver, URI, PROJECTION, SELECTION, null, SORT_COLUMN, SORT_DIRECTION, LIMIT)

app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import android.graphics.Color
2222
import android.graphics.drawable.Drawable
2323
import android.net.Uri
2424
import android.os.AsyncTask
25-
import android.os.Build
2625
import android.os.Bundle
2726
import android.view.Menu
2827
import android.view.MenuItem
@@ -71,7 +70,6 @@ import com.nextcloud.client.media.ExoplayerListener
7170
import com.nextcloud.client.media.NextcloudExoPlayer.createNextcloudExoplayer
7271
import com.nextcloud.client.network.ClientFactory
7372
import com.nextcloud.client.network.ClientFactory.CreationException
74-
import com.nextcloud.common.NextcloudClient
7573
import com.nextcloud.ui.fileactions.FileAction
7674
import com.nextcloud.ui.fileactions.FileActionsBottomSheet.Companion.newInstance
7775
import com.nextcloud.ui.fileactions.FileActionsBottomSheet.ResultListener
@@ -146,16 +144,11 @@ class PreviewMediaActivity :
146144
private var videoMediaSession: MediaSession? = null
147145
private var audioMediaController: MediaController? = null
148146
private var mediaControllerFuture: ListenableFuture<MediaController>? = null
149-
private var nextcloudClient: NextcloudClient? = null
150147
private lateinit var windowInsetsController: WindowInsetsControllerCompat
151148

152149
override fun onCreate(savedInstanceState: Bundle?) {
153150
super.onCreate(savedInstanceState)
154151

155-
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O) {
156-
setTheme(R.style.Theme_ownCloud_Toolbar)
157-
}
158-
159152
binding = ActivityPreviewMediaBinding.inflate(layoutInflater)
160153
setContentView(binding.root)
161154

app/src/main/res/values-v27/styles.xml

Lines changed: 0 additions & 42 deletions
This file was deleted.

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@
3434
<item name="dialogCornerRadius">@dimen/dialogBorderRadius</item>
3535
</style>
3636

37-
<style name="Theme.ownCloud" parent="BaseTheme.ownCloud" />
37+
<style name="Theme.ownCloud" parent="BaseTheme.ownCloud">
38+
<item name="android:windowLightNavigationBar">true</item>
39+
</style>
3840

3941
<style name="FallbackThemingThemeBase" parent="Theme.Material3.DayNight">
4042
<item name="actionModeBackground">@color/action_mode_background</item>
@@ -52,7 +54,9 @@
5254
<item name="dialogCornerRadius">@dimen/dialogBorderRadius</item>
5355
</style>
5456

55-
<style name="FallbackThemingTheme" parent="FallbackThemingThemeBase" />
57+
<style name="FallbackThemingTheme" parent="FallbackThemingThemeBase">
58+
<item name="android:windowLightNavigationBar">true</item>
59+
</style>
5660

5761
<style name="Widget.App.TextInputLayout" parent="Widget.Material3.TextInputLayout.OutlinedBox">
5862
<item name="materialThemeOverlay">@style/ThemeOverlay.App.TextInputLayout</item>
@@ -110,6 +114,7 @@
110114

111115
<style name="Theme.ownCloud.Toolbar.Drawer" parent="Theme.ownCloud.Toolbar.DrawerBase">
112116
<item name="android:navigationBarColor">@color/bg_default</item>
117+
<item name="android:windowLightNavigationBar">true</item>
113118
</style>
114119

115120
<style name="Theme.ownCloud.Toolbar.NullBackground" parent="BaseTheme.ownCloud.Toolbar">
@@ -128,7 +133,9 @@
128133
<item name="android:navigationBarColor">@color/primary</item>
129134
</style>
130135

131-
<style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.noActionBar.LoginBase" />
136+
<style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.noActionBar.LoginBase">
137+
<item name="android:windowLightNavigationBar">false</item>
138+
</style>
132139

133140
<style name="ownCloud.AlertDialog" parent="Theme.Material3.DayNight.Dialog.Alert">
134141
<item name="colorAccent">@color/color_accent</item>
@@ -235,6 +242,11 @@
235242
<item name="android:background">@color/grey_400</item>
236243
<item name="android:windowBackground">@color/grey_400</item>
237244
<item name="android:colorBackground">@color/grey_400</item>
245+
<item name="android:windowLightNavigationBar">false</item>
246+
</style>
247+
248+
<style name="Theme.ownCloud.Media" parent="Theme.Material3.DayNight.NoActionBar">
249+
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
238250
</style>
239251

240252
<style name="ToolbarStyle.Overflow" parent="@style/Widget.AppCompat.ActionButton.Overflow">

appscan/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ android {
2121
namespace = "com.nextcloud.appscan"
2222

2323
defaultConfig {
24-
minSdk = 26
24+
minSdk = 27
2525
targetSdk = 35
2626
compileSdk = 35
2727

0 commit comments

Comments
 (0)