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

Commit 68e873ce authored by Amit Kumar's avatar Amit Kumar 💻
Browse files

Merge branch 'icon_2220' into 'master' 

Icon 2220

See merge request e/apps/tasks!16
parents 0857203e c938a8fb

opentasks/src/main/java/org/dmfs/tasks/TaskListActivity.java

+27 −1
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ import android.view.View.OnClickListener; 
import android.view.Window;

import android.view.WindowManager;

import android.widget.EditText;

import android.widget.ImageView;

import android.widget.TextView;



import org.dmfs.android.bolts.color.Color;
@@ -284,6 +285,25 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C 
        setupTabIcons();







        mTabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {

            @Override

            public void onTabSelected(TabLayout.Tab tab) {

                tab.getIcon().setColorFilter(getResources().getColor(R.color.color_default_blue1), PorterDuff.Mode.SRC_IN);

            }



            @Override

            public void onTabUnselected(TabLayout.Tab tab) {

                tab.getIcon().setColorFilter(getResources().getColor(R.color.dark_gray), PorterDuff.Mode.SRC_IN);

            }



            @Override

            public void onTabReselected(TabLayout.Tab tab) {



            }

        });





        mViewPager.addOnPageChangeListener(new OnPageChangeListener() {



            @Override
@@ -344,7 +364,8 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C 
        }



        ACCENT_COLOR=fetchAccentColor(this);

        mFloatingActionButton.setBackgroundTintList(ColorStateList.valueOf(darkenColor20(color_default_blue1)));

        //mFloatingActionButton.setBackgroundTintList(ColorStateList.valueOf(darkenColor20(color_default_blue1)));

        mFloatingActionButton.setBackgroundTintList(ColorStateList.valueOf(color_default_blue1));



        this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
@@ -354,6 +375,7 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C 
    private void setupTabIcons() {

        for (int i = 0, count = mPagerAdapter.getCount(); i < count; ++i) {

            mTabs.getTabAt(i).setIcon(mPagerAdapter.getTabIcon(i));

            mTabs.getTabAt(i).getIcon().setColorFilter(getResources().getColor(R.color.dark_gray), PorterDuff.Mode.SRC_IN);

        }

    }
@@ -361,6 +383,7 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C 
    @Override

    protected void onResume() {

        updateTitle(mCurrentPageId);

        mTabs.getTabAt(mTabs.getSelectedTabPosition()).getIcon().setColorFilter(getResources().getColor(R.color.color_default_blue1), PorterDuff.Mode.SRC_IN);

        super.onResume();

    }
@@ -646,6 +669,9 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C 
        });

        SearchView searchView = (SearchView) MenuItemCompat.getActionView(mSearchItem);

        EditText searchText=(EditText) searchView.findViewById(R.id.search_src_text);

        ImageView searchClose = searchView.findViewById(R.id.search_close_btn);

        searchClose.setImageResource(R.drawable.ic_close);



        searchText.setHintTextColor(getResources().getColor(R.color.dark_gray));

        searchText.setTextColor(getResources().getColor(R.color.color_default_primary_text));

        searchText.setBackground(ContextCompat.getDrawable(this, R.drawable.rounded_edittext));

opentasks/src/main/res/color/tab_icon.xml

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

<!--

  ~ Copyright 2020 dmfs GmbH

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~     http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->





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

    <item android:color="@color/color_default_blue1" android:state_selected="true"/>

    <item android:color="@color/dark_gray"/>

</selector>
 
 No newline at end of file

opentasks/src/main/res/drawable/ic_arrow_back.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright 2020 dmfs GmbH

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~     http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="@color/color_default_primary_text">

  <path

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

      android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>

</vector>

opentasks/src/main/res/drawable/ic_close.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright 2020 dmfs GmbH

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~     http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="@color/color_default_primary_text">

  <path

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

      android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>

</vector>

opentasks/src/main/res/drawable/text_cursor_white.xml

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

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

        android:shape="rectangle">

    <solid android:color="#FFFFFF"/>

    <solid android:color="@color/color_default_primary_text"/>

    <size android:width="1dp"/>

</shape>
 
 No newline at end of file