diff --git a/app/build.gradle b/app/build.gradle index 87a593f..f67f3fd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,9 +24,9 @@ dependencies { androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.android.support.constraint:constraint-layout:1.0.2' compile project(':goRicochetMobile') + compile 'com.android.support:appcompat-v7:25.3.1' + compile 'com.android.support.constraint:constraint-layout:1.0.2' testCompile 'junit:junit:4.12' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index dd292ed..f75b594 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,14 +12,14 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - - + + \ No newline at end of file diff --git a/app/src/main/java/im/ricochet/androidod/ConnectActivity.java b/app/src/main/java/im/ricochet/androidod/ConnectActivity.java index e4f2b44..9d688ae 100644 --- a/app/src/main/java/im/ricochet/androidod/ConnectActivity.java +++ b/app/src/main/java/im/ricochet/androidod/ConnectActivity.java @@ -1,5 +1,6 @@ package im.ricochet.androidod; +import android.content.Intent; import android.content.SharedPreferences; import android.os.AsyncTask; import android.os.StrictMode; @@ -139,8 +140,10 @@ public class ConnectActivity extends AppCompatActivity { connectButton.setEnabled(true); regenButton.setEnabled(true); } else { - connectStatusText.setText(""); - // TODO: Open OD control activity + connectStatusText.setText("Connected!"); + Intent i = new Intent(getApplicationContext(), RemoteActivity.class); + // i,putExtra("key", "val") + startActivity(i); } } } diff --git a/app/src/main/res/layout/activity_remote.xml b/app/src/main/res/layout/activity_remote.xml new file mode 100644 index 0000000..2dae224 --- /dev/null +++ b/app/src/main/res/layout/activity_remote.xml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + +