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

Commit 83a5b7da authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'issue_1868' into 'master' 

Issue 1868

See merge request e/apps/tasks!14
parents 45b514a6 2292c85c

opentasks/build.gradle

+5 −0
Original line number Diff line number Diff line
@@ -57,6 +57,9 @@ android { 
        sourceCompatibility JavaVersion.VERSION_1_8

        targetCompatibility JavaVersion.VERSION_1_8

    }

    aaptOptions{

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

    }

}



dependencies {
@@ -89,6 +92,8 @@ dependencies { 
    androidTestImplementation deps.support_test_runner

    androidTestImplementation deps.support_test_rules

    implementation project(path: ':opentaskspal')

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



}



if (project.hasProperty('PLAY_STORE_SERVICE_ACCOUNT_CREDENTIALS')) {

opentasks/e-ui-sdk.jar

0 → 100644
+116 KiB

File added.

No diff preview for this file type.

View file

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

+32 −0
Original line number Diff line number Diff line 
package org.dmfs.tasks;



import android.app.ActionBar;

import android.content.Context;

import android.graphics.Color;

import android.graphics.PorterDuff;

import android.graphics.drawable.Drawable;

import android.os.Build;

import android.os.Bundle;

import android.text.Html;

import android.widget.TextView;



import org.dmfs.tasks.utils.BaseActivity;



import androidx.appcompat.app.AppCompatActivity;

import androidx.appcompat.widget.Toolbar;

import androidx.core.graphics.drawable.DrawableCompat;



import static org.dmfs.tasks.TaskListActivity.color_default_primary_text;





public class AboutActivity extends BaseActivity {









    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);
@@ -18,8 +36,22 @@ public class AboutActivity extends BaseActivity { 
                .replace(R.id.about_container,

                        new AboutFragment())

                .commit();

        getSupportActionBar().setHomeAsUpIndicator(changeBackArrowColor(this, Color.rgb(50, 50, 50)));

        getSupportActionBar().getThemedContext();





    }

    public static Drawable changeBackArrowColor(Context context, int color) {

        String resName;

        int res;



        resName = Build.VERSION.SDK_INT >= 23 ? "abc_ic_ab_back_material" : "abc_ic_ab_back_mtrl_am_alpha";

        res = context.getResources().getIdentifier(resName, "drawable", context.getPackageName());



        final Drawable upArrow = context.getResources().getDrawable(res);

        upArrow.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);



        return upArrow;

    }



}

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

+48 −16
Original line number Diff line number Diff line
@@ -23,7 +23,9 @@ import android.content.Intent; 
import android.content.res.ColorStateList;

import android.content.res.TypedArray;



import android.graphics.PorterDuff;

import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.net.Uri;

import android.os.Build;

import android.os.Build.VERSION;
@@ -39,6 +41,8 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton; 
import com.google.android.material.tabs.TabLayout;



import androidx.appcompat.view.ContextThemeWrapper;

import androidx.core.content.ContextCompat;

import androidx.core.graphics.drawable.DrawableCompat;

import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentManager;

import androidx.core.view.MenuItemCompat;
@@ -49,6 +53,7 @@ import androidx.appcompat.widget.SearchView; 
import androidx.appcompat.widget.SearchView.OnQueryTextListener;

import androidx.appcompat.widget.Toolbar;



import android.text.Html;

import android.util.Log;

import android.util.TypedValue;

import android.view.Menu;
@@ -58,8 +63,11 @@ import android.view.View; 
import android.view.View.OnClickListener;

import android.view.Window;

import android.view.WindowManager;

import android.widget.EditText;

import android.widget.TextView;



import org.dmfs.android.bolts.color.Color;

import org.dmfs.android.bolts.color.colors.AccentColor;

import org.dmfs.android.bolts.color.colors.PrimaryColor;

import org.dmfs.android.bolts.color.elementary.ValueColor;

import org.dmfs.android.retentionmagic.annotations.Retain;
@@ -189,7 +197,9 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C 


    private FloatingActionButton mFloatingActionButton;

    public static int ACCENT_COLOR;



    public static int color_default_blue1;

    public static int color_default_primary_text;

    Toolbar toolbar;



    @Override

    protected void onCreate(Bundle savedInstanceState) {
@@ -220,7 +230,7 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C 


        setContentView(R.layout.activity_task_list);

        mAppBarLayout = (AppBarLayout) findViewById(R.id.appbar);

        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);

        toolbar = (Toolbar) findViewById(R.id.toolbar);

        setSupportActionBar(toolbar);



        mAuthority = AuthorityUtil.taskAuthority(this);
@@ -333,8 +343,9 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C 
        }



        ACCENT_COLOR=fetchAccentColor(this);

        mTabs.setBackgroundColor(ACCENT_COLOR);

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

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



        this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);



    }
@@ -633,7 +644,10 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C 
            }

        });

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



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

        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));

        SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);

        if (null != searchManager) {

            searchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
@@ -707,15 +721,16 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C 
     * get Accent color from OS

     * */

    private int fetchAccentColor(Context context) {

//

//        TypedValue typedValue = new TypedValue();

//        ContextThemeWrapper contextThemeWrapper = new ContextThemeWrapper(this,

//                android.R.style.Theme_DeviceDefault);

//        contextThemeWrapper.getTheme().resolveAttribute(android.R.attr.colorAccent,

//                typedValue, true);

//        int color_accent = typedValue.data;

//        Log.e("TAG", "accent Colour  #"+Integer.toHexString(color_accent));



        TypedValue typedValue = new TypedValue();

        ContextThemeWrapper contextThemeWrapper = new ContextThemeWrapper(this,

                android.R.style.Theme_DeviceDefault);

        contextThemeWrapper.getTheme().resolveAttribute(android.R.attr.colorAccent,

                typedValue, true);

        int color_accent = typedValue.data;

        Log.e("TAG", "accent Colour  #"+Integer.toHexString(color_accent));



/*

        //change toolbar color

        getSupportActionBar().setBackgroundDrawable(

                new ColorDrawable(color_accent));
@@ -727,8 +742,16 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C 


            window.setStatusBarColor(darkenColor(color_accent));

        }

*/

        color_default_primary_text=ContextCompat.getColor(context, R.color.color_default_primary_text);

       ACCENT_COLOR=ContextCompat.getColor(context, R.color.accent);

        color_default_blue1=ContextCompat.getColor(context, R.color.color_default_blue1);

        //getSupportActionBar().setBackgroundDrawable(new ColorDrawable(color_accent));

        getSupportActionBar().getThemedContext();

        toolbar.setTitleTextColor(color_default_primary_text);

        setOverflowButtonColor(toolbar, color_default_primary_text);



        return color_accent;

        return ACCENT_COLOR;

    }



    @ColorInt int darkenColor(@ColorInt int color) {
@@ -743,4 +766,13 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C 
        hsv[2] *= 0.6f;

        return android.graphics.Color.HSVToColor(hsv);

    }



    public static void setOverflowButtonColor(final Toolbar toolbar, final int color) {

        Drawable drawable = toolbar.getOverflowIcon();

        if(drawable != null) {

            drawable = DrawableCompat.wrap(drawable);

            DrawableCompat.setTint(drawable.mutate(), color);

            toolbar.setOverflowIcon(drawable);

        }

    }

}

opentasks/src/main/java/org/dmfs/tasks/groupings/ByDueDate.java

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ public class ByDueDate extends AbstractGroupingFactory 
            if (title != null)

            {

                title.setText(getTitle(cursor, view.getContext()));

                title.setTextColor(TaskListActivity.ACCENT_COLOR);

                title.setTextColor(TaskListActivity.color_default_primary_text);

            }



            // set list elements