fankes/termux-app
2
0
Fork 0
mirror of https://github.com/fankes/termux-app.git synced 2025-09-06 10:45:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed|Fixed: Drawer extra-keys button will toggle instead of just opening

Browse Source 
Also fixed NullPointerException due to changes in 2a74d43c
This commit is contained in:
agnostic-apollo
2021-08-23 18:39:05 +05:00
parent c59835ed93
commit 16c56a968e
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
View File

@@ -75,6 +75,10 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {
this.mTermuxTerminalSessionClient = termuxTerminalSessionClient; this.mTermuxTerminalSessionClient = termuxTerminalSessionClient;
} }
public TermuxActivity getActivity() {
return mActivity;
}
/** /**
* Should be called when mActivity.onCreate() is called * Should be called when mActivity.onCreate() is called
*/ */

8
app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java
View File

@@ -7,7 +7,6 @@ import android.view.View;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.drawerlayout.widget.DrawerLayout; import androidx.drawerlayout.widget.DrawerLayout;
import com.termux.R;
import com.termux.app.terminal.TermuxTerminalSessionClient; import com.termux.app.terminal.TermuxTerminalSessionClient;
import com.termux.app.terminal.TermuxTerminalViewClient; import com.termux.app.terminal.TermuxTerminalViewClient;
import com.termux.shared.terminal.io.TerminalExtraKeys; import com.termux.shared.terminal.io.TerminalExtraKeys;
@@ -34,8 +33,11 @@ public class TermuxTerminalExtraKeys extends TerminalExtraKeys {
if(mTermuxTerminalViewClient != null) if(mTermuxTerminalViewClient != null)
mTermuxTerminalViewClient.onToggleSoftKeyboardRequest(); mTermuxTerminalViewClient.onToggleSoftKeyboardRequest();
} else if ("DRAWER".equals(key)) { } else if ("DRAWER".equals(key)) {
DrawerLayout drawer = view.findViewById(R.id.drawer_layout); DrawerLayout drawerLayout = mTermuxTerminalViewClient.getActivity().getDrawer();
drawer.openDrawer(Gravity.LEFT); if (drawerLayout.isDrawerOpen(Gravity.LEFT))
drawerLayout.closeDrawer(Gravity.LEFT);
else
drawerLayout.openDrawer(Gravity.LEFT);
} else if ("PASTE".equals(key)) { } else if ("PASTE".equals(key)) {
if(mTermuxTerminalSessionClient != null) if(mTermuxTerminalSessionClient != null)
mTermuxTerminalSessionClient.onPasteTextFromClipboard(null); mTermuxTerminalSessionClient.onPasteTextFromClipboard(null);