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

Commit 0857203e authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'issue_1868' into 'master' 

Issue 1868

See merge request e/apps/tasks!15
parents b2e06592 9f54e707

opentasks/build.gradle

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ android { 
        versionCode gitCommitNo('refs/remotes/origin/master') * 99 + gitCommitNo('HEAD') + Integer.parseInt(VERSION_OVERRIDE)

        versionName version

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"



        vectorDrawables.useSupportLibrary = true



    }

    if (project.hasProperty("DMFS_RELEASE_KEYSTORE")) {

        signingConfigs {

opentasks/src/main/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ 


        <activity

                android:name=".AboutActivity"

                android:label="@string/title_activity_settings"

                android:label="@string/title_activity_about"

                android:parentActivityName=".TaskListActivity"

                android:theme="@style/AppTheme">

            <meta-data

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

+7 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ import android.app.ActionBar; 
import android.content.Context;

import android.graphics.Color;

import android.graphics.PorterDuff;

import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.os.Build;

import android.os.Bundle;
@@ -30,15 +31,20 @@ public class AboutActivity extends BaseActivity { 
        setContentView(R.layout.activity_about);



        getSupportActionBar().setDisplayHomeAsUpEnabled(true);

        //getSupportActionBar().setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.color_default_blue1)));



        getFragmentManager()

                .beginTransaction()

                .replace(R.id.about_container,

                        new AboutFragment())

                .commit();

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

        getSupportActionBar().setHomeAsUpIndicator(changeBackArrowColor(this, R.color.color_default_blue1));

        String title=getResources().getString(R.string.title_activity_about);

        getSupportActionBar().setTitle(Html.fromHtml("<font color='#007FFF'>"+title+" </font>"));

        getSupportActionBar().getThemedContext();



       // getSupportActionBar().setTitle(Html.fromHtml("<font color='#ffffff'> About </font>"));





    }

    public static Drawable changeBackArrowColor(Context context, int color) {
@@ -47,7 +53,6 @@ public class AboutActivity extends BaseActivity { 


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

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

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



import android.graphics.drawable.ColorDrawable;

import android.os.Bundle;

import android.preference.PreferenceFragment;

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

+4 −3
Original line number Diff line number Diff line
@@ -221,8 +221,7 @@ public class QuickAddDialogFragment extends SupportDialogFragment 
        }



        mColorBackground = view.findViewById(R.id.color_background);

        mColorBackground.setBackgroundColor(TaskListActivity.ACCENT_COLOR);



        mColorBackground.setBackgroundColor(mLastColor);



        mListSpinner = (Spinner) view.findViewById(R.id.task_list_spinner);

        mTaskListAdapter = new TasksListCursorSpinnerAdapter(getActivity(), R.layout.list_spinner_item_selected_quick_add, R.layout.list_spinner_item_dropdown);
@@ -328,8 +327,10 @@ public class QuickAddDialogFragment extends SupportDialogFragment 
    {

        Cursor c = (Cursor) parent.getItemAtPosition(position);

        mLastColor = TaskFieldAdapters.LIST_COLOR.get(c);

        mColorBackground.setBackgroundColor(TaskListActivity.ACCENT_COLOR);

        mColorBackground.setBackgroundColor(mLastColor);

        mSelectedListId = id;





    }