Added back button to download activity ActionBar

pull/285/head
David 2016-04-23 07:22:29 -03:00
rodzic 4bae12aa55
commit 0156a4f39e
2 zmienionych plików z 29 dodań i 12 usunięć

Wyświetl plik

@ -11,8 +11,10 @@ import android.content.SharedPreferences;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.os.IBinder; import android.os.IBinder;
import android.support.v4.app.NavUtils;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
@ -25,6 +27,8 @@ import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import org.schabi.newpipe.R; import org.schabi.newpipe.R;
import org.schabi.newpipe.VideoItemDetailActivity;
import org.schabi.newpipe.VideoItemListActivity;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -45,6 +49,8 @@ public class MainActivity extends AppCompatActivity implements AdapterView.OnIte
public static final String INTENT_LIST = "us.shandian.giga.intent.LIST"; public static final String INTENT_LIST = "us.shandian.giga.intent.LIST";
private static final String TAG = MainActivity.class.toString();
private MissionsFragment mFragment; private MissionsFragment mFragment;
private DownloadManager mManager; private DownloadManager mManager;
private DownloadManagerService.DMBinder mBinder; private DownloadManagerService.DMBinder mBinder;
@ -81,10 +87,16 @@ public class MainActivity extends AppCompatActivity implements AdapterView.OnIte
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_downloader); setContentView(R.layout.activity_downloader);
try {
//noinspection ConstantConditions
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
} catch(Exception e) {
Log.d(TAG, "Could not get SupportActionBar");
e.printStackTrace();
}
mPrefs = getSharedPreferences("threads", Context.MODE_WORLD_READABLE); mPrefs = getSharedPreferences("threads", Context.MODE_WORLD_READABLE);
// Fragment // Fragment
getWindow().getDecorView().getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() { getWindow().getDecorView().getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
@Override @Override
@ -100,7 +112,6 @@ public class MainActivity extends AppCompatActivity implements AdapterView.OnIte
} }
} }
@Override @Override
protected void onNewIntent(Intent intent) { protected void onNewIntent(Intent intent) {
super.onNewIntent(intent); super.onNewIntent(intent);
@ -128,7 +139,7 @@ public class MainActivity extends AppCompatActivity implements AdapterView.OnIte
.replace(R.id.frame, mFragment) .replace(R.id.frame, mFragment)
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE) .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
.commit(); .commit();
} }
private void showUrlDialog() { private void showUrlDialog() {
@ -277,4 +288,17 @@ public class MainActivity extends AppCompatActivity implements AdapterView.OnIte
} }
@Override
public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId();
if (id == android.R.id.home) {
Intent intent = new Intent(this, VideoItemDetailActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
NavUtils.navigateUpTo(this, intent);
return true;
} else {
return false;
}
}
} }

Wyświetl plik

@ -1,4 +1,4 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
@ -8,11 +8,4 @@ android:orientation="vertical">
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent"/>
<FrameLayout </LinearLayout>
android:id="@+id/nav"
android:layout_gravity="left"
android:layout_width="240dp"
android:layout_height="match_parent">
</FrameLayout>
</RelativeLayout>