Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
<activity
android:name="wseemann.media.romote.activity.MainActivity"
android:windowSoftInputMode="stateAlwaysHidden|adjustPan"
android:screenOrientation="portrait"
android:configChanges="orientation|keyboardHidden"
android:launchMode="singleTask"
android:exported="true"
Expand Down Expand Up @@ -59,32 +58,27 @@
<activity
android:name="wseemann.media.romote.activity.RemoteActivity"
android:theme="@style/AppTheme"
android:screenOrientation="portrait"
android:configChanges="orientation|keyboardHidden"/>

<activity
android:name="wseemann.media.romote.activity.DeviceInfoActivity"
android:theme="@style/AppTheme"
android:label="@string/title_device_info"
android:screenOrientation="portrait"
android:configChanges="orientation|keyboardHidden"/>

<activity
android:name="wseemann.media.romote.activity.SettingsActivity"
android:theme="@style/AppTheme"
android:label="@string/title_settings"
android:screenOrientation="portrait"
android:configChanges="orientation|keyboardHidden"/>

<activity
android:name="wseemann.media.romote.activity.ConfigureDeviceActivity"
android:theme="@style/AppTheme"
android:screenOrientation="portrait"
android:configChanges="orientation|keyboardHidden"/>

<activity android:name="wseemann.media.romote.activity.AppWidgetConfigure"
android:theme="@style/AppTheme"
android:screenOrientation="portrait"
android:configChanges="orientation|keyboardHidden"
android:exported="true">
<intent-filter>
Expand All @@ -96,7 +90,6 @@
android:name="wseemann.media.romote.activity.ManualConnectionActivity"
android:theme="@style/AppTheme"
android:label="@string/title_connect_manually"
android:screenOrientation="portrait"
android:configChanges="orientation|keyboardHidden"/>

<receiver android:name="wseemann.media.romote.widget.RokuAppWidgetProvider"
Expand Down
27 changes: 23 additions & 4 deletions app/src/main/java/wseemann/media/romote/activity/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import android.os.IBinder;

import android.os.Bundle;
import android.os.Handler;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
Expand Down Expand Up @@ -58,6 +59,14 @@ public class MainActivity extends ConnectivityActivity implements

private ChannelFragment mChannelFragment;

@Override
public Object onRetainCustomNonConfigurationInstance() {
if (mViewPager == null) {
return null;
}
return new Integer(mViewPager.getCurrentItem());
}

@Override
public void onCreate(Bundle savedInstanceState) {
SplashScreen.installSplashScreen(this);
Expand Down Expand Up @@ -98,13 +107,23 @@ public void onPageSelected(int position) {
}
});

if (!commandHelper.getDeviceURL().equals("")) {
mViewPager.setCurrentItem(1);
}

TabLayout tabLayout = (TabLayout) findViewById(R.id.tabs);
tabLayout.setupWithViewPager(mViewPager);

Integer lastItem = (Integer) getLastCustomNonConfigurationInstance();
if (lastItem != null) {
new Handler().post(new Runnable() {
@Override
public void run() {
mViewPager.setCurrentItem(lastItem, false);
}
});
} else {
if (!commandHelper.getDeviceURL().equals("")) {
mViewPager.setCurrentItem(1, false);
}
}

/*BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_navigation);
bottomNavigationView.setLabelVisibilityMode(LabelVisibilityMode.LABEL_VISIBILITY_LABELED);
bottomNavigationView.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
Expand Down
Loading