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

Commit 9e8cf5df authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

Material 3: Simplify cursor styling

parent 946219e8
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ import androidx.lifecycle.ViewModelProvider;
import com.nextcloud.android.sso.AccountImporter;
import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException;

import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.function.Function;

import it.niedermann.owncloud.notes.LockedActivity;
@@ -42,6 +44,7 @@ public class ManageAccountsActivity extends LockedActivity implements IManageAcc
    private ActivityManageAccountsBinding binding;
    private ManageAccountsViewModel viewModel;
    private ManageAccountAdapter adapter;
    private final Executor executor = Executors.newSingleThreadExecutor();

    @Override
    public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -138,7 +141,7 @@ public class ManageAccountsActivity extends LockedActivity implements IManageAcc
                .setNeutralButton(android.R.string.cancel, null)
                .setPositiveButton(R.string.action_edit_save, (v, d) -> {
                    final var property = editText.getText().toString();
                    new Thread(() -> {
                    executor.execute(() -> {
                        try {
                            final var putSettingsCall = repository.putServerSettings(AccountImporter.getSingleSignOnAccount(this, localAccount.getAccountName()), settingsFactory.apply(property), getPreferredApiVersion(localAccount.getApiVersion()));
                            putSettingsCall.enqueue(new Callback<>() {
@@ -160,7 +163,7 @@ public class ManageAccountsActivity extends LockedActivity implements IManageAcc
                        } catch (NextcloudFilesAppAccountNotFoundException e) {
                            ExceptionDialogFragment.newInstance(e).show(getSupportFragmentManager(), ExceptionDialogFragment.class.getSimpleName());
                        }
                    }).start();
                    });
                })
                .show();
        try {
+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="?attr/colorPrimary"
    android:orientation="vertical">

    <com.google.android.material.appbar.AppBarLayout
@@ -27,7 +28,7 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:background="?attr/colorPrimary"
            app:tabIndicatorColor="@color/defaultBrand" />
            app:tabMode="fixed" />
    </com.google.android.material.appbar.AppBarLayout>

    <androidx.viewpager2.widget.ViewPager2
+0 −2
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@
                android:textAppearance="?android:attr/textAppearanceMedium"
                android:textColor="@color/fg_default"
                android:textIsSelectable="true"
                android:theme="@style/textViewStyle"
                tools:maxLength="200"
                tools:text="@tools:sample/lorem/random" />

@@ -66,7 +65,6 @@
                android:textAppearance="?android:attr/textAppearanceMedium"
                android:textColor="@color/fg_default"
                android:textIsSelectable="true"
                android:theme="@style/textViewStyle"
                tools:maxLength="300"
                tools:text="@tools:sample/lorem/random" />

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@
            android:paddingStart="@dimen/spacer_2x"
            android:paddingEnd="@dimen/spacer_2x"
            android:textColor="@color/fg_default"
            android:theme="@style/textViewStyle"
            tools:text="@tools:sample/lorem/random" />
    </ScrollView>

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@
                android:textAppearance="?android:attr/textAppearanceMedium"
                android:textColor="@color/fg_default"
                android:textIsSelectable="true"
                android:theme="@style/textViewStyle"
                tools:text="@tools:sample/lorem/random" />
        </ScrollView>
    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
Loading