diff --git a/PS3ProxyServerforAndroid.iml b/PS3ProxyServerforAndroid.iml
new file mode 100644
index 0000000..8a51137
--- /dev/null
+++ b/PS3ProxyServerforAndroid.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="PS3ProxyServerforAndroid" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
new file mode 100644
index 0000000..7d5cfc2
--- /dev/null
+++ b/app/app.iml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":app" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <afterSyncTasks>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-fragment:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:localbroadcastmanager:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:documentfile:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:slidingpanelayout:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:28.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:3.0.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:loader:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:1.0.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:collections:28.0.0@jar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:cursoradapter:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:3.0.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-compat:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:asynclayoutinflater:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout:1.1.3@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:print:28.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:versionedparcelable:28.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:viewpager:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:28.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:monitor:1.0.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:28.0.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:interpolator:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:drawerlayout:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:coordinatorlayout:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:customview:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:swiperefreshlayout:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.3@jar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: artifacts:ps3_proxy:unspecified@jar" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
new file mode 100644
index 0000000..7e06969
--- /dev/null
+++ b/app/build.gradle
@@ -0,0 +1,29 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 28
+    defaultConfig {
+        applicationId "com.dadi590.ps3proxyserverforandroid"
+        minSdkVersion 15
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation project(':ps3_proxy')
+}
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
new file mode 100644
index 0000000..6e7ffa9
--- /dev/null
+++ b/app/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/app/src/androidTest/java/com/dadi590/ps3proxyserverforandroid/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/dadi590/ps3proxyserverforandroid/ExampleInstrumentedTest.java
new file mode 100644
index 0000000..6d8d584
--- /dev/null
+++ b/app/src/androidTest/java/com/dadi590/ps3proxyserverforandroid/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package com.dadi590.ps3proxyserverforandroid;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.error.ps3proxyserverforandroid", appContext.getPackageName());
+    }
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..56cc086
--- /dev/null
+++ b/app/src/main/AndroidManifest.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.dadi590.ps3proxyserverforandroid">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/icone_principal_antigo_sem_bordas"
+        android:label="@string/app_name"
+        android:roundIcon="@drawable/icone_principal_antigo_sem_bordas"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity android:name=".Creditos"></activity>
+        <activity android:name=".Definicoes" />
+        <activity android:name=".Creditos_iniciais" />
+        <activity android:name=".Reinicializador_Principal" />
+
+        <service
+            android:name=".Servico"
+            android:enabled="true"
+            android:exported="false" />
+
+        <activity android:name=".Principal">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <receiver android:enabled="true" android:name=".RecetorInicializacao">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
+            </intent-filter>
+        </receiver>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/dadi590/ps3proxyserverforandroid/Creditos.java b/app/src/main/java/com/dadi590/ps3proxyserverforandroid/Creditos.java
new file mode 100644
index 0000000..02c2066
--- /dev/null
+++ b/app/src/main/java/com/dadi590/ps3proxyserverforandroid/Creditos.java
@@ -0,0 +1,69 @@
+package com.dadi590.ps3proxyserverforandroid;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
+
+public class Creditos extends AppCompatActivity {
+
+    Button botao1;
+    Button botao2;
+    Button botao3;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_creditos);
+
+        Toolbar toolbar = findViewById(R.id.toolbar_creditos);
+        setSupportActionBar(toolbar);
+
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setDisplayShowHomeEnabled(true);
+
+        botao1 = findViewById(R.id.botao1);
+        botao1.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Uri uri = Uri.parse("https://github.com/mondul/PS3-Proxy");
+                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+                startActivity(intent);
+            }
+        });
+
+        botao2 = findViewById(R.id.botao2);
+        botao2.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Uri uri = Uri.parse("https://www.psx-place.com/threads/tutorial-how-to-set-up-ps3-proxy-server-on-android.22846/");
+                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+                startActivity(intent);
+            }
+        });
+
+        botao3 = findViewById(R.id.botao3);
+        botao3.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Uri uri = Uri.parse("https://www.psx-place.com/resources/ps3-proxy-server-for-android.795/");
+                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+                startActivity(intent);
+            }
+        });
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                finish();
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/dadi590/ps3proxyserverforandroid/Creditos_iniciais.java b/app/src/main/java/com/dadi590/ps3proxyserverforandroid/Creditos_iniciais.java
new file mode 100644
index 0000000..e05c5b3
--- /dev/null
+++ b/app/src/main/java/com/dadi590/ps3proxyserverforandroid/Creditos_iniciais.java
@@ -0,0 +1,63 @@
+package com.dadi590.ps3proxyserverforandroid;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+public class Creditos_iniciais extends AppCompatActivity {
+
+    Button botao;
+    Button botao1;
+    Button botao2;
+    Button botao3;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_creditos_iniciais);
+
+        botao = findViewById(R.id.botao);
+        botao.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent Principal = new Intent(Creditos_iniciais.this, Principal.class);
+                Principal.putExtra("creditos_iniciais_vistos","true");
+                startActivity(Principal);
+                finish();
+            }
+        });
+
+        botao1 = findViewById(R.id.botao1);
+        botao1.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Uri uri = Uri.parse("https://github.com/mondul/PS3-Proxy");
+                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+                startActivity(intent);
+            }
+        });
+
+        botao2 = findViewById(R.id.botao2);
+        botao2.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Uri uri = Uri.parse("https://www.psx-place.com/threads/tutorial-how-to-set-up-ps3-proxy-server-on-android.22846/");
+                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+                startActivity(intent);
+            }
+        });
+
+        botao3 = findViewById(R.id.botao3);
+        botao3.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Uri uri = Uri.parse("https://www.psx-place.com/resources/ps3-proxy-server-for-android.795/");
+                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+                startActivity(intent);
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/dadi590/ps3proxyserverforandroid/Definicoes.java b/app/src/main/java/com/dadi590/ps3proxyserverforandroid/Definicoes.java
new file mode 100644
index 0000000..2cead06
--- /dev/null
+++ b/app/src/main/java/com/dadi590/ps3proxyserverforandroid/Definicoes.java
@@ -0,0 +1,83 @@
+package com.dadi590.ps3proxyserverforandroid;
+
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
+import android.view.MenuItem;
+import android.widget.Switch;
+
+public class Definicoes extends AppCompatActivity {
+
+    Switch auto_start_switch;
+    Switch auto_save_switch;
+    Bundle extras;
+    String auto_save;
+    String auto_start;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_definicoes);
+
+        Toolbar toolbar = findViewById(R.id.toolbar_definicoes);
+        setSupportActionBar(toolbar);
+
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setDisplayShowHomeEnabled(true);
+
+        auto_save_switch = findViewById(R.id.auto_save_switch);
+        auto_start_switch = findViewById(R.id.auto_start_switch);
+
+        extras = getIntent().getExtras();
+
+        auto_save=extras.getString("auto_save");
+        auto_start=extras.getString("auto_start");
+
+        if (auto_save.contains("true")) {
+            auto_save_switch.setChecked(true);
+        } else {
+            auto_save_switch.setChecked(false);
+        }
+        if (auto_start.contains("true")) {
+            auto_start_switch.setChecked(true);
+        } else {
+            auto_start_switch.setChecked(false);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+
+        auto_save_switch = findViewById(R.id.auto_save_switch);
+        auto_start_switch = findViewById(R.id.auto_start_switch);
+
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                finish();
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        Intent intent = new Intent(Definicoes.this, Principal.class);
+        if (auto_start_switch.isChecked()) {
+            System.out.println("DADi5");
+            intent.putExtra("auto_start","true");
+        } else {
+            System.out.println("DADi6");
+            intent.putExtra("auto_start","false");
+        }
+        if (auto_save_switch.isChecked()) {
+            System.out.println("DADi3");
+            intent.putExtra("auto_save","true");
+        } else {
+            System.out.println("DADi4");
+            intent.putExtra("auto_save","false");
+        }
+        startActivity(intent);
+        super.onDestroy();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/dadi590/ps3proxyserverforandroid/Inicializador_Servico.java b/app/src/main/java/com/dadi590/ps3proxyserverforandroid/Inicializador_Servico.java
new file mode 100644
index 0000000..eccbe23
--- /dev/null
+++ b/app/src/main/java/com/dadi590/ps3proxyserverforandroid/Inicializador_Servico.java
@@ -0,0 +1,16 @@
+package com.dadi590.ps3proxyserverforandroid;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+public class Inicializador_Servico extends AppCompatActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Intent startMyService = new Intent();
+        startMyService.setClass(Inicializador_Servico.this, Servico.class);
+        startService(startMyService);
+        finish();
+    }
+}
diff --git a/app/src/main/java/com/dadi590/ps3proxyserverforandroid/Principal.java b/app/src/main/java/com/dadi590/ps3proxyserverforandroid/Principal.java
new file mode 100644
index 0000000..483049a
--- /dev/null
+++ b/app/src/main/java/com/dadi590/ps3proxyserverforandroid/Principal.java
@@ -0,0 +1,211 @@
+package com.dadi590.ps3proxyserverforandroid;
+
+import android.app.ActivityManager;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Build;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.TextView;
+
+import ps3_proxy.Ps3_proxy;
+
+public class Principal extends AppCompatActivity {
+
+    public static final String CHANNEL_ID = "PS3 Proxy Server for Android";
+
+    EditText porta_obj;
+    TextView estado_obj;
+    TextView dados_ip_obj;
+    TextView dados_porta_obj;
+    TextView ip_telemovel_obj;
+    TextView erro;
+    ImageButton botao;
+    String ip;
+    String porta;
+    String auto_save;
+    String auto_start;
+    SharedPreferences settings;
+    SharedPreferences.Editor editor;
+    Bundle extras;
+    Intent intent_extras;
+
+    public int ligado=0;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Toolbar myToolbar = findViewById(R.id.toolbar_main);
+        setSupportActionBar(myToolbar);
+
+        settings = getSharedPreferences("App_settings", Context.MODE_PRIVATE);
+        editor = settings.edit();
+        extras = getIntent().getExtras();
+        intent_extras = getIntent();
+
+        if (intent_extras.hasExtra("creditos_iniciais_vistos")) {
+            editor.putString("creditos_iniciais_vistos", extras.getString("creditos_iniciais_vistos","false"));
+            editor.apply();
+        }
+
+        if (settings.getString("creditos_iniciais_vistos", "false").equals("false")) {
+            Intent intent = new Intent(Principal.this, Creditos_iniciais.class);
+            startActivity(intent);
+            finish();
+        }
+
+        if (intent_extras.hasExtra("settings_auto_start")) {
+            editor.putString("settings_auto_start", settings.getString("creditos_iniciais_vistos", "false"));
+            editor.apply();
+        }
+
+        if (intent_extras.hasExtra("settings_auto_save")) {
+            editor.putString("settings_auto_save", settings.getString("creditos_iniciais_vistos", "false"));
+            editor.apply();
+        }
+
+        if (settings.getString("settings_auto_save", "false").equals("true")) {
+            porta=settings.getString("porta", "8080");
+        } else {
+            porta="8080";
+        }
+
+        try {
+            editor.putString("settings_auto_save", extras.getString("auto_save","false"));
+            editor.putString("settings_auto_start", extras.getString("auto_start","false"));
+            editor.apply();
+        } catch (NullPointerException e) {
+
+        }
+
+        auto_save=settings.getString("settings_auto_save", "false");
+        auto_start=settings.getString("settings_auto_start", "false");
+
+        createNotificationChannel();
+
+        porta_obj = findViewById(R.id.porta);
+        estado_obj = findViewById(R.id.estado);
+        dados_ip_obj = findViewById(R.id.dados_ip);
+        dados_porta_obj = findViewById(R.id.dados_porta);
+        ip_telemovel_obj = findViewById(R.id.ip);
+        botao = findViewById(R.id.botao);
+        erro = findViewById(R.id.erro);
+
+        ip_telemovel_obj.setKeyListener(null);
+        ip_telemovel_obj.setText(Ps3_proxy.externalIP());
+
+        porta_obj.setText(porta);
+
+        ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
+        for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
+            if ("com.dadi590.ps3proxyserverforandroid.Servico".equals(service.service.getClassName())) {
+                //SharedPreferences settings = getSharedPreferences("App_settings", MODE_PRIVATE);
+                estado_obj.setText(getString(R.string.estado) + "ON");
+                dados_ip_obj.setText("IP: "+settings.getString("ip", "N/A"));
+                dados_porta_obj.setText(getString(R.string.porta) + settings.getString("porta", "N/A"));
+                botao.setImageResource(R.drawable.pause);
+                ligado=1;
+            }
+        }
+
+        if (ligado==0) {
+            estado_obj.setText(getString(R.string.estado) + "OFF");
+            dados_ip_obj.setText("IP: N/A");
+            dados_porta_obj.setText(getString(R.string.porta) + "N/A");
+            botao.setImageResource(R.drawable.play);
+        }
+
+        botao.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                final String ip = ip_telemovel_obj.getText().toString();
+                final String porta = porta_obj.getText().toString();
+                if (Integer.parseInt(porta) >= 1024 && Integer.parseInt(porta) <=65535) {
+                    erro.setText("");
+                    if (ligado == 0) {
+                        Intent startMyService = new Intent();
+                        startMyService.setClass(Principal.this, Servico.class);
+                        /*startMyService.putExtra("ip",ip);
+                        startMyService.putExtra("porta",porta);*/
+                        startService(startMyService);
+
+                        estado_obj.setText(getString(R.string.estado) + "ON");
+                        dados_ip_obj.setText("IP: " + ip);
+                        dados_porta_obj.setText(getString(R.string.porta) + porta);
+                        botao.setImageResource(R.drawable.pause);
+                        ligado = 1;
+                        editor.putString("ip", ip);
+                        editor.putString("porta", porta);
+                        editor.apply();
+                    } else if (ligado == 1) {
+                        estado_obj.setText(getString(R.string.estado) + "OFF");
+                        dados_ip_obj.setText("IP: N/A");
+                        dados_porta_obj.setText(getString(R.string.porta) + "N/A");
+                        botao.setImageResource(R.drawable.play);
+                        Intent stopMyService = new Intent();
+                        stopMyService.setClass(Principal.this, Servico.class);
+                        stopService(stopMyService);
+                        Intent Reinicializador_Principal = new Intent();
+                        Reinicializador_Principal.setClass(Principal.this, Reinicializador_Principal.class);
+                        startActivity(Reinicializador_Principal);
+                        System.exit(0);
+                    }
+                } else {
+                    erro.setText(getString(R.string.erro));
+                }
+            }
+        });
+    }
+
+    private void createNotificationChannel() {
+
+        //Copiado de developer.android.com
+        // Create the NotificationChannel, but only on API 26+ because
+        // the NotificationChannel class is new and not in the support library
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            CharSequence name = getString(R.string.nome_servico);
+            String description = getString(R.string.nome_servico);
+            int importance = NotificationManager.IMPORTANCE_DEFAULT;
+            NotificationChannel channel = new NotificationChannel(CHANNEL_ID, name, importance);
+            channel.setDescription(description);
+            // Register the channel with the system; you can't change the importance
+            // or other notification behaviors after this
+            NotificationManager notificationManager = getSystemService(NotificationManager.class);
+            notificationManager.createNotificationChannel(channel);
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.menu_principal,menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId()==R.id.definicoes) {
+            Intent Definicoes = new Intent();
+            Definicoes.setClass(Principal.this, Definicoes.class);
+            Definicoes.putExtra("auto_save",auto_save);
+            Definicoes.putExtra("auto_start",auto_start);
+            startActivity(Definicoes);
+            finish();
+        } else if (item.getItemId()==R.id.creditos) {
+            startActivity (new Intent (Principal.this, Creditos.class));
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/dadi590/ps3proxyserverforandroid/RecetorInicializacao.java b/app/src/main/java/com/dadi590/ps3proxyserverforandroid/RecetorInicializacao.java
new file mode 100644
index 0000000..565142f
--- /dev/null
+++ b/app/src/main/java/com/dadi590/ps3proxyserverforandroid/RecetorInicializacao.java
@@ -0,0 +1,31 @@
+package com.dadi590.ps3proxyserverforandroid;
+
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Build;
+
+public class RecetorInicializacao extends BroadcastReceiver {
+
+    SharedPreferences settings;
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+
+        settings = context.getSharedPreferences("App_settings", Context.MODE_PRIVATE);
+        Intent intent_8_0 = new Intent(context,Servico.class);
+
+        if (settings.getString("settings_auto_start", "false").equals("true")) {
+            if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.O){
+                intent_8_0.putExtra("inicio_automatico","true");
+                context.startForegroundService(intent_8_0);
+            } else {
+                Intent Servico = new Intent(context, Servico.class);
+                Servico.putExtra("inicio_automatico","true");
+                context.startService(Servico);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/dadi590/ps3proxyserverforandroid/Reinicializador_Principal.java b/app/src/main/java/com/dadi590/ps3proxyserverforandroid/Reinicializador_Principal.java
new file mode 100644
index 0000000..3a357b8
--- /dev/null
+++ b/app/src/main/java/com/dadi590/ps3proxyserverforandroid/Reinicializador_Principal.java
@@ -0,0 +1,16 @@
+package com.dadi590.ps3proxyserverforandroid;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+public class Reinicializador_Principal extends AppCompatActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Intent Principal = new Intent();
+        Principal.setClass(Reinicializador_Principal.this, Principal.class);
+        startActivity(Principal);
+        finish();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/dadi590/ps3proxyserverforandroid/Servico.java b/app/src/main/java/com/dadi590/ps3proxyserverforandroid/Servico.java
new file mode 100644
index 0000000..6a8ad76
--- /dev/null
+++ b/app/src/main/java/com/dadi590/ps3proxyserverforandroid/Servico.java
@@ -0,0 +1,95 @@
+package com.dadi590.ps3proxyserverforandroid;
+
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.support.annotation.Nullable;
+import android.support.v4.app.NotificationCompat;
+
+import ps3_proxy.Ps3_proxy;
+
+public class Servico extends Service {
+
+    String ip;
+    String porta;
+    Bundle extras;
+    SharedPreferences settings;
+
+    Thread thread = new Thread(new Runnable() {
+        @Override
+        public void run() {
+            Ps3_proxy.server(ip+":"+porta);
+        }
+    });
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+
+        extras = intent.getExtras();
+        settings = getSharedPreferences("App_settings", Context.MODE_PRIVATE);
+        Intent intent_extras = new Intent(this, Service.class);
+
+        porta=settings.getString("porta", "8080");
+        ip=settings.getString("ip", Ps3_proxy.externalIP());
+
+        /*ip = extras.getString("ip");
+        porta = extras.getString("porta");*/
+
+        if (intent_extras.hasExtra("inicio_automatico")) {
+            if (settings.getString("settings_auto_start", "false").equals("false")) {
+                System.exit(0);
+            }
+        }
+
+        final Intent notificationIntent = new Intent(this, Principal.class);
+        PendingIntent pendingIntent = PendingIntent.getActivity(this,
+                0, notificationIntent, 0);
+
+        if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            Notification notification = new NotificationCompat.Builder(this, Principal.CHANNEL_ID)
+                    .setContentTitle("PS3 Proxy Server " + getString(R.string.servidor_ativado))
+                    .setContentText("IP: " + ip + " | " + getString(R.string.porta) + porta)
+                    .setSmallIcon(R.drawable.icone_principal_antigo_sem_bordas)
+                    .setContentIntent(pendingIntent)
+                    .build();
+            startForeground(1, notification);
+        } else {
+            Notification notification = new NotificationCompat.Builder(this, Principal.CHANNEL_ID)
+                    .setContentTitle("PS3 Proxy Server " + getString(R.string.servidor_ativado))
+                    .setContentText("IP: " + ip + " | " + getString(R.string.porta) + porta)
+                    .setSmallIcon(R.drawable.icone_principal_novo)
+                    .setContentIntent(pendingIntent)
+                    .build();
+            startForeground(1, notification);
+        }
+
+        thread.start();
+
+        //do heavy work on a background thread
+        //stopSelf();
+
+        return START_NOT_STICKY;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+    }
+
+    @Nullable
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 0000000..971add5
--- /dev/null
+++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
diff --git a/app/src/main/res/drawable-v24/icone_principal_antigo_com_bordas.png b/app/src/main/res/drawable-v24/icone_principal_antigo_com_bordas.png
new file mode 100644
index 0000000..eff8776
Binary files /dev/null and b/app/src/main/res/drawable-v24/icone_principal_antigo_com_bordas.png differ
diff --git a/app/src/main/res/drawable-v24/icone_principal_antigo_sem_bordas.png b/app/src/main/res/drawable-v24/icone_principal_antigo_sem_bordas.png
new file mode 100644
index 0000000..fdad177
Binary files /dev/null and b/app/src/main/res/drawable-v24/icone_principal_antigo_sem_bordas.png differ
diff --git a/app/src/main/res/drawable-v24/icone_principal_novo.png b/app/src/main/res/drawable-v24/icone_principal_novo.png
new file mode 100644
index 0000000..44acbcd
Binary files /dev/null and b/app/src/main/res/drawable-v24/icone_principal_novo.png differ
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 0000000..eed7a42
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#008577"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
diff --git a/app/src/main/res/drawable/icone_principal_antigo_sem_bordas.png b/app/src/main/res/drawable/icone_principal_antigo_sem_bordas.png
new file mode 100644
index 0000000..fdad177
Binary files /dev/null and b/app/src/main/res/drawable/icone_principal_antigo_sem_bordas.png differ
diff --git a/app/src/main/res/drawable/icone_principal_novo.png b/app/src/main/res/drawable/icone_principal_novo.png
new file mode 100644
index 0000000..44acbcd
Binary files /dev/null and b/app/src/main/res/drawable/icone_principal_novo.png differ
diff --git a/app/src/main/res/drawable/pause.png b/app/src/main/res/drawable/pause.png
new file mode 100644
index 0000000..c162556
Binary files /dev/null and b/app/src/main/res/drawable/pause.png differ
diff --git a/app/src/main/res/drawable/play.png b/app/src/main/res/drawable/play.png
new file mode 100644
index 0000000..490c3e5
Binary files /dev/null and b/app/src/main/res/drawable/play.png differ
diff --git a/app/src/main/res/drawable/play_pause_original.png b/app/src/main/res/drawable/play_pause_original.png
new file mode 100644
index 0000000..3c8833e
Binary files /dev/null and b/app/src/main/res/drawable/play_pause_original.png differ
diff --git a/app/src/main/res/layout/activity_creditos.xml b/app/src/main/res/layout/activity_creditos.xml
new file mode 100644
index 0000000..9163780
--- /dev/null
+++ b/app/src/main/res/layout/activity_creditos.xml
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Creditos">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/toolbar_creditos"
+            layout="@layout/toolbar" />
+
+        <TextView
+            android:id="@+id/textView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/creditos"
+            android:textColor="@android:color/holo_green_dark"
+            android:textSize="36sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.0" />
+
+        <TextView
+            android:id="@+id/textView2"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/creditos1"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.522"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.084" />
+
+        <TextView
+            android:id="@+id/textView11"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/creditos2"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.522"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.135" />
+
+        <TextView
+            android:id="@+id/textView12"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/creditos3"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.522"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.218" />
+
+        <TextView
+            android:id="@+id/textView13"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/creditos4"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.522"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.324" />
+
+        <Button
+            android:id="@+id/botao1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/visitar_site" />
+
+        <TextView
+            android:id="@+id/textView3"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/creditos5"
+            android:textColor="@android:color/holo_red_dark"
+            android:textSize="24sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.132"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.418" />
+
+        <TextView
+            android:id="@+id/textView4"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/creditos6"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.494"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.485" />
+
+        <TextView
+            android:id="@+id/textView7"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/creditos7"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.569" />
+
+        <TextView
+            android:id="@+id/textView8"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/creditos8"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.489"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.667" />
+
+        <Button
+            android:id="@+id/botao2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/visitar_site" />
+
+        <TextView
+            android:id="@+id/textView5"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/creditos9"
+            android:textColor="@android:color/holo_orange_light"
+            android:textSize="18sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.134"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.745" />
+
+        <TextView
+            android:id="@+id/textView6"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/bug"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.494"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.829" />
+
+        <TextView
+            android:id="@+id/textView14"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/creditos10"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.494"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.829" />
+
+        <TextView
+            android:id="@+id/textView9"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/creditos11"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.494"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.886" />
+
+        <Button
+            android:id="@+id/botao3"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/visitar_site" />
+
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_creditos_iniciais.xml b/app/src/main/res/layout/activity_creditos_iniciais.xml
new file mode 100644
index 0000000..6a949d6
--- /dev/null
+++ b/app/src/main/res/layout/activity_creditos_iniciais.xml
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Creditos_iniciais">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/textView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/creditos"
+            android:textColor="@android:color/holo_green_dark"
+            android:textSize="36sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.0" />
+
+        <TextView
+            android:id="@+id/textView2"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/creditos1"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.522"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.084" />
+
+        <TextView
+            android:id="@+id/textView11"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/creditos2"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.522"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.135" />
+
+        <TextView
+            android:id="@+id/textView12"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/creditos3"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.522"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.218" />
+
+        <TextView
+            android:id="@+id/textView13"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/creditos4"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.522"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.324" />
+
+        <Button
+            android:id="@+id/botao1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/visitar_site" />
+
+        <TextView
+            android:id="@+id/textView3"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/creditos5"
+            android:textColor="@android:color/holo_red_dark"
+            android:textSize="24sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.132"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.418" />
+
+        <TextView
+            android:id="@+id/textView4"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/creditos6"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.494"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.485" />
+
+        <TextView
+            android:id="@+id/textView7"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/creditos7"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.569" />
+
+        <TextView
+            android:id="@+id/textView8"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/creditos8"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.489"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.667" />
+
+        <Button
+            android:id="@+id/botao2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/visitar_site" />
+
+        <TextView
+            android:id="@+id/textView5"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/creditos9"
+            android:textColor="@android:color/holo_orange_light"
+            android:textSize="18sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.134"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.745" />
+
+        <TextView
+            android:id="@+id/textView6"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/bug"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.494"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.829" />
+
+        <TextView
+            android:id="@+id/textView10"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/creditos10"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.494"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.829" />
+
+        <TextView
+            android:id="@+id/textView9"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/creditos11"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.494"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.886" />
+
+        <Button
+            android:id="@+id/botao3"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/visitar_site" />
+
+        <Button
+            android:id="@+id/botao"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/creditos_botao"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.509"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="1.0" />
+
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_definicoes.xml b/app/src/main/res/layout/activity_definicoes.xml
new file mode 100644
index 0000000..bdea6e0
--- /dev/null
+++ b/app/src/main/res/layout/activity_definicoes.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Definicoes">
+
+    <include
+        android:id="@+id/toolbar_definicoes"
+        layout="@layout/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:id="@+id/auto_start"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/toolbar_definicoes"
+        android:layout_alignParentLeft="true"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="50dp"
+        android:text="@string/auto_start"
+        android:textSize="18sp" />
+
+    <Switch
+        android:id="@+id/auto_start_switch"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/toolbar_definicoes"
+        android:layout_alignParentLeft="true"
+        android:layout_marginTop="100dp"
+        android:layout_marginLeft="10dp" />
+
+    <TextView
+        android:id="@+id/auto_save"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/toolbar_definicoes"
+        android:layout_alignParentLeft="true"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="150dp"
+        android:text="@string/auto_save"
+        android:textSize="18sp" />
+
+    <Switch
+        android:id="@+id/auto_save_switch"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/toolbar_definicoes"
+        android:layout_alignParentLeft="true"
+        android:layout_marginTop="200dp"
+        android:layout_marginLeft="10dp" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..3916a42
--- /dev/null
+++ b/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Principal">
+
+    <include
+        android:id="@+id/toolbar_main"
+        layout="@layout/toolbar" />
+
+    <EditText
+        android:id="@+id/porta"
+        android:layout_width="214dp"
+        android:layout_height="42dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        android:ems="10"
+        android:hint="@string/enter_port"
+        android:importantForAutofill="no"
+        android:inputType="number"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.696"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.32"
+        tools:targetApi="o" />
+
+    <EditText
+        android:id="@+id/ip"
+        android:layout_width="214dp"
+        android:layout_height="42dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        android:ems="10"
+        android:hint="@string/enter_ip"
+        android:importantForAutofill="no"
+        android:inputType="text"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.696"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.136"
+        tools:targetApi="o" />
+
+    <TextView
+        android:id="@+id/estado"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        android:text="@string/estado"
+        android:textSize="36sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.681" />
+
+    <TextView
+        android:id="@+id/dados_ip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        android:text="IP: "
+        android:textSize="24sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.815" />
+
+    <TextView
+        android:id="@+id/dados_porta"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        android:text="@string/porta"
+        android:textSize="24sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.92" />
+
+    <TextView
+        android:id="@+id/ip_telemovel2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        android:text="@string/porta"
+        android:textSize="18sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.059"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.325" />
+
+    <TextView
+        android:id="@+id/ip_telemovel3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        android:text="IP:"
+        android:textSize="18sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.056"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.144" />
+
+    <TextView
+        android:id="@+id/erro"
+        android:layout_width="285dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginBottom="8dp"
+        android:textColor="@android:color/holo_red_dark"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.387" />
+
+    <ImageButton
+        android:id="@+id/botao"
+        android:layout_width="127dp"
+        android:layout_height="83dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginBottom="8dp"
+        android:src="@drawable/play_pause_original"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@drawable/play_pause_original"
+        tools:srcCompat="@drawable/play_pause_original" />
+
+    <TextView
+        android:id="@+id/versao"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginBottom="8dp"
+        android:text="v1.0"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="1.0" />
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml
new file mode 100644
index 0000000..1454920
--- /dev/null
+++ b/app/src/main/res/layout/toolbar.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/colorPrimary"
+    android:elevation="4dp"
+    android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+
+</android.support.v7.widget.Toolbar>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_principal.xml b/app/src/main/res/menu/menu_principal.xml
new file mode 100644
index 0000000..896d924
--- /dev/null
+++ b/app/src/main/res/menu/menu_principal.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/definicoes"
+        android:orderInCategory="100"
+        android:title="@string/definicoes"/>
+
+    <item
+        android:id="@+id/creditos"
+        android:orderInCategory="200"
+        android:title="@string/creditos"/>
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000..a26f6fb
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000..a26f6fb
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..898f3ed
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..dffca36
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..64ba76f
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..dae5e08
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..e5ed465
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..14ed0af
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..b0907ca
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..d8ae031
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..2c18de9
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..beed3cd
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
new file mode 100644
index 0000000..cf19c45
--- /dev/null
+++ b/app/src/main/res/values-de/strings.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">PS3 Proxy Server for Android</string>
+    <string name="ip_telemovel">Keiner</string>
+    <string name="iniciar">Starten Sie den Server</string>
+    <string name="estado">Status:</string>
+    <string name="enter_port">Fügen Sie den ausgewählten Port ein...</string>
+    <string name="enter_ip">Geben Sie die gewählte IP ein...</string>
+    <string name="porta">"Hafen: "</string>
+    <string name="parar">Stoppen Sie den Server</string>
+    <string name="servidor_ativado">aktiv</string>
+    <string name="creditos">Credits</string>
+    <string name="creditos_menu">Credits, WARNUNG und Fehler und Ideen</string>
+    <string name="creditos_botao">Gehen Sie zur App</string>
+    <string name="creditos5">WARNUNG</string>
+    <string name="creditos9">Fehler und Ideen</string>
+    <string name="creditos1">- DADi590 - zum Erstellen der App;</string>
+    <string name="creditos2">- blckbear_ (PSX-Place) - für das Helfen und Geben von Ideen (so viel Anerkennung für ihn)</string>
+    <string name="creditos3">- mondul (GitHub/PSX-Place) - für die Erstellung des Programms, das sich hinter der App befindet (so erstaunliche Credits für ihn oder die App wäre zumindest so einfach nicht möglich)</string>
+    <string name="creditos4">Das in der App verwendete Originalprogramm kann auf GitHub gefunden werden: https://github.com/mondul/PS3-Proxy</string>
+    <string name="creditos10">Wenn Sie einen Fehler in der App gefunden haben oder etwas im Sinn haben, das Sie hier sehen möchten (oder einfach nur nach einem Update suchen möchten), sagen Sie mir bitte in diesem Thread (offizieller Thread):</string>
+    <string name="creditos6">Diese App funktioniert nur mit Android 4.0.3 oder neuer (ich habe versucht, so viel wie möglich zu senken)!</string>
+    <string name="creditos7">Wenn Sie also einen Server mit Android 4.0 oder älter benötigen (mindestens 2.2, also weniger als 2.2, gibt es keinen bekannten Weg), folgen Sie diesem Tutorial, das von derselben Person erstellt wurde, die in dieser App geholfen hat:</string>
+    <string name="definicoes">Einstellungen</string>
+    <string name="servidor">Server</string>
+    <string name="auto_start">Automatischer Start des Servers beim Gerätestart</string>
+    <string name="auto_save">Server-Einstellungen automatisch speichern</string>
+    <string name="visitar_site">Besuche die Website</string>
+    <string name="erro">FEHLER: Bitte geben Sie einen Port zwischen 1024 und 65535 ein (der Standardport ist 8080).</string>
+    <string name="bug">Es gibt bereits einen Fehler, bei dem Sie in KitKat und auf meinem Telefon, wenn Sie eine der beiden Optionen auf der Einstellungsseite aktivieren, zur Startseite zurückkehren und die App neu starten. Wenn Sie erneut zur Einstellungsseite wechseln, werden sie deaktiviert. Gehen Sie also nicht dorthin, denn wenn Sie dies nicht tun, werden die Optionen immer noch aktiviert. Wenn Sie die Einstellungsseite erneut aufrufen, werden sie automatisch deaktiviert. Ich hatte viel Zeit damit und konnte es immer noch nicht reparieren (nur ein Anfänger hahaha).Es gibt bereits einen Fehler, bei dem Sie in KitKat und auf meinem Telefon, wenn Sie eine der beiden Optionen auf der Einstellungsseite aktivieren, zur Startseite zurückkehren und die App neu starten. Wenn Sie erneut zur Einstellungsseite wechseln, werden sie deaktiviert. Gehen Sie also nicht dorthin, denn wenn Sie dies nicht tun, werden die Optionen immer noch aktiviert. Wenn Sie die Einstellungsseite erneut aufrufen, werden sie automatisch deaktiviert. Ich hatte viel Zeit damit und konnte es immer noch nicht reparieren (nur ein Anfänger hahaha).</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
new file mode 100644
index 0000000..33c21ce
--- /dev/null
+++ b/app/src/main/res/values-es/strings.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">PS3 Proxy Server for Android</string>
+    <string name="iniciar">Iniciar el servidor</string>
+    <string name="estado">"Estado: "</string>
+    <string name="enter_port">Inserte el puerto deseado...</string>
+    <string name="enter_ip">Inserte la IP deseada...</string>
+    <string name="ip_telemovel">Ninguno</string>
+    <string name="porta">"Puerto: "</string>
+    <string name="parar">Parar el servidor</string>
+    <string name="servidor_ativado">activado</string>
+    <string name="creditos">Créditos</string>
+    <string name="creditos_menu">Créditos, ADVERTENCIA y errores y ideas</string>
+	<string name="creditos1">- DADi590 - por hacer la app;</string>
+    <string name="creditos2">- blckbear_ (PSX-Place) - por ayudar y dar ideas (grandes créditos para él)</string>
+    <string name="creditos3">- mondul (GitHub/PSX-Place) - por hacer el programa que está por detrás de la app (increíbles créditos para él, o no habria sido posible hacer la app, al menos no tan facilmente);</string>
+    <string name="creditos4">El programa original utilizado en la app puede ser encontrado en GitHub: https://github.com/mondul/PS3-Proxy</string>
+    <string name="creditos5">ADVERTENCIA</string>
+    <string name="creditos6">¡Esta app solo funciona en Android 4.0.3 o superior (he intentado bajar la version tanto como pude)!</string>
+    <string name="creditos7">Por lo tanto, si necesitas que el servidor funcione con Android 4.0 o versiones anteriores (siendo el mínimo, Android 2.2, ya que para versiones inferiores no es posible), sigue este tutorial realizado por la misma persona que ayudó en esta aplicación:</string>
+    <string name="creditos9">Errores e ideas</string>
+    <string name="creditos10">Si has encontrado un error en la aplicación o tienes alguna idea en mente que te gustaría ver aquí (o solo quieres comprobar si hay actualizaciones) , por favor dímelo en esta página (página oficial):</string>
+	<string name="creditos_botao">Ir a la app</string>
+    <string name="definicoes">Ajustes</string>
+    <string name="servidor">Servidor</string>
+    <string name="auto_start">Iniciar el servidor al encender el dispositivo</string>
+    <string name="auto_save">Guardar preferencias del servidor automáticamente</string>
+    <string name="visitar_site">Visitar página</string>
+    <string name="erro">"ERROR: Por favor seleccione un puerto entre 1024 y 65535 (el puerto predeterminado es 8080)."</string>
+    <string name="bug">Ya tiene un error donde al menos en KitKat y con mi teléfono, si habilitas cualquiera de las dos opciones en la página de configuración, regresas a la página inicial y luego reinicias la aplicación. Si vuelves a la página de configuración, se desactivarán. Así que no vayas allí, porque si no lo haces, las opciones seguirán habilitadas. Si vuelves a la página de configuración, harás que se desactiven. Pasé mucho tiempo con esto y todavía no pude arreglarlo (solo un principiante jajaja).</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
new file mode 100644
index 0000000..51df074
--- /dev/null
+++ b/app/src/main/res/values-fr/strings.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">PS3 Proxy Server for Android</string>
+    <string name="iniciar">Démarrer le serveur</string>
+    <string name="parar">Arrête le serveur</string>
+    <string name="estado">"Statut: "</string>
+    <string name="enter_port">Insérer le port choisi...</string>
+    <string name="enter_ip">Insérer l\'IP choisie...</string>
+    <string name="porta">"Port: "</string>
+    <string name="ip_telemovel">Aucun</string>
+    <string name="servidor_ativado">actif</string>
+    <string name="creditos">Crédits</string>
+    <string name="creditos_menu">Crédits, AVERTISSEMENT et bugs et idées</string>
+    <string name="creditos2">- blckbear_ (PSX-Place) - d’aider et de donner des idées (donc d’énormes crédits pour lui);</string>
+    <string name="creditos4">Le programme original utilisé dans l\'application est disponible sur GitHub: https://github.com/mondul/PS3-Proxy</string>
+    <string name="creditos5">ATTENTION</string>
+    <string name="creditos6">Cette application ne fonctionne que sur Android 4.0.3 ou plus récent (j\'ai essayé d\'abaisser autant que possible)!</string>
+    <string name="creditos7">Donc, si vous avez besoin que le serveur fonctionne avec Android 4.0 et plus ancien (étant le minimum, Android 2.2, donc inférieur à 2.2, il n\'y a aucun moyen connu), veuillez suivre ce tutoriel, qui a été réalisé par la même personne qui a aidé à cette application:</string>
+    <string name="creditos9">Bugs et idées</string>
+    <string name="creditos10">Si vous avez trouvé un bogue dans l\'application ou si vous avez une idée en tête que vous aimeriez voir ici, dites-moi s\'il vous plaît dans ce fil (fil officiel):</string>
+    <string name="creditos_botao">Aller à l\'application</string>
+    <string name="creditos3">- mondul (GitHub / PSX-Place) - pour avoir créé le programme qui se trouve derrière l\'application (des crédits aussi incroyables pour lui ou pour l\'application ne seraient pas possibles, du moins aussi facilement);</string>
+    <string name="creditos1">- DADi590 - pour créer l\'application;</string>
+    <string name="definicoes">Réglages</string>
+    <string name="servidor">Serveur</string>
+    <string name="auto_start">Démarrage automatique du serveur au démarrage de l\'appareil</string>
+    <string name="auto_save">Enregistrer automatiquement les préférences du serveur</string>
+    <string name="visitar_site">Visitez le site web</string>
+    <string name="erro">ERREUR: veuillez insérer un port compris entre 1024 et 65535 (le port par défaut est 8080).</string>
+    <string name="bug">Il y a déjà un bogue dans lequel au moins dans KitKat et avec mon téléphone, si vous activez l\'une des deux options de la page des paramètres, vous revenez à la page initiale, puis vous redémarrez l\'application. Si vous revenez à la page des paramètres, ils seront désactivés. Alors n\'allez pas là-bas, car sinon, les options seront toujours activées. Si vous revenez à la page des paramètres, vous les ferez désactiver. Je passais beaucoup de temps avec cela et je ne pouvais toujours pas résoudre ce problème (juste un débutant hahaha).</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
new file mode 100644
index 0000000..249a902
--- /dev/null
+++ b/app/src/main/res/values-pt/strings.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">PS3 Proxy Server for Android</string>
+    <string name="iniciar">Iniciar o servidor</string>
+    <string name="estado">"Estado: "</string>
+    <string name="enter_port">Insere a porta desejada...</string>
+    <string name="ip_telemovel">Nenhum</string>
+    <string name="enter_ip">Insere o IP desejado...</string>
+    <string name="porta">"Porta: "</string>
+    <string name="parar">Parar o servidor</string>
+    <string name="servidor_ativado">ativado</string>
+    <string name="creditos">Créditos</string>
+    <string name="creditos_menu">Créditos, AVISO e bugs e ideias</string>
+    <string name="creditos_botao">Ir para a app</string>
+    <string name="creditos5">AVISO</string>
+    <string name="creditos9">Bugs e ideias</string>
+    <string name="creditos1">- DADi590 - por fazer a app;</string>
+    <string name="creditos7">Então, se precisas do servidor a funcionar no Android 4.0 e inferior (sendo o mínimo, Android 2.2, então mais antigo que isso não há formas conhecidas), por favor segue este tutorial, que foi feito pela mesma pessoa que ajudou nesta app:</string>
+    <string name="creditos6">Esta app apenas funciona no Android 4.0.3 e superior (tentei baixar o máximo que consegui)!</string>
+    <string name="creditos2">- blckbear_ (PSX-Place) - por ajudar e dar ideias (então grandes créditos para ele)</string>
+    <string name="creditos3">- mondul (GitHub/PSX-Place) - por fazer o programa que está por trás da app (então créditos enormes para ele, ou não teria sido possível fazer a app, pelo menos tão facilmente);</string>
+    <string name="creditos4">O programa original utilizado na app pode ser encontrado no GitHub: https://github.com/mondul/PS3-Proxy</string>
+    <string name="creditos10">Se encontraste um bug na app ou tens uma ideia em mente que gostarias de ver aqui (or apenas queres ver se há atualizações), por favor diz-me nesta página (página oficial):</string>
+    <string name="definicoes">Definições</string>
+    <string name="servidor">Servidor</string>
+    <string name="auto_start">Iniciar o servidor automaticamente no arranque do dispositivo</string>
+    <string name="auto_save">Guardar automaticamente as preferências do servidor</string>
+    <string name="visitar_site">Visitar página</string>
+    <string name="erro">ERRO: Por favor insere uma porta entre 1024 e 65535 (a porta predefinida é 8080).</string>
+    <string name="bug">Isto já tem um bug, pelo menos no KitKat e com o meu telemóvel (celular), se ativares qualquer uma das opções da página de definições, voltares à página inicial e depois reinicias a app. Se voltares à página das definições, elas estarão desativadas. Então apenas não vás lá, porque se não fores as opções ainda estarão ativadas. Se lá fores, farás com que se desativem. Estive muito tempo com isto e mesmo assim não consegui arranjar isto (apenas um iniciante hahaha).</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
new file mode 100644
index 0000000..e257070
--- /dev/null
+++ b/app/src/main/res/values-ru/strings.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">PS3 Proxy Server for Android</string>
+    <string name="iniciar">Запустить сервер</string>
+    <string name="estado">"Статус: "</string>
+    <string name="enter_port">Вставьте выбранный порт...</string>
+    <string name="enter_ip">Вставьте выбранный IP...</string>
+    <string name="ip_telemovel">Никто</string>
+    <string name="porta">"Порт: "</string>
+    <string name="parar">Остановить сервер</string>
+    <string name="servidor_ativado">активный</string>
+    <string name="creditos">Кредиты</string>
+    <string name="creditos_menu">Кредиты, ВНИМАНИЕ и ошибки и идеи</string>
+    <string name="creditos_botao">Перейти в приложение</string>
+    <string name="creditos5">ПРЕДУПРЕЖДЕНИЕ</string>
+    <string name="creditos9">Ошибки и идеи</string>
+    <string name="creditos1">- DADi590 - для создания приложения;</string>
+    <string name="creditos2">- blckbear_ (PSX-Place) - за помощь и предложение идей (такие огромные кредиты для него)</string>
+    <string name="creditos3">- mondul (GitHub/PSX-Place) - для создания программы, которая стоит за приложением (такие потрясающие кредиты для него или для приложения были бы невозможны, по крайней мере, так легко);</string>
+    <string name="creditos4">Оригинальную программу, используемую в приложении, можно найти на GitHub: https://github.com/mondul/PS3-Proxy.</string>
+    <string name="creditos10">Если у вас есть ошибка с приложением или что-то еще (oder Sie möchten nur nach einem Update suchen), пожалуйста (или просто хотите проверить наличие обновлений), сообщите мне в этой теме (официальная тема):</string>
+    <string name="creditos6">Это приложение работает только на Android 4.0.3 или более поздней версии (я пытался снизить как можно больше)!</string>
+    <string name="creditos7">Итак, если вам нужен сервер для работы с Android 4.0 и более ранними версиями (будь то минимальный Android 2.2, поэтому ниже 2.2 нет известного способа), следуйте этому руководству, которое было написано тем же человеком, который помогал в этом приложении:</string>
+    <string name="definicoes">настройки</string>
+    <string name="servidor">сервер</string>
+    <string name="auto_start">Автоматический запуск сервера при загрузке устройства</string>
+    <string name="auto_save">Автосохранение настроек сервера</string>
+    <string name="visitar_site">Посетите сайт</string>
+    <string name="erro">ОШИБКА: пожалуйста, введите порт между 1024 и 65535 (по умолчанию используется порт 8080).</string>
+    <string name="bug">В нем уже есть ошибка, по крайней мере, в KitKat и с моим телефоном, если вы включите любой из двух вариантов на странице настроек, вы вернетесь на начальную страницу и затем перезапустите приложение. Если вы снова перейдете на страницу настроек, они будут отключены. Так что просто не ходите туда, потому что если вы этого не сделаете, опции все равно будут включены. Если вы снова зайдете на страницу настроек, вы заставите их отключить себя. У меня было много времени с этим, и я все еще не мог исправить это (просто начинающий хахаха).</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000..6b3f6ab
--- /dev/null
+++ b/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#008577</color>
+    <color name="colorPrimaryDark">#00574B</color>
+    <color name="colorAccent">#D81B60</color>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000..a6264fd
--- /dev/null
+++ b/app/src/main/res/values/strings.xml
@@ -0,0 +1,33 @@
+<resources>
+    <string name="app_name">PS3 Proxy Server for Android</string>
+    <string name="iniciar">Start the server</string>
+    <string name="parar">Stop the server</string>
+    <string name="estado">"Status: "</string>
+    <string name="enter_port">Insert the chosen port...</string>
+    <string name="enter_ip">Insert the chosen IP...</string>
+    <string name="porta">"Port: "</string>
+    <string name="ip_telemovel">None</string>
+    <string name="servidor_ativado">active</string>
+    <string name="nome_servico" translatable="false">PS3 Proxy Server for Android</string>
+    <string name="creditos">Credits</string>
+    <string name="creditos_menu">Credits, WARNING and bugs and ideas</string>
+    <string name="creditos2">- blckbear_ (PSX-Place) - for helping and giving ideas (so huge credits for him);</string>
+    <string name="creditos4">Original program used in the app can be found on GitHub: https://github.com/mondul/PS3-Proxy</string>
+    <string name="creditos5">WARNING</string>
+    <string name="creditos6">This app only works on Android 4.0.3 or newer (I tried to lower as much as I could)!</string>
+    <string name="creditos7">So, if you need the server to work with Android 4.0 and older (being the minimum, Android 2.2, so lower than 2.2 there is no known way), please follow this tutorial, which was made by the same person who helped in this app:</string>
+    <string name="creditos8" translatable="false">https://www.psx-place.com/threads/tutorial-how-to-set-up-ps3-proxy-server-on-android.22846/</string>
+    <string name="creditos9">Bugs and ideas</string>
+    <string name="creditos10">If you found a bug with the app or you have something in mind that you\'d like to see here (or just want to check for an update), please tell me in this thread (official thread):</string>
+    <string name="creditos11" translatable="false">https://www.psx-place.com/resources/ps3-proxy-server-for-android.795/</string>
+    <string name="creditos_botao">Go to the app</string>
+    <string name="creditos3">- mondul (GitHub/PSX-Place) - for making the program which is behind the app (so amazing credits for him or the app wouldn\'t be possible, at least so easily);</string>
+    <string name="creditos1">- DADi590 - for making the app;</string>
+    <string name="definicoes">Settings</string>
+    <string name="servidor">Server</string>
+    <string name="auto_start">Auto start the server at device boot</string>
+    <string name="auto_save">Auto save the server preferences</string>
+    <string name="visitar_site">Visit website</string>
+    <string name="erro">"ERROR: Please insert a port between 1024 and 65535 (the default port is 8080)."</string>
+    <string name="bug">"It already has a bug where at least in KitKat and with my phone, if you enable any of the two options on the settings page, you go back to the initial page and then you restart the app. If you go again to the settings page, they will be disabled. So just don't go there, because if you don't the options will still be enabled. If you go to the settings page again, you'll cause them to disable themselves. I was much time with this and I still couldn't fix this (just a begginer hahaha)."</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000..d39d37b
--- /dev/null
+++ b/app/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
diff --git a/app/src/test/java/com/dadi590/ps3proxyserverforandroid/ExampleUnitTest.java b/app/src/test/java/com/dadi590/ps3proxyserverforandroid/ExampleUnitTest.java
new file mode 100644
index 0000000..183c9f5
--- /dev/null
+++ b/app/src/test/java/com/dadi590/ps3proxyserverforandroid/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package com.dadi590.ps3proxyserverforandroid;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..f208c52
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,27 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        google()
+        jcenter()
+        
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.3.2'
+        
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+        
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..9f85f38
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,15 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
+
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..f6b961f
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..16ce4a4
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Sat Mar 09 14:45:45 GMT 2019
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000..cccdd3d
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..e95643d
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/local.properties b/local.properties
new file mode 100644
index 0000000..4df52c1
--- /dev/null
+++ b/local.properties
@@ -0,0 +1,9 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Sat Mar 09 14:45:46 GMT 2019
+ndk.dir=C\:\\Android\\ndk-bundle
+sdk.dir=C\:\\Android
diff --git a/ps3_proxy/build.gradle b/ps3_proxy/build.gradle
new file mode 100644
index 0000000..e12cda5
--- /dev/null
+++ b/ps3_proxy/build.gradle
@@ -0,0 +1,4 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file('ps3_proxy.aar'))
+dependencies {
+}
\ No newline at end of file
diff --git a/ps3_proxy/ps3_proxy.aar b/ps3_proxy/ps3_proxy.aar
new file mode 100644
index 0000000..dae0d5e
Binary files /dev/null and b/ps3_proxy/ps3_proxy.aar differ
diff --git a/ps3_proxy/ps3_proxy.iml b/ps3_proxy/ps3_proxy.iml
new file mode 100644
index 0000000..96e6343
--- /dev/null
+++ b/ps3_proxy/ps3_proxy.iml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":ps3_proxy" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":ps3_proxy" />
+      </configuration>
+    </facet>
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..e9314db
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+include ':app', ':ps3_proxy'