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

Commit f54340e1 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch 'epic34-s-app_redesign' into 'master' 

Integrate elib

See merge request !26
parents 0fa8bd43 7ce7c702

app/build.gradle

+1 −5
Original line number Diff line number Diff line
@@ -30,14 +30,9 @@ android { 
        enabled = true

    }



    aaptOptions {

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

    }



}



dependencies {

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



    implementation project(':cert4android')
@@ -60,4 +55,5 @@ dependencies { 
    implementation "com.google.android.material:material:1.0.0"



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

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

}

app/src/main/java/foundation/e/notes/android/activity/NotesListViewActivity.java

+7 −7
Original line number Diff line number Diff line
@@ -339,10 +339,10 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap 
        drawerToggle = new ActionBarDrawerToggle(this, drawerLayout, toolbar, R.string.action_drawer_open, R.string.action_drawer_close);

        drawerToggle.setDrawerIndicatorEnabled(false);

        drawerLayout.addDrawerListener(drawerToggle);

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

        drawerToggle.setHomeAsUpIndicator(R.drawable.e_ic_hamburger);



        if (toolbar.getNavigationIcon() != null)

            toolbar.getNavigationIcon().setTint(ContextCompat.getColor(this, lineageos.platform.R.color.color_default_accent));

            toolbar.getNavigationIcon().setTint(ContextCompat.getColor(this, R.color.e_primary_text_color));



        drawerToggle.setToolbarNavigationClickListener(new View.OnClickListener() {

            @Override
@@ -389,8 +389,8 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap 
    }



    private void setupNavigationList(final String selectedItem) {

        itemRecent = new NavigationAdapter.NavigationItem(ADAPTER_KEY_RECENT, getString(R.string.label_all_notes), null, lineageos.platform.R.drawable.ic_recent);

        itemFavorites = new NavigationAdapter.NavigationItem(ADAPTER_KEY_STARRED, getString(R.string.label_favorites), null, lineageos.platform.R.drawable.ic_star_filled);

        itemRecent = new NavigationAdapter.NavigationItem(ADAPTER_KEY_RECENT, getString(R.string.label_all_notes), null, R.drawable.ic_access_time_grey600_24dp);

        itemFavorites = new NavigationAdapter.NavigationItem(ADAPTER_KEY_STARRED, getString(R.string.label_favorites), null, R.drawable.ic_star_yellow_24dp);

        adapterCategories = new NavigationAdapter(new NavigationAdapter.ClickListener() {

            @Override

            public void onItemClick(NavigationAdapter.NavigationItem item) {
@@ -524,9 +524,9 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap 
    }



    private void setupNavigationMenu() {

        final NavigationAdapter.NavigationItem itemTrashbin = new NavigationAdapter.NavigationItem("trashbin", getString(R.string.action_trashbin), null, lineageos.platform.R.drawable.ic_bin);

        final NavigationAdapter.NavigationItem itemSettings = new NavigationAdapter.NavigationItem("settings", getString(R.string.action_settings), null, lineageos.platform.R.drawable.ic_settings);

        final NavigationAdapter.NavigationItem itemAbout = new NavigationAdapter.NavigationItem("about", getString(R.string.simple_about), null, lineageos.platform.R.drawable.ic_info);

        final NavigationAdapter.NavigationItem itemTrashbin = new NavigationAdapter.NavigationItem("trashbin", getString(R.string.action_trashbin), null, R.drawable.ic_delete_grey600_24dp);

        final NavigationAdapter.NavigationItem itemSettings = new NavigationAdapter.NavigationItem("settings", getString(R.string.action_settings), null, R.drawable.ic_settings_grey600_24dp);

        final NavigationAdapter.NavigationItem itemAbout = new NavigationAdapter.NavigationItem("about", getString(R.string.simple_about), null, R.drawable.ic_info_outline_grey600_24dp);



        ArrayList<NavigationAdapter.NavigationItem> itemsMenu = new ArrayList<>();

        itemsMenu.add(itemTrashbin);

app/src/main/java/foundation/e/notes/model/ItemAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ public class ItemAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> { 
            nvHolder.noteCategory.setText(Html.fromHtml(note.getCategory()));

            nvHolder.noteExcerpt.setText(Html.fromHtml(note.getExcerpt()));

            nvHolder.noteStatus.setVisibility(DBStatus.VOID.equals(note.getStatus()) ? View.INVISIBLE : View.VISIBLE);

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

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

            nvHolder.noteFavorite.setOnClickListener(new View.OnClickListener() {

                @Override

                public void onClick(View view) {

app/src/main/java/foundation/e/notes/model/NavigationAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import foundation.e.notes.util.NoteUtil; 
public class NavigationAdapter extends RecyclerView.Adapter<NavigationAdapter.ViewHolder> {



    @DrawableRes

    public static final int ICON_FOLDER = lineageos.platform.R.drawable.ic_folder;

    public static final int ICON_FOLDER = R.drawable.ic_folder_grey600_24dp;

    @DrawableRes

    public static final int ICON_NOFOLDER = R.drawable.ic_folder_open_grey600_24dp;

    @DrawableRes

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

+22 −6
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright Murena SAS 2022

  ~ This program is free software: you can redistribute it and/or modify

  ~ it under the terms of the GNU General Public License as published by

  ~ the Free Software Foundation, either version 3 of the License, or

  ~ (at your option) any later version.

  ~

  ~ This program is distributed in the hope that it will be useful,

  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of

  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  ~ GNU General Public License for more details.

  ~

  ~ You should have received a copy of the GNU General Public License

  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.

  -->

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

    android:width="24dp"

    android:height="24dp"

    android:autoMirrored="true"

    android:tint="#cccccc"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0">

    android:tint="@color/e_icon_color"

    android:viewportWidth="48.0"

    android:viewportHeight="48.0">

    <path

        android:fillColor="#FFcccccc"

        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z" />

        android:fillColor="@android:color/white"

        android:pathData="M16.15,37.75 L24,33.05 31.85,37.8 29.75,28.9 36.65,22.9 27.55,22.1 24,13.7 20.45,22.05 11.35,22.85 18.25,28.85ZM11.65,44 L14.9,29.95 4,20.5 18.4,19.25 24,6 29.6,19.25 44,20.5 33.1,29.95 36.35,44 24,36.55ZM24,26.25Z"/>

</vector>
 
 No newline at end of file