fix: amoled toggle default true / add: logos for settings without a logo / add: default server / refactor: tv package

app/phone/libre/release/output-metadata.json

@@ -0,0 +1,87 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.nomadics9.ananas",
+  "variantName": "libreRelease",
+  "elements": [
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "armeabi-v7a"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "0.14.2",
+      "outputFile": "ananas-v0.14.2-libre-armeabi-v7a.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "arm64-v8a"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "0.14.2",
+      "outputFile": "ananas-v0.14.2-libre-arm64-v8a.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "x86_64"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "0.14.2",
+      "outputFile": "ananas-v0.14.2-libre-x86_64.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "x86"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "0.14.2",
+      "outputFile": "ananas-v0.14.2-libre-x86.apk"
+    }
+  ],
+  "elementType": "File",
+  "baselineProfiles": [
+    {
+      "minApi": 28,
+      "maxApi": 30,
+      "baselineProfiles": [
+        "baselineProfiles/1/ananas-v0.14.2-libre-armeabi-v7a.dm",
+        "baselineProfiles/1/ananas-v0.14.2-libre-arm64-v8a.dm",
+        "baselineProfiles/1/ananas-v0.14.2-libre-x86_64.dm",
+        "baselineProfiles/1/ananas-v0.14.2-libre-x86.dm"
+      ]
+    },
+    {
+      "minApi": 31,
+      "maxApi": 2147483647,
+      "baselineProfiles": [
+        "baselineProfiles/0/ananas-v0.14.2-libre-armeabi-v7a.dm",
+        "baselineProfiles/0/ananas-v0.14.2-libre-arm64-v8a.dm",
+        "baselineProfiles/0/ananas-v0.14.2-libre-x86_64.dm",
+        "baselineProfiles/0/ananas-v0.14.2-libre-x86.dm"
+      ]
+    }
+  ],
+  "minSdkVersionForDexing": 28
+}

app/phone/src/main/java/com/nomadics9/ananas/fragments/AddServerFragment.kt

@@ -89,7 +89,7 @@ class AddServerFragment : Fragment() {
                 }
             }
         }
-
+        connectToServer(DEFAULT_SERVER_ADDRESS)
         return binding.root
     }
 
@@ -129,10 +129,17 @@ class AddServerFragment : Fragment() {
         }
     }
 
-    private fun connectToServer() {
-        val serverAddress = (binding.editTextServerAddress as AppCompatEditText).text.toString()
-        viewModel.checkServer(serverAddress.removeSuffix("/"))
+//    private fun connectToServer() {
+//        val serverAddress = (binding.editTextServerAddress as AppCompatEditText).text.toString()
+//        viewModel.checkServer(serverAddress.removeSuffix("/"))
+//    }
+
+    companion object {
+        private const val DEFAULT_SERVER_ADDRESS = "https://askar.tv"
     }
+    private fun connectToServer(serverAddress: String = DEFAULT_SERVER_ADDRESS) {
+    viewModel.checkServer(serverAddress.removeSuffix("/"))
+}
 
     private fun navigateToLoginFragment() {
         findNavController().navigate(AddServerFragmentDirections.actionAddServerFragmentToLoginFragment())

app/tv/libre/debug/output-metadata.json

@@ -0,0 +1,65 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.nomadics9.ananas.debug",
+  "variantName": "libreDebug",
+  "elements": [
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "armeabi-v7a"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "0.14.2",
+      "outputFile": "tv-libre-armeabi-v7a-debug.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "x86_64"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "0.14.2",
+      "outputFile": "tv-libre-x86_64-debug.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "x86"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "0.14.2",
+      "outputFile": "tv-libre-x86-debug.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "arm64-v8a"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "0.14.2",
+      "outputFile": "tv-libre-arm64-v8a-debug.apk"
+    }
+  ],
+  "elementType": "File",
+  "minSdkVersionForDexing": 28
+}

app/tv/libre/release/output-metadata.json

@@ -0,0 +1,87 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.nomadics9.ananas",
+  "variantName": "libreRelease",
+  "elements": [
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "armeabi-v7a"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "0.14.2",
+      "outputFile": "tv-libre-armeabi-v7a-release.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "arm64-v8a"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "0.14.2",
+      "outputFile": "tv-libre-arm64-v8a-release.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "x86_64"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "0.14.2",
+      "outputFile": "tv-libre-x86_64-release.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "x86"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "0.14.2",
+      "outputFile": "tv-libre-x86-release.apk"
+    }
+  ],
+  "elementType": "File",
+  "baselineProfiles": [
+    {
+      "minApi": 28,
+      "maxApi": 30,
+      "baselineProfiles": [
+        "baselineProfiles/1/tv-libre-armeabi-v7a-release.dm",
+        "baselineProfiles/1/tv-libre-arm64-v8a-release.dm",
+        "baselineProfiles/1/tv-libre-x86_64-release.dm",
+        "baselineProfiles/1/tv-libre-x86-release.dm"
+      ]
+    },
+    {
+      "minApi": 31,
+      "maxApi": 2147483647,
+      "baselineProfiles": [
+        "baselineProfiles/0/tv-libre-armeabi-v7a-release.dm",
+        "baselineProfiles/0/tv-libre-arm64-v8a-release.dm",
+        "baselineProfiles/0/tv-libre-x86_64-release.dm",
+        "baselineProfiles/0/tv-libre-x86-release.dm"
+      ]
+    }
+  ],
+  "minSdkVersionForDexing": 28
+}

app/tv/libre/staging/output-metadata.json

@@ -0,0 +1,87 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.nomadics9.ananas.staging",
+  "variantName": "libreStaging",
+  "elements": [
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "armeabi-v7a"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "0.14.2",
+      "outputFile": "tv-libre-armeabi-v7a-staging.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "x86_64"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "0.14.2",
+      "outputFile": "tv-libre-x86_64-staging.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "x86"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "0.14.2",
+      "outputFile": "tv-libre-x86-staging.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "arm64-v8a"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "0.14.2",
+      "outputFile": "tv-libre-arm64-v8a-staging.apk"
+    }
+  ],
+  "elementType": "File",
+  "baselineProfiles": [
+    {
+      "minApi": 28,
+      "maxApi": 30,
+      "baselineProfiles": [
+        "baselineProfiles/1/tv-libre-armeabi-v7a-staging.dm",
+        "baselineProfiles/1/tv-libre-x86_64-staging.dm",
+        "baselineProfiles/1/tv-libre-x86-staging.dm",
+        "baselineProfiles/1/tv-libre-arm64-v8a-staging.dm"
+      ]
+    },
+    {
+      "minApi": 31,
+      "maxApi": 2147483647,
+      "baselineProfiles": [
+        "baselineProfiles/0/tv-libre-armeabi-v7a-staging.dm",
+        "baselineProfiles/0/tv-libre-x86_64-staging.dm",
+        "baselineProfiles/0/tv-libre-x86-staging.dm",
+        "baselineProfiles/0/tv-libre-arm64-v8a-staging.dm"
+      ]
+    }
+  ],
+  "minSdkVersionForDexing": 28
+}

core/src/main/res/drawable/ic_banner_foreground.xml

@@ -3,14 +3,14 @@
     android:height="180dp"
     android:viewportWidth="1280"
     android:viewportHeight="207">
-  <group android:scaleX="0.6666667"
-      android:scaleY="0.6666667"
-      android:translateX="213.33333"
+  <group android:scaleX="0.7"
+      android:scaleY="0.7"
+      android:translateX="200"
       android:translateY="34.5">
     <group android:scaleX="0.85"
-        android:scaleY="0.2638448"
+        android:scaleY="0.25"
         android:translateX="96"
-        android:translateY="76.19206">
+        android:translateY="76">
       <path
           android:pathData="M1097,7C1112.1,6.9 1127.2,6.8 1142.3,6.7C1149.3,6.7 1156.3,6.6 1163.3,6.5C1170.1,6.5 1176.9,6.4 1183.6,6.4C1186.2,6.4 1188.8,6.4 1191.3,6.4C1215.5,6.1 1233,10 1250.9,27.3C1262.5,39.1 1268.9,55.1 1269.4,71.7C1269.2,91.6 1261.4,107.8 1247.5,121.6C1245.2,123.7 1242.7,125.3 1240,127C1240.3,132.2 1241.5,136.8 1243.2,141.7C1243.4,142.4 1243.6,143 1243.9,143.7C1244.6,145.8 1245.3,147.9 1246,150C1247.7,155 1249.4,160 1251.1,165C1251.6,166.5 1252.1,168 1252.6,169.4C1253.3,171.6 1254,173.8 1254.8,175.9C1255,176.6 1255.2,177.2 1255.5,177.9C1256.5,181.2 1257,183.5 1257,187C1250.3,187.1 1250.3,187.1 1248,186C1246.8,183.3 1245.6,180.7 1244.6,178C1244.2,177.2 1243.9,176.3 1243.5,175.4C1238.1,161.5 1233.6,147.2 1229,133C1227.7,133 1226.4,133 1225,133C1228,143.5 1231.2,153.9 1234.7,164.3C1235.1,165.4 1235.5,166.6 1235.9,167.8C1237.9,173.8 1237.9,173.8 1240.1,179.7C1241.1,182.3 1241.2,184.3 1241,187C1237.8,187.4 1237.8,187.4 1234,187C1230.2,182.4 1228.3,177.1 1226.2,171.5C1225.8,170.6 1225.5,169.7 1225.2,168.8C1221.4,158.6 1218.2,148.3 1215,138C1213.3,137.7 1211.7,137.3 1210,137C1210.6,138.7 1210.6,138.7 1211.1,140.4C1218.6,162.7 1218.6,162.7 1219.8,166.3C1220.6,168.9 1221.5,171.6 1222.5,174.2C1222.7,174.9 1222.9,175.6 1223.2,176.3C1223.8,178.2 1224.5,180.1 1225.2,182.1C1226,185 1226,185 1225,187C1221.8,187.4 1221.8,187.4 1218,187C1214.7,182.9 1212.8,178.4 1211,173.4C1210.7,172.7 1210.5,172 1210.2,171.3C1207.9,164.9 1205.9,158.5 1204,152C1202.9,148.5 1201.8,145.1 1200.7,141.6C1200,139 1200,139 1200,137C1198.3,137 1196.7,137 1195,137C1195.2,137.6 1195.4,138.1 1195.6,138.7C1203,160.8 1203,160.8 1206,171C1206.3,172 1206.6,173 1206.9,174.1C1207.2,175 1207.5,176 1207.8,177C1208,177.8 1208.2,178.7 1208.5,179.6C1209,182.1 1209.1,184.4 1209,187C1202.3,187.1 1202.3,187.1 1200,186C1199.1,183.5 1198.3,181.1 1197.5,178.6C1195.8,173.1 1195.8,173.1 1193,168C1192.5,166.1 1192,164.3 1191.6,162.4C1190,156 1188,149.9 1185.8,143.7C1185,141 1185,141 1185,137C1175.4,136.7 1165.9,136.3 1156,136C1154.6,133.3 1154.9,131 1155,128C1155.6,128 1156.2,128 1156.8,128C1162.9,127.9 1169,127.8 1175.2,127.7C1177.4,127.6 1179.7,127.6 1182,127.6C1214.9,127.2 1214.9,127.2 1242.7,110.8C1253.1,99.7 1258.7,86.1 1258.4,71C1257.6,54.4 1251.6,41 1239.6,29.5C1237.5,27.6 1235.5,26.3 1233,25C1231.9,24.4 1231.9,24.4 1230.8,23.8C1221.4,18.8 1212.8,16.5 1202.1,16.7C1201.1,16.7 1200,16.7 1198.9,16.7C1195.6,16.7 1192.2,16.7 1188.8,16.7C1186.7,16.7 1184.6,16.7 1182.6,16.7C1174.8,16.7 1167.1,16.8 1159.4,16.8C1133.4,16.9 1133.4,16.9 1107,17C1106.7,72.8 1106.3,128.5 1106,186C1099,187 1099,187 1097,186C1095.8,182.5 1095.9,179.7 1095.9,176C1095.9,175 1095.9,175 1095.9,173.9C1095.9,171.5 1095.9,169.1 1095.9,166.7C1095.9,165 1095.9,163.3 1095.9,161.6C1095.9,156.9 1095.9,152.3 1095.9,147.6C1095.9,142.8 1095.9,137.9 1095.9,133C1095.9,124.9 1095.9,116.7 1095.9,108.5C1095.9,99.1 1095.9,89.6 1095.9,80.2C1095.9,72.1 1095.9,64 1095.9,55.9C1095.9,51 1095.9,46.2 1095.9,41.3C1095.9,36.8 1095.9,32.2 1095.9,27.7C1095.9,26 1095.9,24.3 1095.9,22.7C1095.9,20.4 1095.9,18.1 1095.9,15.8C1095.9,14.5 1095.9,13.3 1095.9,12C1096,9 1096,9 1097,7Z"
           android:fillColor="#FCFDFE"/>

core/src/main/res/drawable/ic_cache.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9,15L11,17L15,13M13,3H8.2C7.08,3 6.52,3 6.092,3.218C5.716,3.41 5.41,3.716 5.218,4.092C5,4.52 5,5.08 5,6.2V17.8C5,18.92 5,19.48 5.218,19.908C5.41,20.284 5.716,20.59 6.092,20.782C6.52,21 7.08,21 8.2,21H15.8C16.92,21 17.48,21 17.908,20.782C18.284,20.59 18.59,20.284 18.782,19.908C19,19.48 19,18.92 19,17.8V9M13,3L19,9M13,3V7.4C13,7.96 13,8.24 13.109,8.454C13.205,8.642 13.358,8.795 13.546,8.891C13.76,9 14.04,9 14.6,9H19"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#FFFFFF"
+      android:strokeLineCap="round"/>
+</vector>

core/src/main/res/drawable/ic_logo.xml

@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="100dp"
-    android:height="100dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
   <path

core/src/main/res/drawable/ic_offline.xml

@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="#FFFFFF" android:pathData="M2,14.5c0,1.6 0.9,3.1 2.2,3.9l-0.9,0.9c-0.4,0.4 -0.4,1 0,1.4C3.5,20.9 3.7,21 4,21s0.5,-0.1 0.7,-0.3l14,-14c0.4,-0.4 0.4,-1 0,-1.4s-1,-0.4 -1.4,0l-1.8,1.8C14.9,7 14.3,7 13.8,7c-0.1,-0.2 -0.3,-0.3 -0.4,-0.4C12.4,5.6 11,5 9.5,5S6.6,5.6 5.6,6.6C4.6,7.6 4,9 4,10.5c0,0.1 0,0.2 0,0.3c-0.2,0.2 -0.5,0.3 -0.7,0.6C2.5,12.2 2,13.3 2,14.5zM4.7,12.7c0.2,-0.2 0.5,-0.4 0.7,-0.5c0.4,-0.2 0.7,-0.6 0.6,-1.1C6,10.9 6,10.7 6,10.5C6,9.6 6.4,8.7 7,8c1.3,-1.3 3.6,-1.3 4.9,0c0.2,0.2 0.4,0.4 0.5,0.7c0.2,0.3 0.6,0.5 1,0.4l-7.7,7.7c-1,-0.3 -1.7,-1.3 -1.7,-2.4C4,13.8 4.3,13.2 4.7,12.7z"/>
+      
+    <path android:fillColor="#FFFFFF" android:pathData="M19.6,10.6c-0.2,-0.4 -0.4,-0.8 -0.6,-1.2c-0.3,-0.5 -0.9,-0.6 -1.4,-0.3c-0.5,0.3 -0.6,0.9 -0.3,1.4c0.2,0.3 0.4,0.7 0.5,1c0.1,0.3 0.3,0.5 0.6,0.7c0.9,0.4 1.5,1.3 1.5,2.3c0,0.7 -0.3,1.3 -0.7,1.8c-0.5,0.5 -1.1,0.7 -1.8,0.7H10c-0.6,0 -1,0.4 -1,1s0.4,1 1,1h7.5c1.2,0 2.3,-0.5 3.2,-1.3c0.9,-0.8 1.3,-2 1.3,-3.2C22,12.8 21.1,11.3 19.6,10.6z"/>
+    
+</vector>

core/src/main/res/drawable/ic_privacypolicy.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21.406,5.086l-9,-4a1,1 0,0 0,-0.812 0l-9,4A1,1 0,0 0,2 6v0.7a18.507,18.507 0,0 0,9.515 16.17,1 1,0 0,0 0.97,0A18.507,18.507 0,0 0,22 6.7L22,6A1,1 0,0 0,21.406 5.086ZM20,6.7a16.507,16.507 0,0 1,-8 14.141A16.507,16.507 0,0 1,4 6.7L4,6.65l8,-3.556L20,6.65ZM11,10h2v8L11,18ZM11,6h2L13,8L11,8Z"
+      android:fillColor="#FFFFFF"/>
+</vector>

core/src/main/res/xml/fragment_settings.xml

@@ -49,24 +49,27 @@
 
     <Preference
         app:fragment="com.nomadics9.ananas.fragments.SettingsCacheFragment"
-        app:title="@string/settings_category_cache" />
+        app:title="@string/settings_category_cache"
+        app:icon="@drawable/ic_cache"/>
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         app:key="pref_offline_mode"
-        app:title="@string/offline_mode" />
+        app:title="@string/offline_mode"
+        app:icon="@drawable/ic_offline"/>
 
     <PreferenceCategory app:title="@string/about">
 
+        <Preference
+            app:key="privacyPolicy"
+            app:title="@string/privacy_policy"
+            app:icon="@drawable/ic_privacypolicy"/>
+
         <Preference
             app:key="appInfo"
             app:icon="@drawable/ic_logo"
             app:title="@string/app_info" />
 
-        <Preference
-            app:key="privacyPolicy"
-            app:title="@string/privacy_policy" />
-
 
     </PreferenceCategory>
 

core/src/main/res/xml/fragment_settings_appearance.xml

@@ -13,7 +13,7 @@
         app:summary="@string/dynamic_colors_summary"
         app:title="@string/dynamic_colors" />
     <SwitchPreferenceCompat
-        app:defaultValue="false"
+        app:defaultValue="true"
         app:key="pref_amoled_theme"
         app:summary="@string/amoled_theme_summary"
         app:title="@string/amoled_theme" />