Skip to content

Commit d83aea7

Browse files
sameeraswsameerasw
authored
Merge pull request #12 from sameerasw/develop
Develop #10 & #11
2 parents 10e8369 + 153298b commit d83aea7

File tree

7 files changed

+118
-26
lines changed

7 files changed

+118
-26
lines changed

‎app/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ android {
1414
applicationId = "com.sameerasw.essentials"
1515
minSdk = 23
1616
targetSdk = 36
17-
versionCode = 6
18-
versionName = "5.0"
17+
versionCode = 7
18+
versionName = "5.1"
1919

2020
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2121
}

‎app/src/main/java/com/sameerasw/essentials/MainActivity.kt‎

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -46,24 +46,7 @@ class MainActivity : ComponentActivity() {
4646
val splashScreenView = splashScreenViewProvider.view
4747
val splashIcon = splashScreenViewProvider.iconView
4848

49-
// Scale down animation
50-
val scaleUp = ObjectAnimator.ofFloat(splashIcon, "scaleX", 1f, 0.5f).apply {
51-
interpolator = AnticipateInterpolator()
52-
duration = 750
53-
}
54-
55-
val scaleUpY = ObjectAnimator.ofFloat(splashIcon, "scaleY", 1f, 0.5f).apply {
56-
interpolator = AnticipateInterpolator()
57-
duration = 750
58-
}
59-
60-
// rotate
61-
val rotate360 = ObjectAnimator.ofFloat(splashIcon, "rotation", 0f,-90f).apply {
62-
interpolator = AnticipateInterpolator()
63-
duration = 750
64-
}
65-
66-
// Fade out animation
49+
// Fade out animation for the splash screen view
6750
val fadeOut = ObjectAnimator.ofFloat(splashScreenView, "alpha", 1f, 0f).apply {
6851
interpolator = AnticipateInterpolator()
6952
duration = 750
@@ -72,10 +55,31 @@ class MainActivity : ComponentActivity() {
7255
splashScreenViewProvider.remove()
7356
}
7457

58+
// Only animate the icon if it exists (some OEM devices may not have it)
59+
if (splashIcon != null) {
60+
// Scale down animation
61+
val scaleUp = ObjectAnimator.ofFloat(splashIcon, "scaleX", 1f, 0.5f).apply {
62+
interpolator = AnticipateInterpolator()
63+
duration = 750
64+
}
65+
66+
val scaleUpY = ObjectAnimator.ofFloat(splashIcon, "scaleY", 1f, 0.5f).apply {
67+
interpolator = AnticipateInterpolator()
68+
duration = 750
69+
}
70+
71+
// rotate
72+
val rotate360 = ObjectAnimator.ofFloat(splashIcon, "rotation", 0f,-90f).apply {
73+
interpolator = AnticipateInterpolator()
74+
duration = 750
75+
}
76+
77+
scaleUp.start()
78+
scaleUpY.start()
79+
rotate360.start()
80+
}
81+
7582
fadeOut.start()
76-
scaleUp.start()
77-
scaleUpY.start()
78-
rotate360.start()
7983
}
8084

8185
enableEdgeToEdge()

‎app/src/main/java/com/sameerasw/essentials/ui/composables/configs/StatusBarIconSettingsUI.kt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import androidx.compose.material3.Icon
1616
import androidx.compose.material3.MaterialTheme
1717
import androidx.compose.material3.Switch
1818
import androidx.compose.material3.Text
19+
import androidx.compose.material3.Button
1920
import androidx.compose.runtime.Composable
2021
import androidx.compose.runtime.LaunchedEffect
2122
import androidx.compose.runtime.getValue
@@ -342,5 +343,18 @@ fun StatusBarIconSettingsUI(
342343
}
343344
}
344345
}
346+
347+
// Reset All Icons Button
348+
Button(
349+
onClick = {
350+
viewModel.resetAllIcons(context)
351+
},
352+
modifier = Modifier
353+
.fillMaxWidth()
354+
.padding(vertical = 16.dp),
355+
enabled = isPermissionGranted
356+
) {
357+
Text("Reset All Icons")
358+
}
345359
}
346360
}

‎app/src/main/java/com/sameerasw/essentials/viewmodels/StatusBarIconViewModel.kt‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -715,4 +715,28 @@ class StatusBarIconViewModel : ViewModel() {
715715
}
716716
updateIconBlacklist(context)
717717
}
718-
}
718+
719+
fun resetAllIcons(context: Context) {
720+
// Set default visibility states
721+
setMobileDataVisible(true, context)
722+
setWiFiVisible(true, context)
723+
setVpnVisible(true, context)
724+
setAlarmClockVisible(false, context)
725+
setHotspotVisible(true, context)
726+
setBluetoothVisible(true, context)
727+
setDataSaverVisible(true, context)
728+
setHeadsetVisible(false, context)
729+
setRotateVisible(false, context)
730+
setVolteVisible(true, context)
731+
setCastVisible(true, context)
732+
setClockVisible(true, context)
733+
setAirplaneVisible(true, context)
734+
735+
// Turn off both smart toggles
736+
setSmartWiFiEnabled(false, context)
737+
setSmartDataEnabled(false, context)
738+
739+
// Update the icon blacklist to reflect all changes
740+
updateIconBlacklist(context)
741+
}
742+
}

‎app/src/main/res/drawable/ic_launcher_foreground_light.xml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
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+
<group>
7+
<clip-path
8+
android:pathData="M43.75,15.75l48.5,28l-28,48.5l-48.5,-28z"/>
9+
<path
10+
android:pathData="M69.06,31.58C71.16,32.79 72.13,35.28 71.37,37.5L71.03,38.49C69.71,42.39 72.23,46.63 76.37,47.46L77.42,47.67C79.79,48.15 81.53,50.21 81.56,52.58L81.61,56.16C81.64,58.53 79.96,60.54 77.6,60.95L76.56,61.14C72.44,61.86 70.03,66.03 71.46,69.96L71.82,70.96C72.64,73.21 71.74,75.68 69.67,76.83L66.55,78.58C64.48,79.74 61.83,79.26 60.23,77.45L59.52,76.64C56.73,73.47 51.8,73.41 49.09,76.5L48.4,77.29C46.85,79.06 44.21,79.47 42.11,78.25L38.94,76.42C36.84,75.21 35.87,72.72 36.63,70.5L36.97,69.51C38.29,65.61 35.77,61.37 31.63,60.54L30.58,60.33C28.21,59.85 26.47,57.79 26.44,55.42L26.39,51.84C26.36,49.47 28.04,47.46 30.4,47.05L31.44,46.86C35.56,46.14 37.97,41.97 36.54,38.03L36.18,37.03C35.36,34.79 36.26,32.32 38.33,31.17L41.45,29.42C43.52,28.26 46.17,28.74 47.77,30.55L48.48,31.36C51.27,34.53 56.2,34.59 58.91,31.5L59.6,30.71C61.15,28.94 63.79,28.53 65.89,29.74L69.06,31.58ZM70.49,57.92C72.66,48.81 67.04,39.67 57.93,37.5C48.82,35.34 39.68,40.96 37.51,50.07C35.34,59.18 40.97,68.32 50.08,70.49C59.19,72.66 68.33,67.03 70.49,57.92Z"
11+
android:fillColor="#000000"
12+
android:fillAlpha="0.1"/>
13+
</group>
14+
<group>
15+
<clip-path
16+
android:pathData="M39.81,17.03l51.16,22.78l-22.78,51.16l-51.16,-22.78z"/>
17+
<path
18+
android:pathData="M66.63,30.12C68.85,31.11 70.07,33.48 69.55,35.78L69.32,36.8C68.41,40.81 71.36,44.76 75.56,45.16L76.63,45.26C79.04,45.49 80.98,47.35 81.26,49.7L81.68,53.26C81.96,55.61 80.5,57.79 78.2,58.45L77.18,58.74C73.16,59.89 71.2,64.29 73.03,68.05L73.5,69.01C74.55,71.16 73.91,73.7 71.97,75.07L69.05,77.13C67.11,78.5 64.43,78.31 62.65,76.67L61.86,75.94C58.75,73.08 53.84,73.53 51.47,76.89L50.86,77.75C49.51,79.67 46.93,80.35 44.71,79.36L41.37,77.88C39.15,76.89 37.93,74.52 38.45,72.22L38.68,71.2C39.59,67.19 36.64,63.24 32.44,62.84L31.37,62.74C28.96,62.51 27.02,60.65 26.74,58.29L26.32,54.74C26.04,52.39 27.5,50.21 29.8,49.55L30.82,49.26C34.84,48.11 36.8,43.71 34.97,39.95L34.5,38.99C33.45,36.84 34.09,34.3 36.03,32.93L38.95,30.87C40.89,29.5 43.57,29.69 45.35,31.33L46.14,32.06C49.25,34.92 54.16,34.47 56.53,31.11L57.14,30.25C58.49,28.33 61.07,27.65 63.29,28.64L66.63,30.12ZM70.81,56.18C72.02,46.89 65.47,38.39 56.18,37.18C46.9,35.98 38.39,42.53 37.19,51.82C35.98,61.1 42.54,69.61 51.82,70.81C61.11,72.01 69.61,65.46 70.81,56.18Z"
19+
android:fillColor="#000000"
20+
android:fillAlpha="0.2"/>
21+
</group>
22+
<group>
23+
<clip-path
24+
android:pathData="M36.02,18.72l53.26,17.3l-17.3,53.26l-53.26,-17.3z"/>
25+
<path
26+
android:pathData="M64.07,28.93C66.38,29.68 67.84,31.92 67.56,34.25L67.44,35.29C66.95,39.38 70.3,43 74.52,42.95L75.6,42.94C78.01,42.92 80.14,44.57 80.66,46.88L81.46,50.37C81.98,52.68 80.75,55 78.53,55.89L77.55,56.29C73.67,57.86 72.18,62.44 74.4,65.99L74.96,66.89C76.23,68.92 75.86,71.51 74.08,73.08L71.39,75.43C69.6,77 66.91,77.08 64.97,75.64L64.11,75C60.72,72.48 55.88,73.44 53.87,77.03L53.36,77.95C52.22,80 49.72,80.95 47.41,80.2L43.93,79.07C41.62,78.32 40.16,76.08 40.44,73.75L40.56,72.71C41.05,68.62 37.7,65 33.48,65.05L32.4,65.06C29.99,65.08 27.86,63.43 27.34,61.12L26.55,57.63C26.02,55.32 27.25,53 29.47,52.11L30.45,51.71C34.33,50.14 35.82,45.56 33.6,42.01L33.04,41.11C31.77,39.08 32.14,36.49 33.92,34.92L36.61,32.57C38.4,31 41.09,30.92 43.03,32.36L43.89,33C47.28,35.52 52.12,34.56 54.13,30.97L54.64,30.05C55.78,28 58.28,27.05 60.59,27.8L64.07,28.93ZM70.95,54.41C71.18,45.05 63.77,37.27 54.41,37.05C45.05,36.82 37.28,44.23 37.05,53.59C36.83,62.95 44.23,70.72 53.59,70.94C62.95,71.17 70.72,63.77 70.95,54.41Z"
27+
android:fillColor="#000000"
28+
android:fillAlpha="0.3"/>
29+
</group>
30+
<group>
31+
<clip-path
32+
android:pathData="M32.43,20.79l54.78,11.64l-11.64,54.78l-54.78,-11.64z"/>
33+
<path
34+
android:pathData="M61.39,28.02C63.77,28.52 65.46,30.59 65.42,32.94L65.41,33.99C65.35,38.1 69.06,41.35 73.25,40.87L74.32,40.74C76.72,40.47 79.01,41.89 79.77,44.13L80.93,47.52C81.69,49.76 80.71,52.2 78.6,53.32L77.66,53.82C73.96,55.78 72.96,60.49 75.54,63.79L76.19,64.63C77.67,66.51 77.57,69.13 75.96,70.87L73.53,73.5C71.92,75.24 69.25,75.61 67.17,74.38L66.25,73.83C62.61,71.68 57.9,73.14 56.28,76.92L55.87,77.88C54.94,80.05 52.56,81.25 50.19,80.74L46.61,79.98C44.23,79.48 42.54,77.41 42.58,75.06L42.59,74.01C42.65,69.9 38.94,66.64 34.74,67.13L33.68,67.26C31.28,67.53 28.99,66.11 28.23,63.87L27.07,60.48C26.31,58.24 27.29,55.8 29.4,54.68L30.34,54.18C34.04,52.22 35.04,47.51 32.46,44.21L31.81,43.37C30.33,41.49 30.43,38.87 32.04,37.13L34.47,34.5C36.08,32.76 38.75,32.39 40.83,33.62L41.75,34.17C45.39,36.32 50.1,34.86 51.72,31.08L52.13,30.12C53.06,27.95 55.44,26.75 57.81,27.26L61.39,28.02ZM70.9,52.63C70.15,43.3 61.97,36.34 52.64,37.1C43.3,37.85 36.35,46.03 37.1,55.36C37.85,64.69 46.03,71.65 55.36,70.89C64.7,70.14 71.65,61.97 70.9,52.63Z"
35+
android:fillColor="#000000"
36+
android:fillAlpha="0.4"/>
37+
</group>
38+
<group>
39+
<clip-path
40+
android:pathData="M29.08,23.23l55.69,5.85l-5.85,55.69l-55.69,-5.85z"/>
41+
<path
42+
android:pathData="M58.64,27.39C61.05,27.64 62.95,29.52 63.16,31.86L63.25,32.91C63.62,37 67.65,39.85 71.78,38.93L72.83,38.69C75.18,38.17 77.61,39.34 78.6,41.49L80.1,44.74C81.09,46.89 80.38,49.41 78.39,50.75L77.51,51.35C74.04,53.68 73.53,58.48 76.44,61.48L77.18,62.25C78.85,63.97 79.02,66.59 77.6,68.48L75.46,71.35C74.04,73.25 71.43,73.89 69.23,72.89L68.25,72.44C64.41,70.68 59.88,72.63 58.67,76.56L58.36,77.56C57.66,79.8 55.42,81.25 53,80.99L49.36,80.61C46.95,80.36 45.05,78.48 44.84,76.14L44.75,75.09C44.38,71 40.35,68.15 36.22,69.07L35.17,69.31C32.82,69.83 30.39,68.66 29.4,66.51L27.9,63.26C26.91,61.11 27.62,58.59 29.61,57.25L30.49,56.65C33.96,54.32 34.46,49.52 31.56,46.52L30.82,45.75C29.15,44.03 28.98,41.41 30.4,39.52L32.54,36.65C33.96,34.75 36.57,34.11 38.77,35.11L39.75,35.56C43.59,37.32 48.12,35.37 49.33,31.44L49.64,30.44C50.34,28.2 52.58,26.75 55,27.01L58.64,27.39ZM70.66,50.87C68.94,41.67 60.08,35.61 50.88,37.33C41.67,39.06 35.61,47.92 37.34,57.12C39.06,66.32 47.92,72.38 57.12,70.66C66.33,68.93 72.39,60.08 70.66,50.87Z"
43+
android:fillColor="#000000"
44+
android:fillAlpha="0.5"/>
45+
</group>
46+
<path
47+
android:pathData="M55.83,27.05C58.26,27.05 60.34,28.72 60.79,31.03L61,32.05C61.8,36.09 66.1,38.5 70.1,37.15L71.12,36.81C73.41,36.04 75.95,36.95 77.16,38.99L78.99,42.06C80.2,44.1 79.75,46.68 77.92,48.22L77.1,48.9C73.9,51.59 73.9,56.41 77.1,59.1L77.92,59.78C79.75,61.32 80.2,63.9 78.99,65.94L77.16,69.01C75.95,71.05 73.41,71.96 71.12,71.19L70.1,70.85C66.1,69.5 61.8,71.91 61,75.94L60.79,76.97C60.34,79.28 58.26,80.95 55.83,80.95H52.17C49.74,80.95 47.66,79.28 47.2,76.97L47,75.94C46.2,71.91 41.9,69.5 37.9,70.85L36.88,71.19C34.59,71.96 32.05,71.05 30.84,69.01L29.01,65.94C27.8,63.9 28.25,61.32 30.08,59.78L30.9,59.1C34.1,56.41 34.1,51.59 30.9,48.9L30.08,48.22C28.25,46.68 27.8,44.1 29.01,42.06L30.84,38.99C32.05,36.95 34.59,36.04 36.88,36.81L37.9,37.15C41.9,38.5 46.2,36.09 47,32.06L47.2,31.03C47.66,28.72 49.74,27.05 52.17,27.05H55.83ZM57.7,39.19C55.41,38.62 53,38.58 50.67,39.1C47.25,39.87 44.19,41.79 42.02,44.55C39.84,47.3 38.69,50.72 38.74,54.23C38.8,57.74 40.06,61.12 42.32,63.81C44.57,66.5 47.69,68.33 51.13,68.98C54.58,69.64 58.15,69.09 61.24,67.43C64.33,65.76 66.75,63.08 68.09,59.84C69.01,57.64 69.39,55.26 69.22,52.9C69.09,51.07 67.19,50.06 65.43,50.59C63.67,51.11 62.74,53 62.56,54.83C62.47,55.67 62.27,56.5 61.94,57.29C61.18,59.12 59.82,60.63 58.08,61.56C56.34,62.5 54.33,62.81 52.39,62.44C51.7,62.31 51.04,62.1 50.42,61.81C49.61,61.44 49.78,60.36 50.62,60.08L52.45,59.46C52.55,59.44 52.64,59.42 52.74,59.38L54.03,58.96L55.3,58.52C56.07,58.26 56.64,57.61 56.81,56.81L57.09,55.49L57.34,54.17C57.5,53.37 57.22,52.55 56.62,52.01L55.61,51.11L54.59,50.22C53.98,49.69 53.13,49.52 52.36,49.77L51.23,50.14C51.03,50.18 50.83,50.23 50.64,50.3L47.56,51.34C46.73,51.62 45.94,50.87 46.34,50.09C46.59,49.59 46.9,49.12 47.25,48.67C48.47,47.12 50.19,46.04 52.12,45.61C52.96,45.42 53.81,45.36 54.65,45.42C56.49,45.56 58.51,44.97 59.33,43.32C60.15,41.68 59.49,39.64 57.7,39.19Z"
48+
android:fillColor="#000000"/>
49+
</vector>
50+

‎app/src/main/res/values-v31/splash.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<item name="android:windowActionBar">false</item>
66
<item name="windowNoTitle">true</item>
77
<item name="windowActionBar">false</item>
8-
<item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
8+
<item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground_light</item>
99
<item name="windowSplashScreenAnimationDuration">3000</item>
1010
</style>
1111
</resources>

‎app/src/main/res/values/splash.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<item name="windowNoTitle">true</item>
77
<item name="windowActionBar">false</item>
88
<item name="windowSplashScreenBackground">@color/app_window_background</item>
9-
<item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
9+
<item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground_light</item>
1010
<item name="windowSplashScreenAnimationDuration">3000</item>
1111
<item name="postSplashScreenTheme">@style/Theme.Essentials</item>
1212
</style>

0 commit comments

Comments
 (0)