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

Commit 33a4d356 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

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

Integrate elib

See merge request !24
parents 9be6b933 c63cafea

build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ allprojects { 
        google()

        jcenter()

        maven { url "https://jitpack.io" }

        maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven'}

    }

}

gradle.properties

+1 −1
Original line number Diff line number Diff line 
COMPILE_SDK_VERSION=29

MIN_SDK_VERSION=19

MIN_SDK_VERSION=21

TARGET_SDK_VERSION=29

VERSION_OVERRIDE=0

android.enableJetifier=true

opentasks/build.gradle

+1 −4
Original line number Diff line number Diff line
@@ -60,9 +60,6 @@ android { 
        sourceCompatibility JavaVersion.VERSION_1_8

        targetCompatibility JavaVersion.VERSION_1_8

    }

    aaptOptions{

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

    }

}



dependencies {
@@ -95,7 +92,7 @@ dependencies { 
    androidTestImplementation deps.support_test_runner

    androidTestImplementation deps.support_test_rules

    implementation project(path: ':opentaskspal')

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

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



}

opentasks/e-ui-sdk.jar

deleted100644 → 0
−122 KiB

File deleted.

View file

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

+1 −3
Original line number Diff line number Diff line
@@ -369,7 +369,6 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C 
        }



        ACCENT_COLOR = fetchAccentColor(this);

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



    }
@@ -841,8 +840,7 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C 
        //getSupportActionBar().setBackgroundDrawable(new ColorDrawable(color_accent));

        getSupportActionBar().getThemedContext();

        toolbar.setTitleTextColor(color_default_primary_text);

        setOverflowButtonColor(toolbar, ACCENT_COLOR);



        toolbar.setOverflowIcon(ContextCompat.getDrawable(context, R.drawable.e_ic_more));

        return ACCENT_COLOR;

    }