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

Commit 5ed1be54 authored by Amit Kumar's avatar Amit Kumar
Browse files

Merge related to launcher@5913cdaa1c8095be0a3ca5972b96468be65f9940

parents 6f3ea004 5913cdaa

app/build.gradle

+3 −12
Original line number Diff line number Diff line 
apply plugin: 'com.android.application'

apply plugin: 'kotlin-android'

apply plugin: 'io.fabric'

android {

    compileSdkVersion rootProject.ext.compileSdkVersion
@@ -32,10 +31,6 @@ android { 


    }



    lintOptions {

        abortOnError false

    }



    // Always show the result of every unit test, even if it passes.

    testOptions.unitTests.all {

        testLogging {
@@ -49,15 +44,13 @@ android { 
}



dependencies {

    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"



    implementation 'me.relex:circleindicator:1.2.2@aar'

    implementation 'uk.co.chrisjenx:calligraphy:2.3.0'



    implementation 'org.cyanogenmod:platform.sdk:6.0'



    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.3'

    implementation 'com.google.firebase:firebase-core:15.0.2'

    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.5'

    implementation 'com.google.firebase:firebase-core:16.0.3'



    implementation 'org.greenrobot:eventbus:3.1.1'
@@ -78,7 +71,7 @@ dependencies { 
    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'



    // Okhttp

    implementation 'com.squareup.okhttp3:logging-interceptor:3.8.0'

    implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0'



    // Rx Relay

    implementation "com.jakewharton.rxrelay2:rxrelay:${rootProject.ext.rxRelayVersion}"
@@ -111,6 +104,4 @@ dependencies { 
repositories {

    mavenCentral()

}

apply plugin: 'kotlin-android-extensions'



apply plugin: 'com.google.gms.google-services'
 
 No newline at end of file

app/src/androidTest/java/org/indin/blisslaunchero/ExampleInstrumentedTest.java

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import android.support.test.runner.AndroidJUnit4; 
@RunWith(AndroidJUnit4.class)

public class ExampleInstrumentedTest {

    @Test

    public void useAppContext() throws Exception {

    public void useAppContext() {

        // Context of the app under test.

        Context appContext = InstrumentationRegistry.getTargetContext();

app/src/debug/res/values/strings.xml

0 → 100755
+3 −0
Original line number Diff line number Diff line 
<resources>

    <string name="app_name">Bliss Launcher (debug)</string>

</resources>

app/src/main/AndroidManifest.xml

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

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

          xmlns:tools="http://schemas.android.com/tools"

          package="org.indin.blisslaunchero">



    <uses-permission android:name="android.permission.SET_WALLPAPER"/>

    <!-- General -->

    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

    <uses-permission android:name="android.permission.WAKE_LOCK"/>

    <uses-permission android:name="android.permission.INTERNET"/>

    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>



    <!-- Weather -->

    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"

                     tools:ignore="ProtectedPermissions"/>

    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"

                     tools:ignore="ProtectedPermissions"/>

    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>

    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>



    <!-- General -->

    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

    <uses-permission android:name="android.permission.WAKE_LOCK"/>



    <protected-broadcast android:name="com.cyanogenmod.lockclock.action.FORCE_WEATHER_UPDATE"/>



    <uses-permission android:name="cyanogenmod.permission.ACCESS_WEATHER_MANAGER"/>

    <uses-permission android:name="cyanogenmod.permission.READ_WEATHER"/>



    <application

        android:name=".BlissLauncher"

        android:allowBackup="true"

        android:icon="@mipmap/ic_launcher"

        android:label="@string/app_name"

        android:supportsRtl="true"

        android:theme="@style/AppTheme">

        android:theme="@style/AppTheme"

        tools:ignore="AllowBackup,GoogleAppIndexingWarning">

        <activity

            android:name=".features.launcher.LauncherActivity"

            android:clearTaskOnLaunch="true"

app/src/main/java/org/indin/blisslaunchero/features/launcher/AllAppsList.java

+5 −4
Original line number Diff line number Diff line
@@ -15,17 +15,18 @@ 
 */

package org.indin.blisslaunchero.features.launcher;



import org.indin.blisslaunchero.framework.database.model.AppItem;



import java.util.LinkedHashMap;

import java.util.List;



import org.indin.blisslaunchero.framework.database.model.AppItem;



public class AllAppsList {



    public LinkedHashMap<String, AppItem> launchableApps;

    public List<String> defaultPinnedAppsPackages;



    public AllAppsList(LinkedHashMap<String, AppItem> launchableApps, List<String> defaultPinnedAppsPackages){

    public AllAppsList(LinkedHashMap<String, AppItem> launchableApps,

            List<String> defaultPinnedAppsPackages) {

        this.launchableApps = launchableApps;

        this.defaultPinnedAppsPackages = defaultPinnedAppsPackages;

    }