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

Remove the lock orientation checkbox in the overflow. Remove the filter edittext in the nav drawer

parent 171f01e4
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -3,7 +3,6 @@ package com.commit451.gitlab;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.res.Configuration;
import android.graphics.Point;
import android.os.Bundle;
Loading
Loading
@@ -14,15 +13,16 @@ import android.support.v4.view.ViewPager;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBar;
import android.support.v7.app.ActionBarDrawerToggle;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewConfiguration;
import android.view.inputmethod.InputMethodManager;
import android.widget.*;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.ArrayAdapter;
import android.widget.LinearLayout;
import android.widget.ListView;
 
import com.commit451.gitlab.adapter.DrawerAdapter;
import com.commit451.gitlab.fragments.CommitsFragment;
Loading
Loading
@@ -35,8 +35,6 @@ import com.commit451.gitlab.model.Project;
import com.commit451.gitlab.model.User;
import com.commit451.gitlab.tools.Repository;
import com.commit451.gitlab.tools.RetrofitHelper;
import com.commit451.gitlab.views.DrawableClickListener;
import com.commit451.gitlab.views.FilterEditText;
 
import java.lang.reflect.Field;
import java.util.ArrayList;
Loading
Loading
@@ -45,10 +43,8 @@ import java.util.Locale;
 
import butterknife.Bind;
import butterknife.ButterKnife;
import de.keyboardsurfer.android.widget.crouton.Crouton;
import de.keyboardsurfer.android.widget.crouton.Style;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
Loading
Loading
@@ -59,7 +55,6 @@ public class MainActivity extends BaseActivity implements ActionBar.OnNavigation
@Bind(R.id.left_drawer) LinearLayout drawerLeft;
@Bind(R.id.left_drawer_list) ListView drawerList;
@Bind(R.id.pager) ViewPager viewPager;
@Bind(R.id.filter_project) FilterEditText filterProjectEdit;
 
private ActionBar actionBar;
private ActionBarDrawerToggle drawerToggle;
Loading
Loading
@@ -79,27 +74,6 @@ public class MainActivity extends BaseActivity implements ActionBar.OnNavigation
drawerList.setOnItemClickListener(this);
drawerToggle = new ActionBarDrawerToggle(this, drawerLayout, R.string.drawer_open, R.string.drawer_close);
drawerLayout.setDrawerListener(drawerToggle);
filterProjectEdit.addTextChangedListener(new TextWatcher() {
@Override
public void onTextChanged(CharSequence cs, int arg1, int arg2, int arg3) {
Repository.drawerAdapter.getFilter().filter(filterProjectEdit.getText().toString());
}
@Override
public void beforeTextChanged(CharSequence arg0, int arg1, int arg2, int arg3) {
}
@Override
public void afterTextChanged(Editable s) {
}
});
filterProjectEdit.setDrawableClickListener(new DrawableClickListener() {
@Override
public void onClick(DrawablePosition target) {
filterProjectEdit.setText("");
}
});
// Workaround that forces the overflow menu
try {
Loading
Loading
@@ -171,15 +145,6 @@ public class MainActivity extends BaseActivity implements ActionBar.OnNavigation
Repository.setLoggedIn(false);
startActivity(new Intent(this, LoginActivity.class));
return true;
case R.id.action_lock_orientation:
item.setChecked(!item.isChecked());
rotationLocked = item.isChecked();
if(rotationLocked)
setRequestedOrientation(Repository.getScreenOrientation(this));
else
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
return true;
default:
return super.onOptionsItemSelected(item);
}
Loading
Loading
Loading
Loading
@@ -35,14 +35,6 @@
android:orientation="vertical"
android:background="@android:color/white">
 
<com.commit451.gitlab.views.FilterEditText
android:id="@+id/filter_project"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="6dp"
android:hint="@string/filter_projects"
android:drawableRight="@drawable/ic_input_delete" />
<ListView
android:id="@+id/left_drawer_list"
android:layout_width="match_parent"
Loading
Loading
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
 
<item android:id="@+id/text_wrap_checkbox"
android:title="@string/text_wrap_checkbox"
android:showAsAction="never"
app:showAsAction="never"
android:checkable="true"
android:checked="true" />
 
Loading
Loading
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_open"
android:orderInCategory="99"
android:enabled="false"
android:showAsAction="always"
app:showAsAction="ifRoom"
android:title="@string/action_open"
android:icon="@drawable/ic_action_open_dark" />
<item
android:id="@+id/action_save"
android:orderInCategory="100"
android:enabled="false"
android:showAsAction="always"
app:showAsAction="ifRoom"
android:title="@string/action_save"
android:icon="@drawable/ic_action_save_dark"/>
 
Loading
Loading
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_save"
android:orderInCategory="100"
android:showAsAction="always"
app:showAsAction="ifRoom"
android:title="@string/action_save"
android:icon="@drawable/ic_action_save"/>
 
Loading
Loading
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:id="@+id/action_lock_orientation"
android:orderInCategory="101"
android:showAsAction="never"
android:title="@string/action_lock_orientation"
android:checkable="true"
android:checked="true" />
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
 
<item
android:id="@+id/action_logout"
android:orderInCategory="101"
android:showAsAction="never"
app:showAsAction="never"
android:title="@string/action_logout"/>
 
</menu>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment