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

Commit 4eb2f7c4 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '6685-Fix_accent_color_issue' into 'main' 

6685-Fix_accent_color_issue

See merge request !34
parents f2dc0cab 55a7a40d

app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java

+0 −5
Original line number Diff line number Diff line
@@ -25,11 +25,6 @@ public abstract class BrandedActivity extends AppCompatActivity implements Brand 
    @ColorInt

    protected int colorAccent;



    public static void applyBrandToFAB(@ColorInt int mainColor, @ColorInt int textColor, @NonNull FloatingActionButton fab) {

        fab.setSupportBackgroundTintList(ColorStateList.valueOf(mainColor));

        fab.setColorFilter(textColor);

    }



    @Override

    protected void onStart() {

        super.onStart();

app/src/main/java/it/niedermann/owncloud/notes/edit/SearchableBaseNoteFragment.java

+0 −2
Original line number Diff line number Diff line
@@ -295,7 +295,5 @@ public abstract class SearchableBaseNoteFragment extends BaseNoteFragment { 
    public void applyBrand(int mainColor, int textColor) {

        this.mainColor = mainColor;

        this.textColor = textColor;

        BrandedActivity.applyBrandToFAB(mainColor, textColor, getSearchPrevButton());

        BrandedActivity.applyBrandToFAB(mainColor, textColor, getSearchNextButton());

    }

}

app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java

+3 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ public class ImportAccountActivity extends AppCompatActivity { 
        binding.welcomeText.setText(getString(R.string.welcome_text, getString(R.string.app_name)));

        binding.addButton.setOnClickListener((v) -> {

            binding.addButton.setEnabled(false);

            binding.addButton.setVisibility(View.INVISIBLE);

            binding.status.setVisibility(View.GONE);

            try {

                AccountImporter.pickNewAccount(this);
@@ -70,6 +71,7 @@ public class ImportAccountActivity extends AppCompatActivity { 
                e.printStackTrace();

            } catch (AndroidGetAccountsPermissionNotGranted e) {

                binding.addButton.setEnabled(true);

                binding.addButton.setVisibility(View.VISIBLE);

                AccountImporter.requestAndroidAccountPermissionsAndPickAccount(this);

            }

        });
@@ -171,6 +173,7 @@ public class ImportAccountActivity extends AppCompatActivity { 
    private void restoreCleanState() {

        runOnUiThread(() -> {

            binding.addButton.setEnabled(true);

            binding.addButton.setVisibility(View.VISIBLE);

            binding.progressCircular.setVisibility(View.GONE);

            binding.progressText.setVisibility(View.GONE);

        });

app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java

+0 −1
Original line number Diff line number Diff line
@@ -595,7 +595,6 @@ public class MainActivity extends LockedActivity implements NoteClickListener, A 
    @Override

    public void applyBrand(int mainColor, int textColor) {

        applyBrandToPrimaryToolbar(activityBinding.appBar, activityBinding.searchToolbar);

        applyBrandToFAB(mainColor, textColor, activityBinding.fabCreate);



        binding.headerView.setBackgroundColor(mainColor);

        binding.appName.setTextColor(textColor);

app/src/main/res/drawable/ic_keyboard_arrow_up_white_24dp.xml

+5 −6
Original line number Diff line number Diff line 
<vector android:autoMirrored="true"

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:tint="#FFFFFF"

    android:viewportHeight="24.0"

    android:autoMirrored="true"

    android:viewportWidth="24.0"

    android:width="24dp"

    xmlns:android="http://schemas.android.com/apk/res/android">

    android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:fillColor="#FFFFFF"

        android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z" />

</vector>