Skip to content
Snippets Groups Projects
Commit b262a092 authored by Jawn's avatar Jawn
Browse files

Reenable actionbar items in toolbar. Ooops

parent 32205db5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/build.gradle
+ 1
− 0
View file @ b262a092
@@ -40,6 +40,7 @@ dependencies {
compile 'com.squareup.retrofit:retrofit:1.9.0'
compile 'com.squareup.okhttp:okhttp:2.4.0'
compile 'com.jakewharton:butterknife:7.0.1'
compile 'com.jakewharton.timber:timber:3.1.0'
compile 'de.keyboardsurfer.android.widget:crouton:1.8.5@aar'
compile 'com.android.support:appcompat-v7:22.2.1'
compile 'com.android.support:design:22.2.1'
app/src/main/java/com/commit451/gitlab/DiffActivity.java
+ 16
− 23
View file @ b262a092
@@ -2,7 +2,6 @@ package com.commit451.gitlab;
 
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.LinearLayout;
@@ -35,14 +34,12 @@ public class DiffActivity extends BaseActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_diff);
ButterKnife.bind(this);
init();
}
@Override
public void onDestroy() {
super.onDestroy();
Crouton.cancelAllCroutons();
}
@@ -55,6 +52,22 @@ public class DiffActivity extends BaseActivity {
}
});
toolbar.setTitle(Repository.selectedCommit.getShortId());
toolbar.inflateMenu(R.menu.diff);
toolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch(item.getItemId()) {
case android.R.id.home:
finish();
return true;
case R.id.text_wrap_checkbox:
item.setChecked(!item.isChecked());
setTextWrap(item.isChecked());
return true;
}
return false;
}
});
 
Repository.getService().getCommit(Repository.selectedProject.getId(), Repository.selectedCommit.getId(), commitCallback);
Repository.getService().getCommitDiff(Repository.selectedProject.getId(), Repository.selectedCommit.getId(), diffCallback);
@@ -90,20 +103,6 @@ public class DiffActivity extends BaseActivity {
Crouton.makeText(DiffActivity.this, R.string.connection_error, Style.ALERT);
}
};
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch(item.getItemId()) {
case android.R.id.home:
finish();
return true;
case R.id.text_wrap_checkbox:
item.setChecked(!item.isChecked());
setTextWrap(item.isChecked());
return true;
}
return super.onOptionsItemSelected(item);
}
private void setTextWrap(boolean checked) {
((MessageView) messageContainer.getChildAt(0)).setWrapped(checked);
@@ -112,10 +111,4 @@ public class DiffActivity extends BaseActivity {
((DiffView) diffContainer.getChildAt(i)).setWrapped(checked);
}
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.diff, menu);
return true;
}
}
\ No newline at end of file
app/src/main/java/com/commit451/gitlab/FileActivity.java
+ 23
− 32
View file @ b262a092
@@ -36,9 +36,6 @@ public class FileActivity extends BaseActivity {
@Bind(R.id.toolbar) Toolbar toolbar;
@Bind(R.id.file_blob) WebView fileBlobView;
private MenuItem openFile;
private MenuItem saveFile;
private byte[] fileBlob;
@Override
@@ -71,21 +68,32 @@ public class FileActivity extends BaseActivity {
}
});
toolbar.setTitle(Repository.selectedFile.getName());
toolbar.inflateMenu(R.menu.file);
toolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch(item.getItemId()) {
case android.R.id.home:
finish();
return true;
case R.id.action_open:
openFile();
return true;
case R.id.action_save:
saveBlob();
return true;
}
return false;
}
});
fileBlobView.getSettings().setJavaScriptEnabled(true);
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.file, menu);
openFile = menu.getItem(0);
saveFile = menu.getItem(1);
return true;
}
private void enableMenu() {
private void enableMenu(Menu menu) {
MenuItem openFile = menu.getItem(0);
MenuItem saveFile = menu.getItem(1);
if(openFile != null) {
openFile.setEnabled(true);
openFile.setIcon(R.drawable.ic_action_open);
@@ -97,23 +105,6 @@ public class FileActivity extends BaseActivity {
}
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch(item.getItemId()) {
case android.R.id.home:
finish();
return true;
case R.id.action_open:
openFile();
return true;
case R.id.action_save:
saveBlob();
return true;
}
return super.onOptionsItemSelected(item);
}
private Callback<Response> blobCallback = new Callback<Response>() {
@Override
@@ -134,7 +125,7 @@ public class FileActivity extends BaseActivity {
String temp = "<!DOCTYPE html><html><head><link href=\"github.css\" rel=\"stylesheet\" /></head><body><pre><code>" + StringEscapeUtils.escapeHtml(content) + "</code></pre><script src=\"highlight.pack.js\"></script><script>hljs.initHighlightingOnLoad();</script></body></html>";
fileBlobView.loadDataWithBaseURL("file:///android_asset/", temp, "text/html", "utf8", null);
enableMenu();
enableMenu(toolbar.getMenu());
}
@Override
app/src/main/java/com/commit451/gitlab/IssueActivity.java
+ 15
− 21
View file @ b262a092
@@ -4,7 +4,6 @@ import android.app.ProgressDialog;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import android.text.method.LinkMovementMethod;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
@@ -95,6 +94,21 @@ public class IssueActivity extends BaseActivity {
}
});
toolbar.setTitle("Issue #" + tempId);
toolbar.inflateMenu(R.menu.issue);
toolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch(item.getItemId()) {
case android.R.id.home:
finish();
return true;
case R.id.action_save:
save();
return true;
}
return false;
}
});
title.setText(Repository.selectedIssue.getTitle());
@@ -142,26 +156,6 @@ public class IssueActivity extends BaseActivity {
Repository.setListViewSize(noteList);
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.issue, menu);
return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch(item.getItemId()) {
case android.R.id.home:
finish();
return true;
case R.id.action_save:
save();
return true;
}
return super.onOptionsItemSelected(item);
}
private void loadNotes() {
progressBar.setVisibility(View.VISIBLE);
Repository.getService().getIssueNotes(Repository.selectedProject.getId(), Repository.selectedIssue.getId(), notesCallback);
app/src/main/java/com/commit451/gitlab/MainActivity.java
+ 0
− 31
View file @ b262a092
@@ -13,7 +13,6 @@ import android.support.v4.view.ViewPager;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBar;
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewConfiguration;
@@ -90,12 +89,6 @@ public class MainActivity extends BaseActivity implements ActionBar.OnNavigation
@Override
public boolean onMenuItemClick(MenuItem item) {
switch(item.getItemId()) {
case android.R.id.home:
if(drawerLayout.isDrawerOpen(drawerLeft))
drawerLayout.closeDrawer(drawerLeft);
else
drawerLayout.openDrawer(drawerLeft);
return true;
case R.id.action_logout:
Repository.setLoggedIn(false);
startActivity(new Intent(MainActivity.this, LoginActivity.class));
@@ -148,30 +141,6 @@ public class MainActivity extends BaseActivity implements ActionBar.OnNavigation
Crouton.cancelAllCroutons();
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.main, menu);
return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch(item.getItemId()) {
case android.R.id.home:
if(drawerLayout.isDrawerOpen(drawerLeft))
drawerLayout.closeDrawer(drawerLeft);
else
drawerLayout.openDrawer(drawerLeft);
return true;
case R.id.action_logout:
Repository.setLoggedIn(false);
startActivity(new Intent(this, LoginActivity.class));
return true;
default:
return super.onOptionsItemSelected(item);
}
}
@Override
public boolean onNavigationItemSelected(int itemPosition, long itemId) {
Repository.selectedBranch = Repository.branches.get(itemPosition);
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment