Fixing bugs

Author: codehasan

app/src/main/java/io/github/ratul/topactivity/ui/MainActivity.java

@@ -37,6 +37,7 @@
 import io.github.ratul.topactivity.service.*;
 import io.github.ratul.topactivity.model.TypefaceSpan;
 import java.io.*;
+import android.util.DisplayMetrics;
 
 /**
  * Created by Wen on 16/02/2017.
@@ -48,20 +49,17 @@ public class MainActivity extends Activity implements OnCheckedChangeListener {
     CompoundButton mWindowSwitch, mNotificationSwitch, mAccessibilitySwitch;
     private BroadcastReceiver mReceiver;
     private int theme;
-    public static MainActivity INSTANCE;
-
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-        INSTANCE = this;
-        if (AccessibilityMonitoringService.getInstance() == null && DatabaseUtil.hasAccess())
-            startService(new Intent().setClass(this, AccessibilityMonitoringService.class));
-    }
+    public static MainActivity INSTANCE; 
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+        INSTANCE = this;
+        if (AccessibilityMonitoringService.getInstance() == null && DatabaseUtil.hasAccess())
+            startService(new Intent().setClass(this, AccessibilityMonitoringService.class));
+        
+        DatabaseUtil.setDisplayWidth(getScreenWidth(this));
 
         theme = FancyDialog.DARK_THEME;
         DialogTheme.setupColors(this, theme);
@@ -91,6 +89,19 @@ protected void onCreate(Bundle savedInstanceState) {
         mReceiver = new UpdateSwitchReceiver();
         registerReceiver(mReceiver, new IntentFilter(ACTION_STATE_CHANGED));
     }
+    
+    public static int getScreenWidth(Activity activity) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            WindowMetrics windowMetrics = activity.getWindowManager().getCurrentWindowMetrics();
+            Insets insets = windowMetrics.getWindowInsets()
+                .getInsetsIgnoringVisibility(WindowInsets.Type.systemBars());
+            return windowMetrics.getBounds().width() - insets.left - insets.right;
+        } else {
+            DisplayMetrics displayMetrics = new DisplayMetrics();
+            activity.getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+            return displayMetrics.widthPixels;
+        }
+    }
 
     @Override
     protected void onNewIntent(Intent intent) {

app/src/main/java/io/github/ratul/topactivity/ui/ShortcutHandlerActivity.java

@@ -37,6 +37,7 @@ public class ShortcutHandlerActivity extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        DatabaseUtil.setDisplayWidth(MainActivity.getScreenWidth(this));
 
         if (!MainActivity.usageStats(this) || !Settings.canDrawOverlays(this)) {
             Intent intent = new Intent(this, MainActivity.class);

app/src/main/java/io/github/ratul/topactivity/utils/DatabaseUtil.java

@@ -29,6 +29,14 @@
 public class DatabaseUtil {
     private static SharedPreferences sp = App.getApp().getSharedPreferences("io.github.ratul.topactivity", 0);
 
+    public static int getDisplayWidth() {
+        return sp.getInt("width", 720);
+    }
+
+    public static boolean setDisplayWidth(int width) {
+        return sp.edit().putInt("width", width).commit();
+    }
+    
     public static boolean isShowWindow() {
         return sp.getBoolean("is_show_window", false);
     }

app/src/main/java/io/github/ratul/topactivity/utils/WindowUtil.java

@@ -70,7 +70,7 @@ public static void init(final Context context) {
             PixelFormat.TRANSLUCENT);
 
         sWindowParams.gravity = Gravity.CENTER;
-        sWindowParams.width = (context.getDisplay().getWidth() / 2) + 300;
+        sWindowParams.width = (DatabaseUtil.getDisplayWidth() / 2) + 300;
         sWindowParams.windowAnimations = android.R.style.Animation_Toast;
 
         sView = LayoutInflater.from(context).inflate(R.layout.window_tasks,

app/src/main/res/drawable/layers.xml

@@ -10,23 +10,20 @@
         android:strokeColor="@color/layerColor"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
-        android:strokeLineJoin="round"
-        android:fillType="evenOdd" />
+        android:strokeLineJoin="round" />
     <path
         android:fillColor="#00000000"
         android:pathData="M19.995,4.2m-1.922,0a1.922,1.922 0,1 1,3.844 0a1.922,1.922 0,1 1,-3.844 0"
         android:strokeColor="@color/layerColor"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
-        android:strokeLineJoin="round"
-        android:fillType="evenOdd" />
+        android:strokeLineJoin="round" />
     <path
         android:fillColor="#00000000"
         android:pathData="M14.9245,3.1201L7.6568,3.1201C4.6453,3.1201 2.778,5.2529 2.778,8.2643L2.778,16.3467C2.778,19.3581 4.6087,21.4817 7.6568,21.4817L16.2609,21.4817C19.2723,21.4817 21.1396,19.3581 21.1396,16.3467L21.1396,9.3078"
         android:strokeColor="@color/layerColor"
         android:strokeWidth="1.5"
         android:strokeLineCap="round"
-        android:strokeLineJoin="round"
-        android:fillType="evenOdd" />
+        android:strokeLineJoin="round" />
 </vector>