cleanup, remove redundancies & increase minSdkVersion

2024-11-24 11:12:36 +01:00 · 2023-07-29 13:26:14 +01:00 · 2023-07-29 13:26:14 +01:00 · 43f703da5b
commit 43f703da5b
parent 420dbd9efe
25 changed files with 29 additions and 455 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -9,7 +9,7 @@ android {

    defaultConfig {
        applicationId "com.bos.oculess"
-        minSdkVersion 23
+        minSdkVersion 24
        targetSdkVersion 33
        versionCode 13
        versionName "1.5.0"
--- a/app/oculess.svg
+++ b/app/oculess.svg
@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 25.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1"
-	 id="Horizontal" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 351.5 351.6"
-	 style="enable-background:new 0 0 351.5 351.6;" xml:space="preserve">
+<svg version="1.1" id="Horizontal" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 351.5 351.6"
+	style="enable-background:new 0 0 351.5 351.6;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill:#1C1E20;}
 </style>
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">

    <uses-feature android:glEsVersion="0x00030001" />
    <uses-permission android:name="android.permission.INTERNET" />
@ -26,7 +25,7 @@
            <meta-data
                android:name="android.app.device_admin"
                android:resource="@xml/device_admin" />
-            ></receiver>
+        </receiver>

 <!--        <receiver-->
 <!--            android:name=".audio.BootDeviceReceiver"-->
--- a/app/src/main/java/com/bos/oculess/AudioService.kt
+++ b/app/src/main/java/com/bos/oculess/AudioService.kt
@ -15,7 +15,7 @@ class AudioService : AccessibilityService() {
    companion object {
        private const val TAG = "OculessAudioService"
        private var audioApps: Array<String>? = null
-        private var canUpdateAppList = true;
+        private var canUpdateAppList = true
        fun isAccessibilityInitialized(context: Context): Boolean {
            try {
                Settings.Secure.getInt(
@ -61,7 +61,7 @@ class AudioService : AccessibilityService() {
            updateAudioPackages()
            val handler: Handler = Handler()
            canUpdateAppList = false
-            handler.postDelayed(Runnable {
+            handler.postDelayed({
                canUpdateAppList = true
                Log.i(TAG, "Allowed to re-scan packages")
            }, 10000) //1s timeout before we're allowed to look for new packages
@ -114,7 +114,7 @@ class AudioService : AccessibilityService() {
            // https://cs.android.com/android/platform/superproject/+/master:frameworks/proto_logging/stats/enums/app/enums.proto;l=138?q=PLAY_AUDIO
            try {
                AppOpsUtil.allowOp(applicationContext, 28, info?.uid!!, app) // Play audio
-            } catch (e: java.lang.SecurityException) {
+            } catch (e: SecurityException) {
                Log.w(TAG, "Audio service lacks permission to set appops. Is Oculess device owner?")
            }
        }
--- a/app/src/main/java/com/bos/oculess/MainActivity.kt
+++ b/app/src/main/java/com/bos/oculess/MainActivity.kt
@ -6,14 +6,12 @@ import android.app.admin.DevicePolicyManager
 import android.content.*
 import android.content.pm.PackageManager
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
 import android.text.Html
 import android.util.Log
 import android.view.WindowManager
 import android.widget.Button
 import android.widget.TextView
-import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import com.android.volley.Request
@ -25,7 +23,6 @@ import kotlin.concurrent.fixedRateTimer


 class MainActivity : AppCompatActivity() {
-//    @RequiresApi(Build.VERSION_CODES.N)
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        setContentView(R.layout.activity_main)
--- a/app/src/main/res/drawable-v24/ic_banner_foreground.xml
+++ b/app/src/main/res/drawable-v24/ic_banner_foreground.xml
@ -1,47 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="320dp"
-    android:height="180dp"
-    android:viewportWidth="320"
-    android:viewportHeight="180">
-  <group android:scaleX="0.6666667"
-      android:scaleY="0.6666667"
-      android:translateX="53.333332"
-      android:translateY="30">
-    <group android:scaleX="0.21501707"
-        android:scaleY="0.21501707"
-        android:translateX="35.81075"
-        android:translateY="52.2">
-      <path
-          android:pathData="M312.2,93.7c-0.7,-0.5 -1.4,-1.1 -2.1,-1.6l-38.6,60.3c5.8,6.3 9.1,14.6 9.1,23.4c0.1,11.5 -5.5,22.1 -15,28.6c-4.7,3.3 -9.9,5.2 -15.4,6.1c-5.4,0.8 -11,0.7 -16.5,0.7l-45.4,70.8h35.1c6.7,0 13.4,0 20.1,-0.1c9.1,-0.3 17.8,-1.3 26.7,-3.4c15.4,-3.7 29.6,-10.6 41.9,-20.5c24.9,-20 39.3,-50.1 39.3,-82.1C351.5,143.8 337.1,113.7 312.2,93.7z"
-          android:fillColor="#1C1E20"/>
-      <path
-          android:pathData="M108.9,281.8l45.3,-70.6h-36c-5.7,0 -11.2,0.1 -16.7,-0.7c-5.7,-0.8 -10.8,-2.8 -15.4,-6.1c-9.3,-6.5 -15,-17.1 -15,-28.6c0,-11.5 5.7,-22.1 15,-28.6c4.7,-3.3 9.9,-5.2 15.4,-6.1c5.5,-0.8 11.2,-0.7 16.7,-0.7h81.4l45.3,-70.6c-0.5,0 -0.9,0 -1.4,-0.1c-6.7,-0.3 -13.4,-0.1 -20.1,-0.1h-95.2c-6.7,0 -13.4,0 -20.1,0.1c-9.1,0.3 -17.8,1.3 -26.7,3.4c-15.4,3.7 -29.6,10.6 -41.9,20.5C14.4,113.7 0,143.8 0,175.8c0,32 14.4,62.1 39.3,82.1c12.3,9.9 26.6,16.8 42,20.5c8.8,2.1 17.7,3.1 26.7,3.4C108.4,281.8 108.6,281.8 108.9,281.8z"
-          android:fillColor="#1C1E20"/>
-      <path
-          android:pathData="M220.523,9.533l56.401,36.167l-190.01,296.314l-56.401,-36.167z"
-          android:fillColor="#1C1E20"/>
-    </group>
-
-    <group android:scaleX="0.27198938"
-        android:scaleY="0.27198938"
-        android:translateX="128"
-        android:translateY="67.20389">
-      <group android:translateY="133.66406">
-        <path android:pathData="M43.03125,1Q6,1,6,-51.671875Q6,-104,43.171875,-104Q61,-104,70.5,-90.359375Q80,-76.71875,80,-51.53125Q80,-26.34375,70.390625,-12.671875Q60.78125,1,43.03125,1ZM43.03125,-10.53125Q55,-10.53125,60.5625,-20.609375Q66.140625,-30.703125,66.140625,-51.5625Q66.140625,-72.640625,60.5,-82.546875Q54.859375,-92.46875,43.171875,-92.46875Q19.859375,-92.46875,19.859375,-51.5625Q19.859375,-10.53125,43.03125,-10.53125Z"
-            android:fillColor="#000000"/>
-        <path android:pathData="M160,-74.859375L155.6875,-63.75Q145.25,-67.8125,137.03125,-67.8125Q111.21875,-67.8125,111.21875,-38.75Q111.21875,-10.1875,136.51562,-10.1875Q147.51562,-10.1875,159,-14.546875L159,-3.296875Q149.60938,1,135.9375,1Q117.90625,1,107.953125,-9.21875Q98,-19.453125,98,-38.578125Q98,-58.328125,108.109375,-68.65625Q118.21875,-79,136.5625,-79Q148.98438,-79,160,-74.859375Z"
-            android:fillColor="#000000"/>
-        <path android:pathData="M236.67188,0L234.76562,-10.75L234.0625,-10.75Q226.67188,1,210.53125,1Q183,1,183,-26.984375L183,-77L195.79688,-77L195.79688,-27.734375Q195.79688,-9.625,212.42188,-9.625Q223.78125,-9.625,228.98438,-16.0625Q234.20312,-22.515625,234.20312,-37.28125L234.20312,-77L247,-77L247,0L236.67188,0Z"
-            android:fillColor="#000000"/>
-        <path android:pathData="M295,-98.9375L276.15625,-100.421875L276.15625,-109L307.79688,-109L307.79688,-10.0625L332.54688,-8.65625L332.54688,0L270.8125,0L270.8125,-8.65625L295,-10.0625L295,-98.9375Z"
-            android:fillColor="#000000"/>
-        <path android:pathData="M421,-36.375L366.21875,-36.375Q366.78125,-10.1875,390.57812,-10.1875Q404.39062,-10.1875,416.78125,-15.53125L416.78125,-4.28125Q405.0625,1,391.07812,1Q373.76562,1,363.375,-9.5Q353,-20.015625,353,-38.4375Q353,-57.140625,362.5625,-68.0625Q372.14062,-79,388.17188,-79Q403.14062,-79,412.0625,-69.546875Q421,-60.09375,421,-44.34375L421,-36.375ZM366.5,-47L407.78125,-47Q407.78125,-68.375,388.1875,-68.375Q368.375,-68.375,366.5,-47Z"
-            android:fillColor="#000000"/>
-        <path android:pathData="M444,-3.859375L444,-15.53125Q457.60938,-9.625,470.09375,-9.625Q489.48438,-9.625,489.48438,-20.859375Q489.48438,-24.859375,486.01562,-27.8125Q482.54688,-30.765625,470.03125,-35.265625Q453.5625,-41.390625,449.28125,-46.484375Q445,-51.578125,445,-58.546875Q445,-68.109375,452.90625,-73.546875Q460.82812,-79,474.8125,-79Q488.85938,-79,501,-73.796875L496.75,-63.328125Q483.89062,-68.375,474.20312,-68.375Q457.51562,-68.375,457.51562,-59.03125Q457.51562,-54.75,461.0625,-52.171875Q464.60938,-49.609375,477.40625,-45.046875Q492.23438,-39.625,497.10938,-34.390625Q502,-29.15625,502,-21.5625Q502,-11.015625,493.75,-5Q485.51562,1,470.42188,1Q452.95312,1,444,-3.859375Z"
-            android:fillColor="#000000"/>
-        <path android:pathData="M530,-3.859375L530,-15.53125Q543.6094,-9.625,556.09375,-9.625Q575.4844,-9.625,575.4844,-20.859375Q575.4844,-24.859375,572.0156,-27.8125Q568.5469,-30.765625,556.03125,-35.265625Q539.5625,-41.390625,535.28125,-46.484375Q531,-51.578125,531,-58.546875Q531,-68.109375,538.90625,-73.546875Q546.8281,-79,560.8125,-79Q574.8594,-79,587,-73.796875L582.75,-63.328125Q569.8906,-68.375,560.2031,-68.375Q543.5156,-68.375,543.5156,-59.03125Q543.5156,-54.75,547.0625,-52.171875Q550.6094,-49.609375,563.40625,-45.046875Q578.2344,-39.625,583.1094,-34.390625Q588,-29.15625,588,-21.5625Q588,-11.015625,579.75,-5Q571.5156,1,556.4219,1Q538.9531,1,530,-3.859375Z"
-            android:fillColor="#000000"/>
-      </group>
-    </group>
-  </group>
-</vector>
--- a/app/src/main/res/drawable-v24/ic_launcher_background.xml
+++ b/app/src/main/res/drawable-v24/ic_launcher_background.xml
@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@ -1,20 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <group android:scaleX="0.12576792"
-        android:scaleY="0.12576792"
-        android:translateX="31.896288"
-        android:translateY="31.89">
-        <path
-            android:pathData="M312.2,93.7c-0.7,-0.5 -1.4,-1.1 -2.1,-1.6l-38.6,60.3c5.8,6.3 9.1,14.6 9.1,23.4c0.1,11.5 -5.5,22.1 -15,28.6c-4.7,3.3 -9.9,5.2 -15.4,6.1c-5.4,0.8 -11,0.7 -16.5,0.7l-45.4,70.8h35.1c6.7,0 13.4,0 20.1,-0.1c9.1,-0.3 17.8,-1.3 26.7,-3.4c15.4,-3.7 29.6,-10.6 41.9,-20.5c24.9,-20 39.3,-50.1 39.3,-82.1C351.5,143.8 337.1,113.7 312.2,93.7z"
-            android:fillColor="#1C1E20"/>
-        <path
-            android:pathData="M108.9,281.8l45.3,-70.6h-36c-5.7,0 -11.2,0.1 -16.7,-0.7c-5.7,-0.8 -10.8,-2.8 -15.4,-6.1c-9.3,-6.5 -15,-17.1 -15,-28.6c0,-11.5 5.7,-22.1 15,-28.6c4.7,-3.3 9.9,-5.2 15.4,-6.1c5.5,-0.8 11.2,-0.7 16.7,-0.7h81.4l45.3,-70.6c-0.5,0 -0.9,0 -1.4,-0.1c-6.7,-0.3 -13.4,-0.1 -20.1,-0.1h-95.2c-6.7,0 -13.4,0 -20.1,0.1c-9.1,0.3 -17.8,1.3 -26.7,3.4c-15.4,3.7 -29.6,10.6 -41.9,20.5C14.4,113.7 0,143.8 0,175.8c0,32 14.4,62.1 39.3,82.1c12.3,9.9 26.6,16.8 42,20.5c8.8,2.1 17.7,3.1 26.7,3.4C108.4,281.8 108.6,281.8 108.9,281.8z"
-            android:fillColor="#1C1E20"/>
-        <path
-            android:pathData="M220.523,9.533l56.401,36.167l-190.01,296.314l-56.401,-36.167z"
-            android:fillColor="#1C1E20"/>
-    </group>
-</vector>
--- a/app/src/main/res/drawable/ic_button_default.xml
+++ b/app/src/main/res/drawable/ic_button_default.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item>
-        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+        <shape android:shape="rectangle">
            <corners android:radius="8dp" />
            <color android:color="#034abe" />
        </shape>
--- a/app/src/main/res/drawable/ic_button_default_touch.xml
+++ b/app/src/main/res/drawable/ic_button_default_touch.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item>
-        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+        <shape android:shape="rectangle">
            <corners android:radius="8dp" />
            <color android:color="#034ABE" />
        </shape>
--- a/app/src/main/res/drawable/ic_button_disable.xml
+++ b/app/src/main/res/drawable/ic_button_disable.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item>
-        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+        <shape android:shape="rectangle">
            <corners android:radius="8dp" />
            <solid android:color="@color/white" />
        </shape>
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@ -3,18 +3,18 @@
    android:height="108dp"
    android:viewportWidth="108"
    android:viewportHeight="108">
-  <group android:scaleX="0.12576792"
-      android:scaleY="0.12576792"
-      android:translateX="31.896288"
-      android:translateY="31.89">
-    <path
-        android:pathData="M312.2,93.7c-0.7,-0.5 -1.4,-1.1 -2.1,-1.6l-38.6,60.3c5.8,6.3 9.1,14.6 9.1,23.4c0.1,11.5 -5.5,22.1 -15,28.6c-4.7,3.3 -9.9,5.2 -15.4,6.1c-5.4,0.8 -11,0.7 -16.5,0.7l-45.4,70.8h35.1c6.7,0 13.4,0 20.1,-0.1c9.1,-0.3 17.8,-1.3 26.7,-3.4c15.4,-3.7 29.6,-10.6 41.9,-20.5c24.9,-20 39.3,-50.1 39.3,-82.1C351.5,143.8 337.1,113.7 312.2,93.7z"
-        android:fillColor="#1C1E20"/>
-    <path
-        android:pathData="M108.9,281.8l45.3,-70.6h-36c-5.7,0 -11.2,0.1 -16.7,-0.7c-5.7,-0.8 -10.8,-2.8 -15.4,-6.1c-9.3,-6.5 -15,-17.1 -15,-28.6c0,-11.5 5.7,-22.1 15,-28.6c4.7,-3.3 9.9,-5.2 15.4,-6.1c5.5,-0.8 11.2,-0.7 16.7,-0.7h81.4l45.3,-70.6c-0.5,0 -0.9,0 -1.4,-0.1c-6.7,-0.3 -13.4,-0.1 -20.1,-0.1h-95.2c-6.7,0 -13.4,0 -20.1,0.1c-9.1,0.3 -17.8,1.3 -26.7,3.4c-15.4,3.7 -29.6,10.6 -41.9,20.5C14.4,113.7 0,143.8 0,175.8c0,32 14.4,62.1 39.3,82.1c12.3,9.9 26.6,16.8 42,20.5c8.8,2.1 17.7,3.1 26.7,3.4C108.4,281.8 108.6,281.8 108.9,281.8z"
-        android:fillColor="#1C1E20"/>
-    <path
-        android:pathData="M220.523,9.533l56.401,36.167l-190.01,296.314l-56.401,-36.167z"
-        android:fillColor="#1C1E20"/>
-  </group>
+    <group android:scaleX="0.12576792"
+        android:scaleY="0.12576792"
+        android:translateX="31.896288"
+        android:translateY="31.89">
+        <path
+            android:pathData="M312.2,93.7c-0.7,-0.5 -1.4,-1.1 -2.1,-1.6l-38.6,60.3c5.8,6.3 9.1,14.6 9.1,23.4c0.1,11.5 -5.5,22.1 -15,28.6c-4.7,3.3 -9.9,5.2 -15.4,6.1c-5.4,0.8 -11,0.7 -16.5,0.7l-45.4,70.8h35.1c6.7,0 13.4,0 20.1,-0.1c9.1,-0.3 17.8,-1.3 26.7,-3.4c15.4,-3.7 29.6,-10.6 41.9,-20.5c24.9,-20 39.3,-50.1 39.3,-82.1C351.5,143.8 337.1,113.7 312.2,93.7z"
+            android:fillColor="#1C1E20"/>
+        <path
+            android:pathData="M108.9,281.8l45.3,-70.6h-36c-5.7,0 -11.2,0.1 -16.7,-0.7c-5.7,-0.8 -10.8,-2.8 -15.4,-6.1c-9.3,-6.5 -15,-17.1 -15,-28.6c0,-11.5 5.7,-22.1 15,-28.6c4.7,-3.3 9.9,-5.2 15.4,-6.1c5.5,-0.8 11.2,-0.7 16.7,-0.7h81.4l45.3,-70.6c-0.5,0 -0.9,0 -1.4,-0.1c-6.7,-0.3 -13.4,-0.1 -20.1,-0.1h-95.2c-6.7,0 -13.4,0 -20.1,0.1c-9.1,0.3 -17.8,1.3 -26.7,3.4c-15.4,3.7 -29.6,10.6 -41.9,20.5C14.4,113.7 0,143.8 0,175.8c0,32 14.4,62.1 39.3,82.1c12.3,9.9 26.6,16.8 42,20.5c8.8,2.1 17.7,3.1 26.7,3.4C108.4,281.8 108.6,281.8 108.9,281.8z"
+            android:fillColor="#1C1E20"/>
+        <path
+            android:pathData="M220.523,9.533l56.401,36.167l-190.01,296.314l-56.401,-36.167z"
+            android:fillColor="#1C1E20"/>
+    </group>
 </vector>
--- a/app/src/main/res/drawable/windowbg.xml
+++ b/app/src/main/res/drawable/windowbg.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item>
-        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+        <shape android:shape="rectangle">
            <corners android:topLeftRadius="20dp" android:topRightRadius="20dp" />
        </shape>
    </item>
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@ -9,7 +9,6 @@
    tools:context=".MainActivity">

    <View
-        android:id="@+id/background"
        android:layout_width="fill_parent"
        android:layout_height="fill_parent"
        android:background="@drawable/windowbg"
@ -21,7 +20,6 @@
        app:layout_constraintVertical_bias="0.496" />

    <ImageView
-        android:id="@+id/imageView"
        android:layout_width="300dp"
        android:layout_height="300dp"
        android:layout_marginEnd="-250dp"
@ -56,7 +54,6 @@
            app:layout_constraintTop_toTopOf="parent">

            <TextView
-                android:id="@+id/TitleP"
                android:layout_width="150dp"
                android:layout_height="wrap_content"
                android:gravity="right"
@ -66,7 +63,6 @@
                android:textSize="60sp" />

            <TextView
-                android:id="@+id/TitleE"
                android:layout_width="150dp"
                android:layout_height="wrap_content"
                android:text="@string/app_name_end"
@ -90,7 +86,6 @@
            app:layout_constraintStart_toStartOf="parent" />

        <TextView
-            android:id="@+id/Subtitle"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginTop="-5dp"
@ -120,7 +115,6 @@
        app:layout_constraintVertical_bias="0.85">

        <LinearLayout
-            android:id="@+id/Column"
            android:layout_width="380dp"
            android:layout_height="match_parent"
            android:layout_marginLeft="5dp"
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
    <color name="purple_700">#FF3700B3</color>
    <color name="teal_200">#FF03DAC5</color>
    <color name="teal_700">#FF018786</color>
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@ -10,7 +10,7 @@
        <item name="colorSecondaryVariant">@color/teal_700</item>
        <item name="colorOnSecondary">@color/black</item>
        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor" >?attr/colorPrimaryVariant</item>
        <!-- Customize your theme here. -->
        <item name="android:windowIsTranslucent">true</item>
        <item name="android:windowBackground">@android:color/transparent</item>
--- a/app/src/main/res/xml/device_admin.xml
+++ b/app/src/main/res/xml/device_admin.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<device-admin xmlns:android="http://schemas.android.com/apk/res/android">
+<device-admin>
    <uses-policies>

    </uses-policies>
--- a/build.gradle
+++ b/build.gradle
@ -21,6 +21,6 @@ allprojects {
    }
 }

-task clean(type: Delete) {
+tasks.register('clean', Delete) {
    delete rootProject.buildDir
 }