Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit ee76b0d1 authored by Alper Öztürk's avatar Alper Öztürk Committed by GitHub
Browse files

Merge pull request #2759 from nextcloud/backport/2756/stable-4.4

[stable-4.4] Update Common Lib
parents c35b095d 3858ae1b
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ dependencies {
    }

    // Nextcloud SSO
    implementation 'com.github.nextcloud.android-common:ui:48ed8e86d9'
    implementation 'com.github.nextcloud.android-common:ui:0.27.1'
    implementation 'com.github.nextcloud:Android-SingleSignOn:1.3.2'
	implementation "com.github.stefan-niedermann.android-commons:shared-preferences:$androidCommonsVersion"
	implementation "com.github.stefan-niedermann.android-commons:reactive-livedata:$androidCommonsVersion"
+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ public abstract class BrandedActivity extends AppCompatActivity implements Brand

    @Override
    protected void onCreate(@Nullable Bundle savedInstanceState) {
        AppCompatActivityExtensionsKt.adjustUIForAPILevel35(this);
        AppCompatActivityExtensionsKt.applyEdgeToEdgeWithSystemBarPadding(this);
        super.onCreate(savedInstanceState);
    }

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.forEach
import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope
import com.nextcloud.android.common.ui.util.extensions.adjustUIForAPILevel35
import com.nextcloud.android.common.ui.util.extensions.applyEdgeToEdgeWithSystemBarPadding
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch

@@ -43,7 +43,7 @@ abstract class BrandedFragment : Fragment(), Branded {
    override fun onCreate(savedInstanceState: Bundle?) {
        if (activity is AppCompatActivity) {
            val appCompatActivity = activity as AppCompatActivity
            appCompatActivity.adjustUIForAPILevel35()
            appCompatActivity.applyEdgeToEdgeWithSystemBarPadding()
        }
        super.onCreate(savedInstanceState)
    }
+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ public class ExceptionActivity extends AppCompatActivity {

    @Override
    protected void onCreate(@Nullable Bundle savedInstanceState) {
        AppCompatActivityExtensionsKt.adjustUIForAPILevel35(this);
        AppCompatActivityExtensionsKt.applyEdgeToEdgeWithSystemBarPadding(this);
        super.onCreate(savedInstanceState);

        final var binding = ActivityExceptionBinding.inflate(getLayoutInflater());
+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public class ImportAccountActivity extends AppCompatActivity {

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        AppCompatActivityExtensionsKt.adjustUIForAPILevel35(this);
        AppCompatActivityExtensionsKt.applyEdgeToEdgeWithSystemBarPadding(this);
        super.onCreate(savedInstanceState);

        Thread.currentThread().setUncaughtExceptionHandler(new ExceptionHandler(this));
Loading