Skip to content

Commit c37fd83

Browse files
LennoardLennoard
committed
feature[#30]: API 31 splash
1 parent ef3f5f8 commit c37fd83

8 files changed

Lines changed: 86 additions & 53 deletions

File tree

‎app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
android:label="@string/app_name"
1616
android:roundIcon="@mipmap/ic_launcher_round"
1717
android:supportsRtl="true"
18-
android:theme="@style/AppTheme.Starting"
18+
android:theme="@style/AppTheme"
1919
tools:ignore="GoogleAppIndexingWarning">
2020

2121
<activity
@@ -36,7 +36,7 @@
3636
<activity
3737
android:name=".ui.StartActivity"
3838
android:exported="true"
39-
android:theme="@style/AppTheme">
39+
android:theme="@style/AppTheme.Starting">
4040
<intent-filter>
4141
<action android:name="android.intent.action.MAIN" />
4242

‎app/src/main/kotlin/com/androidvip/sysctlgui/ui/StartActivity.kt‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ package com.androidvip.sysctlgui.ui
22

33
import android.content.Intent
44
import android.os.Bundle
5-
import android.view.WindowManager
6-
import androidx.appcompat.app.AlertDialog
5+
import android.widget.Toast
76
import androidx.appcompat.app.AppCompatActivity
8-
import androidx.core.content.ContextCompat
97
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
108
import androidx.lifecycle.lifecycleScope
119
import com.androidvip.sysctlgui.R
@@ -16,10 +14,12 @@ import com.androidvip.sysctlgui.domain.repository.AppPrefs
1614
import com.androidvip.sysctlgui.domain.usecase.PerformDatabaseMigrationUseCase
1715
import com.androidvip.sysctlgui.goAway
1816
import com.androidvip.sysctlgui.helpers.Actions
17+
import com.androidvip.sysctlgui.toast
1918
import com.androidvip.sysctlgui.ui.main.MainActivity
2019
import com.androidvip.sysctlgui.ui.params.edit.EditKernelParamActivity
2120
import com.androidvip.sysctlgui.ui.params.user.RemovableParamAdapter
2221
import com.topjohnwu.superuser.Shell
22+
import kotlinx.coroutines.CoroutineDispatcher
2323
import kotlinx.coroutines.Dispatchers
2424
import kotlinx.coroutines.delay
2525
import kotlinx.coroutines.launch
@@ -31,19 +31,16 @@ class StartActivity : AppCompatActivity() {
3131
private val prefs: AppPrefs by inject()
3232
private val rootUtils: RootUtils by inject()
3333
private val performDatabaseMigrationUseCase: PerformDatabaseMigrationUseCase by inject()
34+
private val dispatcher: CoroutineDispatcher by lazy { Dispatchers.Default }
3435

3536
override fun onCreate(savedInstanceState: Bundle?) {
37+
val splashScreen = installSplashScreen()
3638
super.onCreate(savedInstanceState)
37-
installSplashScreen()
39+
40+
splashScreen.setKeepOnScreenCondition { true }
3841
binding = ActivitySplashBinding.inflate(layoutInflater)
3942
setContentView(binding.root)
4043

41-
window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
42-
window.statusBarColor = ContextCompat.getColor(
43-
this,
44-
R.color.colorPrimaryLight
45-
)
46-
4744
lifecycleScope.launch {
4845
val isRootAccessGiven = checkRootAccess()
4946

@@ -61,17 +58,13 @@ class StartActivity : AppCompatActivity() {
6158
finish()
6259
} else {
6360
binding.splashProgress.goAway()
64-
AlertDialog.Builder(this@StartActivity)
65-
.setTitle(R.string.error)
66-
.setMessage(getString(R.string.root_not_found_sum))
67-
.setPositiveButton(android.R.string.ok) { _, _ -> finish() }
68-
.setCancelable(false)
69-
.show()
61+
toast(R.string.root_not_found_sum, Toast.LENGTH_LONG)
62+
finish()
7063
}
7164
}
7265
}
7366

74-
private suspend fun checkRootAccess() = withContext(Dispatchers.Default) {
67+
private suspend fun checkRootAccess() = withContext(dispatcher) {
7568
delay(500)
7669
Shell.rootAccess()
7770
}

‎app/src/main/res/drawable-night/ic_splash.xml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="108dp"
3+
android:height="108dp"
4+
android:viewportWidth="108"
5+
android:viewportHeight="108">
6+
7+
<path
8+
android:fillColor="@color/gray_100"
9+
android:pathData="m76.795,71.195c-0.423,-0.477 -0.623,-1.359 -0.837,-2.298s-0.456,-1.949 -1.225,-2.605l-0.006,-0.003a3.141,3.141 0,0 0,-0.945 -0.572c1.07,-3.174 0.653,-6.336 -0.432,-9.191c-1.323,-3.508 -3.642,-6.562 -5.409,-8.651c-1.979,-2.497 -3.913,-4.867 -3.877,-8.368c0.063,-5.343 0.587,-15.252 -8.815,-15.264a13.887,13.887 0,0 0,-1.195 0.051c-10.508,0.843 -7.718,11.944 -7.876,15.66c-0.191,2.718 -0.742,4.861 -2.614,7.519c-2.193,2.611 -5.287,6.839 -6.753,11.238c-0.691,2.077 -1.019,4.193 -0.718,6.199a5.662,5.662 0,0 0,-0.271 0.265c-0.644,0.688 -1.121,1.523 -1.654,2.083c-0.495,0.498 -1.201,0.682 -1.979,0.963s-1.63,0.688 -2.149,1.684l-0.003,0.006a2.98,2.98 0,0 0,-0.322 1.442c0,0.459 0.069,0.927 0.137,1.374c0.143,0.933 0.289,1.815 0.095,2.414c-0.614,1.681 -0.691,2.843 -0.259,3.686c0.435,0.846 1.323,1.219 2.333,1.427c2.015,0.42 4.744,0.316 6.896,1.457l0.185,-0.349l-0.182,0.352c2.304,1.204 4.64,1.63 6.503,1.207c1.353,-0.31 2.447,-1.115 3.013,-2.351c1.457,-0.006 3.055,-0.623 5.617,-0.763c1.737,-0.14 3.91,0.617 6.404,0.477a3.335,3.335 0,0 0,0.295 0.787c0.966,1.934 2.766,2.819 4.682,2.67s3.961,-1.281 5.612,-3.245l-0.304,-0.253l0.304,0.25c1.571,-1.907 4.181,-2.697 5.913,-3.74c0.864,-0.522 1.565,-1.177 1.621,-2.125c0.054,-0.948 -0.504,-2.012 -1.785,-3.433zM53.58,36.304c-0.009,-0.697 0.107,-1.296 0.375,-1.904s0.599,-1.046 1.067,-1.401s0.93,-0.519 1.472,-0.525l0.027,0c0.533,0 0.989,0.158 1.457,0.498c0.474,0.346 0.817,0.778 1.091,1.38a4.449,4.449 0,0 1,0.42 1.895c0.006,0.7 -0.113,1.296 -0.378,1.904a3.666,3.666 0,0 1,-0.536 0.891l-0.221,-0.098c-0.265,-0.113 -0.498,-0.206 -0.706,-0.286s-0.37,-0.131 -0.539,-0.191c0.122,-0.146 0.364,-0.322 0.45,-0.539a2.81,2.81 0,0 0,0.215 -1.034l0.006,-0.048a2.84,2.84 0,0 0,-0.149 -1.004c-0.113,-0.337 -0.256,-0.581 -0.462,-0.784s-0.414,-0.295 -0.665,-0.301l-0.033,0a0.966,0.966 0,0 0,-0.647 0.256a1.842,1.842 0,0 0,-0.519 0.745a2.813,2.813 0,0 0,-0.215 1.037l-0.003,0.045a2.956,2.956 0,0 0,0.042 0.596a7.34,7.34 0,0 0,-1.511 -0.51a5.01,5.01 0,0 1,-0.042 -0.566l0,-0.057l0.003,0zM47.191,36.458c-0.036,-0.602 0.027,-1.121 0.191,-1.657s0.387,-0.927 0.709,-1.246a1.538,1.538 0,0 1,1.04 -0.501l0.089,0c0.352,0 0.671,0.119 0.998,0.378a2.885,2.885 0,0 1,0.846 1.159c0.226,0.51 0.346,1.022 0.378,1.624l0,0.006a4.5,4.5 0,0 1,-0.006 0.724c-0.069,0.018 -0.137,0.042 -0.203,0.063c-0.381,0.131 -0.685,0.277 -0.977,0.471a2.518,2.518 0,0 0,0.009 -0.638l0,-0.036a2.831,2.831 0,0 0,-0.203 -0.817a1.559,1.559 0,0 0,-0.411 -0.605c-0.155,-0.131 -0.298,-0.194 -0.456,-0.191l-0.051,0.003c-0.182,0.015 -0.328,0.101 -0.468,0.274a1.597,1.597 0,0 0,-0.301 0.665a2.718,2.718 0,0 0,-0.057 0.873l0.003,0.036c0.03,0.307 0.092,0.563 0.2,0.82a1.574,1.574 0,0 0,0.495 0.668c-0.176,0.134 -0.292,0.232 -0.435,0.337l-0.328,0.241a2.965,2.965 0,0 1,-0.682 -1.019a4.554,4.554 0,0 1,-0.381 -1.627l0,-0.006zM47.653,40.118c0.557,-0.417 0.939,-0.697 1.198,-0.888c0.256,-0.188 0.361,-0.256 0.441,-0.334l0.003,0c0.417,-0.393 1.079,-1.115 2.083,-1.46c0.343,-0.119 0.73,-0.194 1.162,-0.197c0.82,-0.003 1.812,0.265 3.01,1.037c0.736,0.477 1.308,0.519 2.628,1.082l0.003,0c0.635,0.259 1.007,0.602 1.189,0.957c0.182,0.358 0.188,0.745 0.036,1.153c-0.307,0.814 -1.278,1.675 -2.643,2.101l-0.003,0c-0.668,0.215 -1.246,0.694 -1.928,1.085a4.318,4.318 0,0 1,-2.509 0.647a3.293,3.293 0,0 1,-1.115 -0.247a3.582,3.582 0,0 1,-0.805 -0.498c-0.48,-0.39 -0.903,-0.879 -1.52,-1.24l-0.006,0c-0.992,-0.566 -1.535,-1.216 -1.708,-1.782c-0.17,-0.563 -0.009,-1.046 0.483,-1.416zM48.043,78.913l0,0.003c-0.14,1.857 -1.186,2.864 -2.795,3.233c-1.606,0.367 -3.785,0 -5.957,-1.135l-0.003,0c-2.408,-1.273 -5.269,-1.147 -7.105,-1.532c-0.918,-0.191 -1.517,-0.48 -1.794,-1.016c-0.274,-0.536 -0.28,-1.472 0.304,-3.064l0.003,-0.006l0.003,-0.006c0.289,-0.891 0.075,-1.866 -0.063,-2.783c-0.14,-0.915 -0.209,-1.746 0.101,-2.327l0.003,-0.006c0.402,-0.772 0.989,-1.049 1.717,-1.308c0.73,-0.262 1.591,-0.468 2.277,-1.15l0.003,-0.003l0.003,-0.003c0.632,-0.665 1.106,-1.499 1.66,-2.092c0.468,-0.498 0.936,-0.831 1.642,-0.834l0.027,0c0.122,0 0.253,0.009 0.393,0.033c0.936,0.14 1.752,0.799 2.542,1.863l2.271,4.139l0.003,0c0.602,1.261 1.88,2.652 2.962,4.068c1.079,1.416 1.919,2.837 1.809,3.925l-0.006,0.003zM47.856,75.903a20.029,20.029 0,0 0,-0.992 -1.398a40.133,40.133 0,0 0,-0.682 -0.873c0.45,0 0.834,-0.072 1.144,-0.215a1.448,1.448 0,0 0,0.793 -0.817c0.268,-0.721 0,-1.737 -0.858,-2.9c-0.864,-1.162 -2.319,-2.473 -4.452,-3.782c-1.571,-0.977 -2.447,-2.172 -2.858,-3.472s-0.355,-2.703 -0.039,-4.092c0.608,-2.664 2.172,-5.251 3.168,-6.878c0.268,-0.197 0.095,0.367 -1.01,2.417c-0.989,1.874 -2.84,6.202 -0.307,9.578a20.032,20.032 0,0 1,1.603 -7.146c1.407,-3.18 4.339,-8.699 4.571,-13.098c0.122,0.086 0.536,0.367 0.718,0.471c0.542,0.316 0.942,0.781 1.466,1.201c0.527,0.423 1.18,0.787 2.172,0.843l0.277,0.009c1.022,0 1.818,-0.334 2.482,-0.712c0.721,-0.411 1.299,-0.87 1.842,-1.046l0.003,0c1.153,-0.364 2.068,-0.998 2.59,-1.743c0.9,3.534 2.983,8.633 4.321,11.125c0.712,1.32 2.131,4.127 2.742,7.51c0.387,-0.012 0.814,0.045 1.273,0.161c1.6,-4.151 -1.356,-8.618 -2.709,-9.864c-0.548,-0.53 -0.572,-0.769 -0.304,-0.757c1.466,1.299 3.394,3.907 4.095,6.854c0.319,1.344 0.387,2.757 0.048,4.151c0.167,0.069 0.337,0.143 0.51,0.226c2.569,1.252 3.52,2.339 3.061,3.823c-0.149,-0.006 -0.298,-0.003 -0.441,0l-0.042,0c0.373,-1.177 -0.45,-2.047 -2.649,-3.04c-2.277,-1.001 -4.092,-0.903 -4.399,1.129a3.88,3.88 0,0 0,-0.051 0.325c-0.17,0.06 -0.34,0.134 -0.513,0.226c-1.067,0.587 -1.654,1.648 -1.979,2.95c-0.322,1.302 -0.417,2.873 -0.507,4.643c-0.057,0.888 -0.42,2.092 -0.793,3.365c-3.722,2.673 -8.899,3.823 -13.294,0.823zM76.548,76.073c-1.562,0.945 -4.339,1.767 -6.109,3.913c-1.541,1.833 -3.415,2.837 -5.066,2.968c-1.654,0.131 -3.078,-0.554 -3.919,-2.241l0,-0.003l-0.003,-0.009c-0.522,-0.992 -0.304,-2.557 0.134,-4.208c0.438,-1.651 1.07,-3.347 1.156,-4.723l0,-0.003c0.089,-1.764 0.188,-3.308 0.486,-4.497c0.298,-1.189 0.763,-1.994 1.588,-2.447l0.116,-0.06c0.092,1.529 0.849,3.087 2.187,3.424c1.463,0.384 3.573,-0.87 4.464,-1.895c0.179,-0.006 0.352,-0.018 0.522,-0.021c0.781,-0.018 1.433,0.027 2.107,0.611l0,0.003l0.003,0c0.516,0.435 0.76,1.261 0.972,2.184c0.212,0.924 0.381,1.928 1.019,2.646l0.003,0c1.222,1.359 1.615,2.277 1.582,2.861c-0.033,0.59 -0.456,1.025 -1.243,1.496z" />
10+
11+
<path
12+
android:fillColor="@color/gray_50"
13+
android:pathData="m56.054,42.968c-1.031,0.535 -2.238,1.19 -3.518,1.19s-2.294,-0.592 -3.019,-1.17c-0.368,-0.286 -0.663,-0.572 -0.887,-0.782c-0.388,-0.306 -0.34,-0.734 -0.181,-0.719c0.266,0.034 0.306,0.385 0.476,0.541c0.227,0.212 0.51,0.487 0.855,0.762c0.688,0.544 1.606,1.076 2.756,1.076s2.487,-0.674 3.305,-1.133c0.462,-0.261 1.051,-0.725 1.532,-1.079c0.368,-0.269 0.354,-0.595 0.657,-0.561c0.303,0.037 0.079,0.36 -0.346,0.731a9.641,9.641 0,0 1,-1.631 1.144z" />
14+
15+
<path
16+
android:fillColor="@color/gray_100"
17+
android:pathData="m53.55,38.757c0.048,0.153 0.297,0.128 0.44,0.201c0.128,0.064 0.227,0.207 0.37,0.211c0.134,0.003 0.342,-0.048 0.361,-0.182c0.026,-0.179 -0.233,-0.29 -0.402,-0.354c-0.214,-0.083 -0.488,-0.124 -0.689,-0.013c-0.045,0.026 -0.096,0.086 -0.08,0.137zM52.082,38.757c-0.051,0.153 -0.3,0.128 -0.444,0.201c-0.124,0.064 -0.227,0.207 -0.367,0.211c-0.134,0.003 -0.345,-0.048 -0.364,-0.182c-0.022,-0.179 0.236,-0.29 0.402,-0.354c0.214,-0.083 0.488,-0.124 0.693,-0.013c0.048,0.026 0.096,0.086 0.08,0.137z"
18+
android:strokeWidth="1" />
19+
20+
<path
21+
android:fillColor="@color/gray_300"
22+
android:pathData="m58.05763,61.20158c0.02184,-0.1747 0.03822,-0.34941 0.03822,-0.53503c0,-0.18562 -0.01638,-0.36033 -0.03822,-0.53503l1.15196,-0.90082c0.10373,-0.08189 0.13103,-0.2293 0.06551,-0.34941l-1.0919,-1.88899c-0.04914,-0.08735 -0.14195,-0.13649 -0.24022,-0.13649c-0.03276,0 -0.06551,0.00546 -0.09281,0.01638l-1.35942,0.54595c-0.28389,-0.21838 -0.58963,-0.39854 -0.92266,-0.53503l-0.20746,-1.44677c-0.01638,-0.13103 -0.13103,-0.2293 -0.26752,-0.2293l-2.18381,0c-0.13649,0 -0.25114,0.09827 -0.26752,0.2293l-0.20746,1.44677c-0.33303,0.13649 -0.63876,0.32211 -0.92266,0.53503l-1.35942,-0.54595c-0.03276,-0.01092 -0.06551,-0.01638 -0.09827,-0.01638c-0.09281,0 -0.18562,0.04914 -0.23476,0.13649l-1.0919,1.88899c-0.07097,0.12011 -0.03822,0.26752 0.06551,0.34941l1.15196,0.90082c-0.02184,0.1747 -0.03822,0.35487 -0.03822,0.53503c0,0.18016 0.01638,0.36033 0.03822,0.53503l-1.15196,0.90082c-0.10373,0.08189 -0.13103,0.2293 -0.06551,0.34941l1.0919,1.88899c0.04914,0.08735 0.14195,0.13649 0.24022,0.13649c0.03276,0 0.06551,-0.00546 0.09281,-0.01638l1.35942,-0.54595c0.28389,0.21838 0.58963,0.39854 0.92266,0.53503l0.20746,1.44677c0.01638,0.13103 0.13103,0.2293 0.26752,0.2293l2.18381,0c0.13649,0 0.25114,-0.09827 0.26752,-0.2293l0.20746,-1.44677c0.33303,-0.13649 0.63876,-0.32211 0.92266,-0.53503l1.35942,0.54595c0.03276,0.01092 0.06551,0.01638 0.09827,0.01638c0.09281,0 0.18562,-0.04914 0.23476,-0.13649l1.0919,-1.88899c0.06551,-0.12011 0.03822,-0.26752 -0.06551,-0.34941l-1.15196,-0.90082zm-1.08098,-0.93358c0.02184,0.16924 0.0273,0.28389 0.0273,0.39854c0,0.11465 -0.01092,0.23476 -0.0273,0.39854l-0.07643,0.61693l0.4859,0.38217l0.58963,0.4586l-0.38217,0.6606l-0.69336,-0.27844l-0.56779,-0.2293l-0.49136,0.37125c-0.23476,0.1747 -0.4586,0.30573 -0.68244,0.39854l-0.57871,0.23476l-0.08735,0.61693l-0.10919,0.73703l-0.76433,0l-0.10373,-0.73703l-0.08735,-0.61693l-0.57871,-0.23476c-0.23476,-0.09827 -0.45314,-0.22384 -0.67152,-0.38763l-0.49682,-0.38217l-0.57871,0.23476l-0.69336,0.27844l-0.38217,-0.6606l0.58963,-0.4586l0.4859,-0.38217l-0.07643,-0.61693c-0.01638,-0.16924 -0.0273,-0.29481 -0.0273,-0.404s0.01092,-0.23476 0.0273,-0.39854l0.07643,-0.61693l-0.4859,-0.38217l-0.58963,-0.4586l0.38217,-0.6606l0.69336,0.27844l0.56779,0.2293l0.49136,-0.37125c0.23476,-0.1747 0.4586,-0.30573 0.68244,-0.39854l0.57871,-0.23476l0.08735,-0.61693l0.10919,-0.73703l0.75887,0l0.10373,0.73703l0.08735,0.61693l0.57871,0.23476c0.23476,0.09827 0.45314,0.22384 0.67152,0.38763l0.49682,0.38217l0.57871,-0.23476l0.69336,-0.27844l0.38217,0.6606l-0.58417,0.46406l-0.4859,0.38217l0.07643,0.61693zm-2.97544,-1.78526c-1.20655,0 -2.18381,0.97725 -2.18381,2.18381s0.97725,2.18381 2.18381,2.18381s2.18381,-0.97725 2.18381,-2.18381s-0.97725,-2.18381 -2.18381,-2.18381zm0,3.27571c-0.60055,0 -1.0919,-0.49136 -1.0919,-1.0919s0.49136,-1.0919 1.0919,-1.0919s1.0919,0.49136 1.0919,1.0919s-0.49136,1.0919 -1.0919,1.0919z" />
23+
</vector>

0 commit comments

Comments
 (0)