Skip to content

Commit 31e1e66

Browse files
Merge 073ec41 into 1640e7d
2 parents 1640e7d + 073ec41 commit 31e1e66

File tree

4 files changed

+46
-5
lines changed

4 files changed

+46
-5
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
android:fullBackupContent="@xml/backup_rules"
99
android:icon="@mipmap/ic_launcher"
1010
android:label="@string/app_name"
11+
android:networkSecurityConfig="@xml/network_security_config"
1112
android:roundIcon="@mipmap/ic_launcher_round"
1213
android:supportsRtl="true"
13-
android:theme="@style/Theme.Actions"
14+
android:usesCleartextTraffic="false"
1415
tools:targetApi="31">
1516

1617
<activity
Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
11
<resources>
2-
<style name="Base.Theme.Actions" parent="Theme.Material3.DayNight.NoActionBar">
2+
3+
<style name="Base.Theme" parent="Theme.Material3.DayNight.NoActionBar">
4+
<item name="colorPrimary">@color/colorPrimary</item>
5+
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
6+
<item name="colorAccent">@color/colorAccent</item>
7+
8+
<item name="android:windowBackground">@color/white</item>
9+
<item name="android:colorBackground">@color/white</item>
10+
<item name="android:breakStrategy">simple</item>
11+
<item name="android:statusBarColor">@color/white</item>
12+
</style>
13+
14+
<style name="Base.Theme.NoActionBar">
15+
<item name="windowActionBar">false</item>
16+
<item name="windowNoTitle">true</item>
17+
</style>
18+
19+
<style name="Theme.Main" parent="Base.Theme">
320

421
</style>
522

6-
<style name="Theme.Actions" parent="Base.Theme.Actions" />
723
</resources>

app/src/main/res/values/themes.xml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
11
<resources>
2-
<style name="Base.Theme.Actions" parent="Theme.Material3.DayNight.NoActionBar">
2+
3+
<style name="Base.Theme" parent="Theme.Material3.DayNight.NoActionBar">
4+
<item name="colorPrimary">@color/colorPrimary</item>
5+
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
6+
<item name="colorAccent">@color/colorAccent</item>
7+
8+
<item name="android:windowBackground">@color/white</item>
9+
<item name="android:colorBackground">@color/white</item>
10+
<item name="android:breakStrategy">simple</item>
11+
<item name="android:statusBarColor">@color/white</item>
12+
</style>
13+
14+
<style name="Base.Theme.NoActionBar">
15+
<item name="windowActionBar">false</item>
16+
<item name="windowNoTitle">true</item>
17+
</style>
18+
19+
<style name="Theme.Main" parent="Base.Theme">
320

421
</style>
522

6-
<style name="Theme.Actions" parent="Base.Theme.Actions" />
723
</resources>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<network-security-config>
3+
<domain-config cleartextTrafficPermitted="false">
4+
<domain includeSubdomains="true">
5+
6+
</domain>
7+
</domain-config>
8+
</network-security-config>

0 commit comments

Comments
 (0)