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

Commit d2940f10 authored by Nishith Khanna's avatar Nishith Khanna Committed by Fahim Salam Chowdhury
Browse files

Theme app according to our palette

parent f75fae78

app/build.gradle

+1 −4
Original line number Diff line number Diff line
@@ -50,14 +50,10 @@ android { 
    }

    namespace 'it.niedermann.owncloud.notes'



    aaptOptions {

        additionalParameters '-I', 'e-ui-sdk.jar'

    }

}



dependencies {

    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6'

    compileOnly files("../e-ui-sdk.jar")



    // Nextcloud SSO

    implementation 'com.github.nextcloud:Android-SingleSignOn:0.6.1'
@@ -105,4 +101,5 @@ dependencies { 
    testImplementation 'org.robolectric:robolectric:4.9'



    implementation fileTree(dir: 'libs', include: ['*.jar'])

    implementation 'foundation.e:elib:0.0.1-alpha11'

}

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

+2 −2
Original line number Diff line number Diff line
@@ -404,11 +404,11 @@ public class MainActivity extends LockedActivity implements NoteClickListener, A 


        final var toggle = new ActionBarDrawerToggle(this, binding.drawerLayout, activityBinding.homeToolbar, 0, 0);

        binding.drawerLayout.addDrawerListener(toggle);

        toggle.setHomeAsUpIndicator(lineageos.platform.R.drawable.ic_hamburger);

        toggle.setHomeAsUpIndicator(R.drawable.e_ic_hamburger);

        toggle.syncState();



        if (binding.activityNotesListView.searchToolbar.getNavigationIcon() != null) {

            binding.activityNotesListView.searchToolbar.getNavigationIcon().setTint(ContextCompat.getColor(this, lineageos.platform.R.color.color_default_accent));

            binding.activityNotesListView.searchToolbar.getNavigationIcon().setTint(ContextCompat.getColor(this, R.color.e_primary_text_color));

        }



        toggle.setToolbarNavigationClickListener(view -> binding.drawerLayout.openDrawer(GravityCompat.START));

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

+2 −2
Original line number Diff line number Diff line
@@ -318,8 +318,8 @@ public class MainViewModel extends AndroidViewModel { 


    private static List<NavigationItem> fromCategoriesWithNotesCount(@NonNull Context context, @Nullable String expandedCategory, @NonNull List<CategoryWithNotesCount> fromDatabase, int count, int favoritesCount) {

        final var categories = convertToCategoryNavigationItem(context, fromDatabase);

        final var itemRecent = new NavigationItem(ADAPTER_KEY_RECENT, context.getString(R.string.label_all_notes), count, lineageos.platform.R.drawable.ic_recent, RECENT);

        final var itemFavorites = new NavigationItem(ADAPTER_KEY_STARRED, context.getString(R.string.label_favorites), favoritesCount, lineageos.platform.R.drawable.ic_star_filled, FAVORITES);

        final var itemRecent = new NavigationItem(ADAPTER_KEY_RECENT, context.getString(R.string.label_all_notes), count, R.drawable.ic_access_time_grey600_24dp, RECENT);

        final var itemFavorites = new NavigationItem(ADAPTER_KEY_STARRED, context.getString(R.string.label_favorites), favoritesCount, R.drawable.ic_star_yellow_24dp, FAVORITES);



        final var items = new ArrayList<NavigationItem>(fromDatabase.size() + 3);

        items.add(itemRecent);

app/src/main/java/it/niedermann/owncloud/notes/main/items/NoteViewHolder.java

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ public abstract class NoteViewHolder extends RecyclerView.ViewHolder { 
    }



    protected void bindFavorite(@NonNull ImageView noteFavorite, boolean isFavorite) {

        noteFavorite.setImageResource(isFavorite ? lineageos.platform.R.drawable.ic_star_filled : lineageos.platform.R.drawable.ic_star);

        noteFavorite.setImageResource(isFavorite ? R.drawable.ic_star_yellow_24dp : R.drawable.ic_star_grey_ccc_24dp);

        noteFavorite.setOnClickListener(view -> noteClickListener.onNoteFavoriteClick(getLayoutPosition(), view));

    }

app/src/main/java/it/niedermann/owncloud/notes/main/menu/MenuAdapter.java

+3 −3
Original line number Diff line number Diff line
@@ -31,9 +31,9 @@ public class MenuAdapter extends RecyclerView.Adapter<MenuViewHolder> { 
    public MenuAdapter(@NonNull Context context, @NonNull Account account, int settingsRequestCode, @NonNull Consumer<MenuItem> onClick) {

        this.menuItems = new MenuItem[]{

                new MenuItem(new Intent(context, FormattingHelpActivity.class), R.string.action_formatting_help, R.drawable.ic_baseline_help_outline_24),

                new MenuItem(generateTrashbinIntent(context, account), R.string.action_trashbin, lineageos.platform.R.drawable.ic_bin),

                new MenuItem(new Intent(context, PreferencesActivity.class), settingsRequestCode, R.string.action_settings, lineageos.platform.R.drawable.ic_settings),

                new MenuItem(new Intent(context, AboutActivity.class), R.string.simple_about, lineageos.platform.R.drawable.ic_info)

                new MenuItem(generateTrashbinIntent(context, account), R.string.action_trashbin, R.drawable.ic_delete_grey600_24dp),

                new MenuItem(new Intent(context, PreferencesActivity.class), settingsRequestCode, R.string.action_settings, R.drawable.ic_settings_grey600_24dp),

                new MenuItem(new Intent(context, AboutActivity.class), R.string.simple_about, R.drawable.ic_info_outline_grey600_24dp)

        };

        this.onClick = onClick;

        setHasStableIds(true);