Change ActivityIndicator color on Android

robertying · Jun 11, 2020 · 278a419 · 278a419
1 parent b9e45d1
commit 278a419
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/src/components/SettingListItem.tsx b/src/components/SettingListItem.tsx
@@ -128,7 +128,10 @@ const SettingListItem: React.FunctionComponent<ISettingListItemProps> = (
       </View>
       <View style={styles.right}>
         {loading ? (
-          <ActivityIndicator animating />
+          <ActivityIndicator
+            animating
+            color={Platform.OS === 'android' ? Colors.theme : undefined}
+          />
         ) : variant === 'switch' ? (
           <Switch
             disabled={switchDisabled}

diff --git a/src/screens/AssignmentSubmitScreen.tsx b/src/screens/AssignmentSubmitScreen.tsx
@@ -355,6 +355,7 @@ const AssignmentSubmitScreen: INavigationScreen<IAssignmentSubmitScreenProps> =
             <ActivityIndicator
               style={{marginHorizontal: 16}}
               animating={uploading}
+              color={Platform.OS === 'android' ? Colors.theme : undefined}
             />
             {uploading && (
               <ProgressBar

diff --git a/src/screens/FirebaseScreen.tsx b/src/screens/FirebaseScreen.tsx
@@ -358,7 +358,11 @@ const FirebaseScreen: INavigationScreen = (props) => {
             onPress={handleLogout}>
             {getTranslation('logout')}
           </TextButton>
-          <ActivityIndicator style={{margin: 10}} animating={loading} />
+          <ActivityIndicator
+            style={{margin: 10}}
+            animating={loading}
+            color={Platform.OS === 'android' ? Colors.theme : undefined}
+          />
         </View>
         <Text
           style={[

diff --git a/src/screens/LoginScreen.tsx b/src/screens/LoginScreen.tsx
@@ -249,7 +249,11 @@ const LoginScreen: INavigationScreen = (props) => {
             onPress={onLoginButtonPress}>
             {getTranslation('login')}
           </RaisedButton>
-          <ActivityIndicator style={{margin: 10}} animating={loading} />
+          <ActivityIndicator
+            style={{margin: 10}}
+            animating={loading}
+            color={Platform.OS === 'android' ? Colors.theme : undefined}
+          />
         </View>
         <Text
           style={[