diff options
| author | Fup Duck <fupduck@sacknagel.com> | 2018-01-18 01:57:03 +0100 |
|---|---|---|
| committer | Fup Duck <fupduck@sacknagel.com> | 2018-01-18 01:57:03 +0100 |
| commit | 1ccb2f9e1bcfaf8279ef9576b3bca233e37af61b (patch) | |
| tree | 1cd2adc2caadf1a24da4c021e92d5d755044a0f1 /app/src/main/res/layout/configuration_wizard_activity.xml | |
| parent | 20582f79321627257d1b66b22af791e9e22817fd (diff) | |
WizardConfiguration theme
* download VPN certificate after loging in (#8813)
* get the new design up to date (#8819)
* fix crash when pressing login (#8817)
* add a loading screen according to design (#8816)
Diffstat (limited to 'app/src/main/res/layout/configuration_wizard_activity.xml')
| -rw-r--r-- | app/src/main/res/layout/configuration_wizard_activity.xml | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/app/src/main/res/layout/configuration_wizard_activity.xml b/app/src/main/res/layout/configuration_wizard_activity.xml index 71cd5314..25da8612 100644 --- a/app/src/main/res/layout/configuration_wizard_activity.xml +++ b/app/src/main/res/layout/configuration_wizard_activity.xml @@ -3,29 +3,27 @@ android:id="@+id/configuration_wizard_layout" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ConfigurationWizard" > + tools:context=".ConfigurationWizard" + style="@style/BitmaskActivity" > - <ListView - android:id="@+id/provider_list" + <include layout="@layout/loading_screen" /> + + <LinearLayout + android:id="@+id/content" android:layout_width="match_parent" android:layout_height="match_parent" - android:drawSelectorOnTop="false" /> + android:orientation="vertical"> + + <include layout="@layout/provider_header" /> + + <ListView + android:id="@+id/provider_list" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:drawSelectorOnTop="false" + android:layout_marginTop="@dimen/standard_margin" + /> + + </LinearLayout> - <ProgressBar - android:id="@+id/progressbar_configuration_wizard" - style="?android:attr/progressBarStyleHorizontal" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:max="3" /> - - <TextView - android:id="@+id/progressbar_description" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:fadingEdge="horizontal" - android:singleLine="true" - android:text="@string/configuring_provider" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_centerHorizontal="true" - android:textColor="@android:color/holo_blue_bright" /> </RelativeLayout> |