Merge pull request #85 from sikelio/dev

Last class style conversion

README.md

@@ -5,8 +5,8 @@ A cross-platform app build in [React Native](https://reactnative.dev/), based on
 
 | Labels      | Version    | Branch                                                                |
 |-------------|------------|-----------------------------------------------------------------------|
-| Current     | 0.0.2-beta | [v0.0.2-beta](https://github.com/sikelio/plexmanager/tree/0.0.2-beta) |
-| Development | 0.0.3-beta | [dev](https://github.com/sikelio/plexmanager/tree/dev)                |
+| Current     | 0.0.3-beta | [v0.0.3-beta](https://github.com/sikelio/plexmanager/tree/0.0.3-beta) |
+| Development | 0.0.4-beta | [dev](https://github.com/sikelio/plexmanager/tree/dev)                |
 
 ## Install
 

android/app/build.gradle

@@ -99,8 +99,8 @@ android {
         applicationId "wtf.plexmanager"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 2
-        versionName "0.0.2-beta"
+        versionCode 3
+        versionName "0.0.3-beta"
     }
 
     splits {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "plexmanager",
-  "version": "0.0.2-beta",
+  "version": "0.0.3-beta",
   "private": false,
   "scripts": {
     "android": "react-native run-android",

src/components/ServerButton.jsx

@@ -1,29 +1,46 @@
-// Dependencies
 import React from 'react';
-// Components
+import { StyleSheet } from 'react-native';
 import { Button } from '@rneui/themed';
 import Icon from 'react-native-vector-icons/FontAwesome5';
-// Styles
-import style from '../style/ServerStyle';
 
-const ServerButton = ({iconName, iconColor, backgroundColor, btnTitle, onPress }) => {
-    return (
-        <Button
-            icon={
-                <Icon
-                    name={ iconName }
-                    color={ iconColor }
-                    size={ 16 }
-                    style={ [style.cardBtn] }
-                />
-            }
-            buttonStyle={{
-                backgroundColor: backgroundColor
-            }}
-            title={ btnTitle }
-            onPress={ onPress }
-        />
-    );
+class ServerButton extends React.Component {
+    localStyle = StyleSheet.create({
+        cardBtn: {
+            marginRight: 10
+        }
+    });
+
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            iconName: this.props.iconName,
+            iconColor: this.props.iconColor,
+            backgroundColor: this.props.backgroundColor,
+            btnTitle: this.props.btnTitle,
+            onPress: this.props.onPress
+        };
+    }
+
+    render() {
+        return (
+            <Button
+                icon={
+                    <Icon
+                        name={this.state.iconName}
+                        color={this.state.iconColor}
+                        size={16}
+                        style={this.localStyle.cardBtn}
+                    />
+                }
+                buttonStyle={{
+                    backgroundColor: this.state.backgroundColor
+                }}
+                title={this.state.btnTitle}
+                onPress={this.state.onPress}
+            />
+        );
+    }
 }
 
 export default ServerButton;

src/screens/About.jsx

@@ -1,12 +1,18 @@
 import React from 'react';
+import { ScrollView, Linking, RefreshControl, Alert, StyleSheet } from 'react-native';
 import axios from 'axios';
 import info from '../../package.json';
-import { ScrollView, Linking, RefreshControl, Alert } from 'react-native';
 import { Card, ListItem, Avatar } from '@rneui/themed';
 import FastImage from 'react-native-fast-image';
-import style from '../style/AboutStyle';
 
 export default class About extends React.Component {
+    localStyle = StyleSheet.create({
+        accordionTitle: {
+            fontWeight: 'bold',
+            fontSize: 14
+        }
+    })
+
     constructor() {
         super();
 
@@ -54,7 +60,7 @@ export default class About extends React.Component {
                     <ListItem.Accordion
                         content={
                             <ListItem.Content>
-                                <ListItem.Title style={ [style.accordionTitle] }>About</ListItem.Title>
+                                <ListItem.Title style={this.localStyle.accordionTitle}>About</ListItem.Title>
                             </ListItem.Content>
                         }
                         isExpanded={ this.state.aboutList }
@@ -163,7 +169,7 @@ export default class About extends React.Component {
                     <ListItem.Accordion
                         content={
                             <ListItem.Content>
-                                <ListItem.Title style={ [style.accordionTitle] }>Authors</ListItem.Title>
+                                <ListItem.Title style={this.localStyle.accordionTitle}>Authors</ListItem.Title>
                             </ListItem.Content>
                         }
                         isExpanded={ this.state.authorsList }