Merge branch 'develop' with a fix #19 (d6032a96) · Commits · e / os / BlissLauncher

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

+19 −4

Original line number	Diff line number	Diff line
		/*
		* Copyright 2018 /e/.
		*
		* 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.
		*/
		package org.indin.blisslaunchero;

		import android.content.Context;
		import android.support.test.InstrumentationRegistry;
		import android.support.test.runner.AndroidJUnit4;
		import static org.junit.Assert.*;

		import org.junit.Test;
		import org.junit.runner.RunWith;

		import static org.junit.Assert.*;
		import android.content.Context;
		import android.support.test.InstrumentationRegistry;
		import android.support.test.runner.AndroidJUnit4;

		/**
		* Instrumentation test, which will execute on an Android device.

app/src/main/java/org/indin/blisslaunchero/BlissLauncher.java

+22 −8

Original line number	Diff line number	Diff line
		/*
		* Copyright 2018 /e/.
		*
		* 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.
		*/
		package org.indin.blisslaunchero;

		import android.app.Application;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		import android.content.ServiceConnection;
		import android.os.IBinder;
		import android.util.Log;

		import org.indin.blisslaunchero.features.launcher.AppProvider;
		import org.indin.blisslaunchero.features.weather.DeviceStatusService;
		import org.indin.blisslaunchero.features.weather.WeatherSourceListenerService;
		@@ -16,6 +23,13 @@ import org.indin.blisslaunchero.features.weather.WeatherUtils;
		import org.indin.blisslaunchero.framework.DeviceProfile;
		import org.indin.blisslaunchero.framework.IconsHandler;

		import android.app.Application;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		import android.content.ServiceConnection;
		import android.os.IBinder;
		import android.util.Log;
		import uk.co.chrisjenx.calligraphy.CalligraphyConfig;

		public class BlissLauncher extends Application {

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

+17 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright 2018 /e/.
		*
		* 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.
		*/
		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;

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

+18 −3

Original line number	Diff line number	Diff line
		/*
		* Copyright 2018 /e/.
		*
		* 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.
		*/
		package org.indin.blisslaunchero.features.launcher;

		import org.indin.blisslaunchero.framework.broadcast.PackageAddedRemovedHandler;
		import org.indin.blisslaunchero.framework.utils.UserHandle;

		import android.app.Service;
		import android.content.Context;
		import android.content.Intent;
		@@ -12,9 +30,6 @@ import android.os.UserManager;
		import android.support.annotation.Nullable;
		import android.util.Log;

		import org.indin.blisslaunchero.framework.broadcast.PackageAddedRemovedHandler;
		import org.indin.blisslaunchero.framework.utils.UserHandle;

		public class AppProvider extends Service implements Provider {

		private AllAppsList mAllAppsList;

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

+17 −3

Original line number	Diff line number	Diff line
		/*
		* Copyright 2018 /e/.
		*
		* 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.
		*/
		package org.indin.blisslaunchero.features.launcher;

		import android.util.Log;

		import com.jakewharton.rxrelay2.BehaviorRelay;

		import android.util.Log;

		public class AppsRepository {

		private static final String TAG = "AppsRepository";
		@@ -31,4 +46,3 @@ public class AppsRepository {
		return appsRelay;
		}
		}