diff options
| author | Fup Duck <fupduck@sacknagel.com> | 2018-01-09 19:54:57 +0100 |
|---|---|---|
| committer | Fup Duck <fupduck@sacknagel.com> | 2018-01-09 19:54:57 +0100 |
| commit | 8806e6ae477e0b20806851f5f8f3c0141a63ad9d (patch) | |
| tree | adeb3d5dba2bff20880bd5101b0a16bceb747889 /app/src/main/AndroidManifest.xml | |
| parent | 3addd20598f7fee2d41a24d64b375a2f63874457 (diff) | |
create LoginActivity and SignUpActivity
Diffstat (limited to 'app/src/main/AndroidManifest.xml')
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8407d76d..14ac77ef 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -38,7 +38,7 @@ android:icon="@drawable/icon" android:label="@string/app_name" android:logo="@drawable/icon" - android:theme="@style/AppTheme"> + android:theme="@style/BitmaskTheme"> <service android:name=".eip.VoidVpnService" android:permission="android.permission.BIND_VPN_SERVICE"> @@ -71,12 +71,12 @@ android:theme="@android:style/Theme.Translucent.NoTitleBar" /> <activity android:name="de.blinkt.openvpn.LaunchVPN" - android:label="@string/vpn_launch_title"></activity> + android:label="@string/vpn_launch_title" /> <activity android:name=".Dashboard" android:label="@string/app_name" android:launchMode="singleTop" - android:uiOptions="splitActionBarWhenNarrow"></activity> + android:uiOptions="splitActionBarWhenNarrow" /> <activity android:name=".StartActivity" android:label="@string/app_name" @@ -89,6 +89,11 @@ <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> + + <activity + android:name=".MainActivity" + android:label="@string/title_activity_main" /> + <activity android:name=".ConfigurationWizard" android:label="@string/configuration_wizard_title" /> @@ -97,6 +102,10 @@ android:name=".ProviderDetailActivity" android:label="@string/provider_details_title" /> + <activity android:name=".LoginActivity" /> + <activity android:name=".SignupActivity" + android:theme="@style/BitmaskTheme"/> + <service android:name=".eip.EIP" android:exported="false"> @@ -111,10 +120,6 @@ <action android:name="se.leap.bitmaskclient.EIP.IS_RUNNING"/> </intent-filter> </service> - - <activity - android:name=".MainActivity" - android:label="@string/title_activity_main"></activity> </application> </manifest>
\ No newline at end of file |