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

Commit 6f3ea004 authored by Amit Kumar's avatar Amit Kumar
Browse files

Merge branch 'develop' after fixing lint warnings and modifying gitlab ci config file

parents eca5379e 8d6b210d

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ cache: 
build:

  stage: build

  script:

  - ./gradlew assembleDebug

  - ./gradlew build

  artifacts:

    paths:

    - app/build/outputs/apk

app/build.gradle

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ android { 


    }



    lintOptions {

        abortOnError false

    }



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

    testOptions.unitTests.all {

        testLogging {

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

+53 −55
Original line number Diff line number Diff line
@@ -17,12 +17,64 @@ package org.indin.blisslaunchero.features.launcher; 


import static android.view.View.GONE;

import static android.view.View.VISIBLE;



import static cyanogenmod.providers.WeatherContract.WeatherColumns.TempUnit.CELSIUS;

import static cyanogenmod.providers.WeatherContract.WeatherColumns.TempUnit.FAHRENHEIT;

import static cyanogenmod.providers.WeatherContract.WeatherColumns.WindSpeedUnit.KPH;

import static cyanogenmod.providers.WeatherContract.WeatherColumns.WindSpeedUnit.MPH;



import java.io.IOException;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.HashSet;

import java.util.LinkedHashMap;

import java.util.List;

import java.util.Locale;

import java.util.Map;

import java.util.Set;

import java.util.UUID;

import java.util.concurrent.TimeUnit;



import org.greenrobot.eventbus.EventBus;

import org.greenrobot.eventbus.Subscribe;

import org.greenrobot.eventbus.ThreadMode;

import org.indin.blisslaunchero.BlissLauncher;

import org.indin.blisslaunchero.R;

import org.indin.blisslaunchero.features.notification.NotificationRepository;

import org.indin.blisslaunchero.features.notification.NotificationService;

import org.indin.blisslaunchero.features.suggestions.AutoCompleteAdapter;

import org.indin.blisslaunchero.features.suggestions.AutoCompleteService;

import org.indin.blisslaunchero.features.suggestions.AutoCompleteServiceResult;

import org.indin.blisslaunchero.features.usagestats.AppUsageStats;

import org.indin.blisslaunchero.features.weather.ForecastBuilder;

import org.indin.blisslaunchero.features.weather.WeatherIconUtils;

import org.indin.blisslaunchero.features.weather.WeatherPreferences;

import org.indin.blisslaunchero.features.weather.WeatherUpdateService;

import org.indin.blisslaunchero.framework.Alarm;

import org.indin.blisslaunchero.framework.DeviceProfile;

import org.indin.blisslaunchero.framework.Preferences;

import org.indin.blisslaunchero.framework.Utilities;

import org.indin.blisslaunchero.framework.customviews.BlissDragShadowBuilder;

import org.indin.blisslaunchero.framework.customviews.BlissFrameLayout;

import org.indin.blisslaunchero.framework.customviews.BlissInput;

import org.indin.blisslaunchero.framework.customviews.CustomAnalogClock;

import org.indin.blisslaunchero.framework.customviews.HorizontalPager;

import org.indin.blisslaunchero.framework.customviews.SquareFrameLayout;

import org.indin.blisslaunchero.framework.customviews.SquareImageView;

import org.indin.blisslaunchero.framework.database.Storage;

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

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

import org.indin.blisslaunchero.framework.events.AppAddEvent;

import org.indin.blisslaunchero.framework.events.AppChangeEvent;

import org.indin.blisslaunchero.framework.events.AppRemoveEvent;

import org.indin.blisslaunchero.framework.network.RetrofitService;

import org.indin.blisslaunchero.framework.utils.AppUtils;

import org.indin.blisslaunchero.framework.utils.GraphicsUtil;

import org.json.JSONArray;

import org.json.JSONObject;



import com.crashlytics.android.Crashlytics;

import com.jakewharton.rxbinding2.widget.RxTextView;



import android.Manifest;

import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;
@@ -74,60 +126,6 @@ import android.widget.LinearLayout; 
import android.widget.ScrollView;

import android.widget.TextView;

import android.widget.Toast;



import com.crashlytics.android.Crashlytics;

import com.jakewharton.rxbinding2.widget.RxTextView;



import org.greenrobot.eventbus.EventBus;

import org.greenrobot.eventbus.Subscribe;

import org.greenrobot.eventbus.ThreadMode;

import org.indin.blisslaunchero.BlissLauncher;

import org.indin.blisslaunchero.R;

import org.indin.blisslaunchero.features.notification.NotificationRepository;

import org.indin.blisslaunchero.features.notification.NotificationService;

import org.indin.blisslaunchero.features.suggestions.AutoCompleteAdapter;

import org.indin.blisslaunchero.features.suggestions.AutoCompleteService;

import org.indin.blisslaunchero.features.suggestions.AutoCompleteServiceResult;

import org.indin.blisslaunchero.features.usagestats.AppUsageStats;

import org.indin.blisslaunchero.features.weather.ForecastBuilder;

import org.indin.blisslaunchero.features.weather.WeatherIconUtils;

import org.indin.blisslaunchero.features.weather.WeatherPreferences;

import org.indin.blisslaunchero.features.weather.WeatherUpdateService;

import org.indin.blisslaunchero.framework.Alarm;

import org.indin.blisslaunchero.framework.DeviceProfile;

import org.indin.blisslaunchero.framework.Preferences;

import org.indin.blisslaunchero.framework.Utilities;

import org.indin.blisslaunchero.framework.customviews.BlissDragShadowBuilder;

import org.indin.blisslaunchero.framework.customviews.BlissFrameLayout;

import org.indin.blisslaunchero.framework.customviews.BlissInput;

import org.indin.blisslaunchero.framework.customviews.CustomAnalogClock;

import org.indin.blisslaunchero.framework.customviews.HorizontalPager;

import org.indin.blisslaunchero.framework.customviews.SquareFrameLayout;

import org.indin.blisslaunchero.framework.customviews.SquareImageView;

import org.indin.blisslaunchero.framework.database.Storage;

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

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

import org.indin.blisslaunchero.framework.events.AppAddEvent;

import org.indin.blisslaunchero.framework.events.AppChangeEvent;

import org.indin.blisslaunchero.framework.events.AppRemoveEvent;

import org.indin.blisslaunchero.framework.network.RetrofitService;

import org.indin.blisslaunchero.framework.utils.AppUtils;

import org.indin.blisslaunchero.framework.utils.GraphicsUtil;

import org.json.JSONArray;

import org.json.JSONObject;



import java.io.IOException;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.HashSet;

import java.util.LinkedHashMap;

import java.util.List;

import java.util.Locale;

import java.util.Map;

import java.util.Set;

import java.util.UUID;

import java.util.concurrent.TimeUnit;



import cyanogenmod.weather.WeatherInfo;

import cyanogenmod.weather.util.WeatherUtils;

import io.reactivex.Observable;

app/src/main/java/org/indin/blisslaunchero/features/weather/WeatherPreferences.java

+4 −5
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ 
 */

package org.indin.blisslaunchero.features.weather;



import org.indin.blisslaunchero.R;

import org.indin.blisslaunchero.framework.Preferences;

import org.indin.blisslaunchero.framework.utils.Constants;



import android.Manifest;

import android.app.AlertDialog;

import android.app.Dialog;
@@ -34,11 +38,6 @@ import android.provider.Settings; 
import android.text.TextUtils;

import android.util.Log;

import android.widget.Toast;



import org.indin.blisslaunchero.R;

import org.indin.blisslaunchero.framework.Preferences;

import org.indin.blisslaunchero.framework.utils.Constants;



import cyanogenmod.weather.CMWeatherManager;

app/src/main/java/org/indin/blisslaunchero/framework/Preferences.java

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

package org.indin.blisslaunchero.framework;



import android.content.Context;

import android.content.SharedPreferences;

import android.graphics.Color;

import java.util.ArrayList;

import java.util.Locale;



import org.indin.blisslaunchero.framework.utils.Constants;

import org.json.JSONArray;

import org.json.JSONException;

import org.json.JSONObject;



import java.util.ArrayList;

import java.util.Locale;



import android.content.Context;

import android.content.SharedPreferences;

import android.graphics.Color;

import cyanogenmod.weather.WeatherInfo;

import cyanogenmod.weather.WeatherLocation;