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

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

Modularize app base code

parent 7ccad36f

app/src/main/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
        android:supportsRtl="true"

        android:theme="@style/AppTheme">

        <activity

            android:name=".DesktopActivity"

            android:name=".ui.DesktopActivity"

            android:clearTaskOnLaunch="true"

            android:launchMode="singleTask"

            android:screenOrientation="nosensor"

app/src/main/java/org/indin/blisslaunchero/Storage.java→app/src/main/java/org/indin/blisslaunchero/db/Storage.java

+2 −3
Original line number Diff line number Diff line 
package org.indin.blisslaunchero;

package org.indin.blisslaunchero.db;



import android.content.Context;

import android.content.SharedPreferences;
@@ -6,13 +6,12 @@ import android.os.AsyncTask; 
import android.util.Log;

import android.view.ViewGroup;

import android.widget.GridLayout;

import android.widget.LinearLayout;



import org.indin.blisslaunchero.model.AppItem;

import org.json.JSONArray;

import org.json.JSONException;

import org.json.JSONObject;



import java.security.acl.Group;

import java.util.List;



public class Storage {

app/src/main/java/org/indin/blisslaunchero/AppItem.java→app/src/main/java/org/indin/blisslaunchero/model/AppItem.java

+1 −1
Original line number Diff line number Diff line 
package org.indin.blisslaunchero;

package org.indin.blisslaunchero.model;



import android.content.Intent;

import android.graphics.drawable.Drawable;

app/src/main/java/org/indin/blisslaunchero/DesktopActivity.java→app/src/main/java/org/indin/blisslaunchero/ui/DesktopActivity.java

+14 −4
Original line number Diff line number Diff line 
package org.indin.blisslaunchero;

package org.indin.blisslaunchero.ui;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;
@@ -21,7 +21,6 @@ import android.os.Bundle; 
import android.os.CountDownTimer;

import android.support.v7.app.AppCompatActivity;

import android.util.DisplayMetrics;

import android.util.Log;

import android.view.Display;

import android.view.DragEvent;

import android.view.Gravity;
@@ -43,12 +42,23 @@ import android.widget.LinearLayout; 
import android.widget.TextView;

import android.widget.Toast;



import org.indin.blisslaunchero.R;

import org.indin.blisslaunchero.db.Storage;

import org.indin.blisslaunchero.model.AppItem;

import org.indin.blisslaunchero.utils.AppUtil;

import org.indin.blisslaunchero.utils.GraphicsUtil;

import org.indin.blisslaunchero.utils.IconPackUtil;

import org.indin.blisslaunchero.utils.ConverterUtil;

import org.indin.blisslaunchero.widgets.BlissDragShadowBuilder;

import org.indin.blisslaunchero.widgets.BlissInput;

import org.indin.blisslaunchero.widgets.CustomAnalogClock;

import org.indin.blisslaunchero.widgets.HorizontalPager;

import org.indin.blisslaunchero.widgets.SquareImageView;

import org.json.JSONArray;

import org.json.JSONObject;



import java.io.IOException;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.List;

import java.util.UUID;
@@ -492,7 +502,7 @@ public class DesktopActivity extends AppCompatActivity { 
                // reappear when user swipes to the first apps page

                if (currentPageNumber == 0) {

                    dock.animate().translationYBy(

                            Utils.dp2Px(105, DesktopActivity.this)).setDuration(

                            ConverterUtil.dp2Px(105, DesktopActivity.this)).setDuration(

                            100).withEndAction(new Runnable() {

                        @Override

                        public void run() {

app/src/main/java/org/indin/blisslaunchero/AppUtil.java→app/src/main/java/org/indin/blisslaunchero/utils/AppUtil.java

+4 −1
Original line number Diff line number Diff line 
package org.indin.blisslaunchero;

package org.indin.blisslaunchero.utils;



import android.app.ActivityOptions;

import android.content.Context;
@@ -12,6 +12,9 @@ import android.os.Bundle; 
import android.provider.MediaStore;

import android.support.annotation.Nullable;



import org.indin.blisslaunchero.model.AppItem;

import org.indin.blisslaunchero.R;



import java.text.Collator;

import java.util.ArrayList;

import java.util.Collections;