Skip to content

Commit 80c1a41

Browse files
Merge pull request #803 from Adamant-im/feat/spinner-when-restore
fix: android options spinner
2 parents fec34da + 37457fd commit 80c1a41

File tree

2 files changed

+38
-36
lines changed

2 files changed

+38
-36
lines changed
Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,37 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
3-
<application
4-
android:allowBackup="true"
5-
android:icon="@mipmap/ic_launcher"
6-
android:label="@string/app_name"
7-
android:roundIcon="@mipmap/ic_launcher_round"
8-
android:supportsRtl="true"
9-
android:theme="@style/AppTheme">
10-
<activity
11-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
12-
android:name=".MainActivity"
13-
android:label="@string/title_activity_main"
14-
android:theme="@style/AppTheme.NoActionBarLaunch"
15-
android:launchMode="singleTask"
16-
android:exported="true">
17-
<intent-filter>
18-
<action android:name="android.intent.action.MAIN" />
19-
<category android:name="android.intent.category.LAUNCHER" />
20-
</intent-filter>
21-
</activity>
22-
23-
<provider
24-
android:name="androidx.core.content.FileProvider"
25-
android:authorities="${applicationId}.fileprovider"
26-
android:exported="false"
27-
android:grantUriPermissions="true">
28-
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
29-
</provider>
30-
</application>
31-
32-
<!-- Permissions -->
33-
34-
<uses-permission android:name="android.permission.INTERNET" />
35-
<uses-permission android:name="android.permission.CAMERA" />
36-
</manifest>
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
3+
<application
4+
android:allowBackup="true"
5+
android:icon="@mipmap/ic_launcher"
6+
android:label="@string/app_name"
7+
android:roundIcon="@mipmap/ic_launcher_round"
8+
android:supportsRtl="true"
9+
android:theme="@style/AppTheme">
10+
<activity
11+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
12+
android:name=".MainActivity"
13+
android:label="@string/title_activity_main"
14+
android:theme="@style/AppTheme.NoActionBarLaunch"
15+
android:launchMode="singleTask"
16+
android:exported="true">
17+
<intent-filter>
18+
<action android:name="android.intent.action.MAIN" />
19+
<category android:name="android.intent.category.LAUNCHER" />
20+
</intent-filter>
21+
</activity>
22+
23+
<provider
24+
android:name="androidx.core.content.FileProvider"
25+
android:authorities="${applicationId}.fileprovider"
26+
android:exported="false"
27+
android:grantUriPermissions="true">
28+
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
29+
</provider>
30+
</application>
31+
32+
<!-- Permissions -->
33+
34+
<uses-permission android:name="android.permission.INTERNET" />
35+
<uses-permission android:name="android.permission.CAMERA" />
36+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
37+
</manifest>

src/components/AppToolbarCentered.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ const router = useRouter()
6161
const className = 'app-toolbar-centered'
6262
6363
const isOnline = computed(() => store.getters['isOnline'])
64+
6465
const classes = computed(() => {
6566
return {
6667
'v-toolbar--fixed': props.app,

0 commit comments

Comments
 (0)