From 98b6b1f471fef7eed69f2598e0170fc60950aba5 Mon Sep 17 00:00:00 2001 From: akwizgran <akwizgran@users.sourceforge.net> Date: Fri, 15 Apr 2016 14:37:51 +0100 Subject: [PATCH] Don't use inverse style for progress bars. #286 --- briar-android/res/layout/activity_crash.xml | 1 + briar-android/res/layout/activity_password.xml | 2 -- briar-android/res/layout/activity_setup.xml | 2 -- briar-android/res/layout/activity_with_loading.xml | 3 ++- briar-android/res/layout/fragment_keyagreement_qr.xml | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/briar-android/res/layout/activity_crash.xml b/briar-android/res/layout/activity_crash.xml index 3034ab2733..e412ec3745 100644 --- a/briar-android/res/layout/activity_crash.xml +++ b/briar-android/res/layout/activity_crash.xml @@ -24,6 +24,7 @@ <ProgressBar android:id="@+id/progress_wheel" + style="?android:attr/progressBarStyleLarge" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" diff --git a/briar-android/res/layout/activity_password.xml b/briar-android/res/layout/activity_password.xml index 8905963eaf..953b83811e 100644 --- a/briar-android/res/layout/activity_password.xml +++ b/briar-android/res/layout/activity_password.xml @@ -54,11 +54,9 @@ <ProgressBar android:id="@+id/progress_wheel" - style="?android:attr/progressBarStyleInverse" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignTop="@id/btn_sign_in" - android:layout_alignBottom="@id/btn_sign_in" android:layout_centerHorizontal="true" android:visibility="invisible" /> diff --git a/briar-android/res/layout/activity_setup.xml b/briar-android/res/layout/activity_setup.xml index ec3678cef4..be95d79fcd 100644 --- a/briar-android/res/layout/activity_setup.xml +++ b/briar-android/res/layout/activity_setup.xml @@ -115,11 +115,9 @@ <ProgressBar android:id="@+id/progress_wheel" - style="?android:attr/progressBarStyleInverse" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignTop="@id/create_account" - android:layout_alignBottom="@id/create_account" android:layout_centerHorizontal="true" android:visibility="invisible" /> diff --git a/briar-android/res/layout/activity_with_loading.xml b/briar-android/res/layout/activity_with_loading.xml index 8d22ba321a..4f153dee17 100644 --- a/briar-android/res/layout/activity_with_loading.xml +++ b/briar-android/res/layout/activity_with_loading.xml @@ -36,7 +36,7 @@ <ProgressBar android:id="@+id/progress_bar" - style="?android:attr/progressBarStyleLargeInverse" + style="?android:attr/progressBarStyleLarge" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true"/> @@ -54,4 +54,5 @@ </RelativeLayout> </FrameLayout> + </LinearLayout> \ No newline at end of file diff --git a/briar-android/res/layout/fragment_keyagreement_qr.xml b/briar-android/res/layout/fragment_keyagreement_qr.xml index 31f15925b7..429f59526b 100644 --- a/briar-android/res/layout/fragment_keyagreement_qr.xml +++ b/briar-android/res/layout/fragment_keyagreement_qr.xml @@ -29,7 +29,6 @@ android:padding="@dimen/margin_medium"> <ProgressBar - style="?android:attr/progressBarStyleInverse" android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingTop="@dimen/margin_large"/> @@ -56,4 +55,5 @@ android:layout_height="0dp" android:layout_weight="1" android:scaleType="fitCenter"/> + </LinearLayout> \ No newline at end of file -- GitLab