Merge remote-tracking branch 'initial-android-app'

16 files changed, 51 insertions, 0 deletions

diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..d2a34d9077
--- /dev/null
+++ b/android/src/main/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<manifest
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        package="net.mullvad.mullvadvpn"
+        >
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application
+            android:icon="@mipmap/ic_launcher"
+            android:theme="@style/AppTheme"
+            >
+        <activity
+                android:name=".MainActivity"
+                android:label="@string/app_name"
+                >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
new file mode 100644
index 0000000000..97d87a264a
--- /dev/null
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
@@ -0,0 +1,11 @@
+package net.mullvad.mullvadvpn
+
+import android.os.Bundle
+import android.support.v4.app.FragmentActivity
+
+class MainActivity: FragmentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.main)
+    }
+}
diff --git a/android/src/main/res/layout/main.xml b/android/src/main/res/layout/main.xml
new file mode 100644
index 0000000000..c14a2287b4
--- /dev/null
+++ b/android/src/main/res/layout/main.xml
@@ -0,0 +1,6 @@
+<FrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/main_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        />
diff --git a/android/src/main/res/mipmap-hdpi/ic_launcher.png b/android/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000..ecdaeebbe5
--- /dev/null
+++ b/android/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000000..ecdaeebbe5
--- /dev/null
+++ b/android/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/android/src/main/res/mipmap-mdpi/ic_launcher.png b/android/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000..84aa8cf767
--- /dev/null
+++ b/android/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000000..84aa8cf767
--- /dev/null
+++ b/android/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/android/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000..8809e8615b
--- /dev/null
+++ b/android/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000..8809e8615b
--- /dev/null
+++ b/android/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/android/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000..623363c03a
--- /dev/null
+++ b/android/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000..623363c03a
--- /dev/null
+++ b/android/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000..c3c8f0f43d
--- /dev/null
+++ b/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000..c3c8f0f43d
--- /dev/null
+++ b/android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/android/src/main/res/values/colors.xml b/android/src/main/res/values/colors.xml
new file mode 100644
index 0000000000..b0bf7bdb56
--- /dev/null
+++ b/android/src/main/res/values/colors.xml
@@ -0,0 +1,4 @@
+<resources>
+    <color name="colorPrimary">#294D73</color>
+    <color name="blue">#294D73</color>
+</resources>
diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..e37acca63b
--- /dev/null
+++ b/android/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Mullvad VPN</string>
+</resources>
diff --git a/android/src/main/res/values/styles.xml b/android/src/main/res/values/styles.xml
new file mode 100644
index 0000000000..726847ab42
--- /dev/null
+++ b/android/src/main/res/values/styles.xml
@@ -0,0 +1,6 @@
+<resources>
+    <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="android:windowBackground">@color/blue</item>
+    </style>
+</resources>