3838import android .support .v4 .view .GravityCompat ;
3939import android .support .v4 .view .ViewPager ;
4040import android .support .v4 .widget .DrawerLayout ;
41- import android .support .v7 .widget .LinearLayoutManager ;
42- import android .support .v7 .widget .RecyclerView ;
41+ import android .support .v7 .app .ActionBarDrawerToggle ;
4342import android .support .v7 .widget .Toolbar ;
4443import android .text .TextUtils ;
4544import android .view .Gravity ;
7675import com .jecelyin .editor .v2 .manager .MenuManager ;
7776import com .jecelyin .editor .v2 .manager .RecentFilesManager ;
7877import com .jecelyin .editor .v2 .manager .TabManager ;
79- import com .jecelyin . editor . v2 . utils . DBHelper ;
78+ import com .duy . ide . database . SQLHelper ;
8079import com .jecelyin .editor .v2 .widget .SymbolBarLayout ;
8180import com .jecelyin .editor .v2 .widget .menu .MenuDef ;
8281import com .jecelyin .editor .v2 .widget .menu .MenuFactory ;
@@ -112,7 +111,6 @@ public abstract class IdeActivity extends ThemeSupportActivity implements MenuIt
112111 public DrawerLayout mDrawerLayout ;
113112 protected TabManager mTabManager ;
114113 protected DiagnosticPresenter mDiagnosticPresenter ;
115- private RecyclerView mTabRecyclerView ;
116114 private SymbolBarLayout mSymbolBarLayout ;
117115 private Preferences mPreferences ;
118116 private MenuManager mMenuManager ;
@@ -137,13 +135,16 @@ public void onDrawerOpened(View drawerView) {
137135 hideSoftInput ();
138136 }
139137 });
138+ ActionBarDrawerToggle actionBarDrawerToggle = new ActionBarDrawerToggle (
139+ this , mDrawerLayout , mToolbar , R .string .open_drawer , R .string .close_drawer
140+ );
141+ mDrawerLayout .addDrawerListener (actionBarDrawerToggle );
142+ actionBarDrawerToggle .syncState ();
140143
141144 //keyboard hide/show listener
142145 setRootLayout (mDrawerLayout );
143146 attachKeyboardListeners ();
144147
145- mTabRecyclerView = findViewById (R .id .tabRecyclerView );
146-
147148 mSymbolBarLayout = findViewById (R .id .symbolBarLayout );
148149 mSymbolBarLayout .setOnSymbolCharClickListener (new SymbolBarLayout .OnSymbolCharClickListener () {
149150 @ Override
@@ -158,10 +159,6 @@ public void onClick(View v, String text) {
158159 TextView versionView = findViewById (R .id .versionTextView );
159160 versionView .setText (SysUtils .getVersionName (this ));
160161 mEditorPager .setVisibility (View .VISIBLE );
161-
162- initToolbar ();
163-
164- mTabRecyclerView .setLayoutManager (new LinearLayoutManager (this ));
165162 mTabManager = new TabManager (this );
166163
167164 initMenuView ();
@@ -247,11 +244,6 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
247244 }
248245
249246
250- private void initToolbar () {
251- mToolbar .setNavigationIcon (R .drawable .ic_drawer_raw );
252- mToolbar .setNavigationContentDescription (R .string .tab );
253- }
254-
255247 @ Override
256248 protected void onNewIntent (Intent intent ) {
257249 super .onNewIntent (intent );
@@ -621,8 +613,8 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
621613 EditorDelegate delegate = getCurrentEditorDelegate ();
622614 if (delegate != null ) {
623615 delegate .saveInBackground (new File (file ), encoding );
624- DBHelper .getInstance (this ).addRecentFile (file , encoding );
625- DBHelper .getInstance (this ).updateRecentFile (file , false );
616+ SQLHelper .getInstance (this ).addRecentFile (file , encoding );
617+ SQLHelper .getInstance (this ).updateRecentFile (file , false );
626618 }
627619 break ;
628620 case RC_SETTINGS :
@@ -684,7 +676,7 @@ private void createNewEditor(File file, int offset, String encoding) {
684676 if (!mTabManager .newTab (file , offset , encoding )) {
685677 return ;
686678 }
687- DBHelper .getInstance (IdeActivity .this ).addRecentFile (file .getPath (), encoding );
679+ SQLHelper .getInstance (IdeActivity .this ).addRecentFile (file .getPath (), encoding );
688680 }
689681
690682 public void insertText (CharSequence text ) {
@@ -737,10 +729,6 @@ public String getCurrentLang() {
737729 return editorDelegate .getLang ();
738730 }
739731
740- public RecyclerView getTabRecyclerView () {
741- return mTabRecyclerView ;
742- }
743-
744732 @ Override
745733 public void onEditorViewCreated (IEditorDelegate editorDelegate ) {
746734
0 commit comments