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

Remove some Android Studio warnings

Browse Source
This commit is contained in:
Fredrik Fornwall
2017-11-22 01:27:14 +01:00
parent 02af113dda
commit a4e4f76775
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/java/com/termux/app/TermuxActivity.java
View File

@@ -211,14 +211,14 @@ public final class TermuxActivity extends Activity implements ServiceConnection
mSettings = new TermuxPreferences(this); mSettings = new TermuxPreferences(this);
setContentView(R.layout.drawer_layout); setContentView(R.layout.drawer_layout);
mTerminalView = (TerminalView) findViewById(R.id.terminal_view); mTerminalView = findViewById(R.id.terminal_view);
mTerminalView.setOnKeyListener(new TermuxViewClient(this)); mTerminalView.setOnKeyListener(new TermuxViewClient(this));
mTerminalView.setTextSize(mSettings.getFontSize()); mTerminalView.setTextSize(mSettings.getFontSize());
mFullScreenHelper.setImmersive(mSettings.isFullScreen()); mFullScreenHelper.setImmersive(mSettings.isFullScreen());
mTerminalView.requestFocus(); mTerminalView.requestFocus();
final ViewPager viewPager = (ViewPager) findViewById(R.id.viewpager); final ViewPager viewPager = findViewById(R.id.viewpager);
if (mSettings.isShowExtraKeys()) viewPager.setVisibility(View.VISIBLE); if (mSettings.isShowExtraKeys()) viewPager.setVisibility(View.VISIBLE);
viewPager.setAdapter(new PagerAdapter() { viewPager.setAdapter(new PagerAdapter() {
@@ -228,19 +228,20 @@ public final class TermuxActivity extends Activity implements ServiceConnection
} }
@Override @Override
public boolean isViewFromObject(View view, Object object) { public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
return view == object; return view == object;
} }
@NonNull
@Override @Override
public Object instantiateItem(ViewGroup collection, int position) { public Object instantiateItem(@NonNull ViewGroup collection, int position) {
LayoutInflater inflater = LayoutInflater.from(TermuxActivity.this); LayoutInflater inflater = LayoutInflater.from(TermuxActivity.this);
View layout; View layout;
if (position == 0) { if (position == 0) {
layout = mExtraKeysView = (ExtraKeysView) inflater.inflate(R.layout.extra_keys_main, collection, false); layout = mExtraKeysView = (ExtraKeysView) inflater.inflate(R.layout.extra_keys_main, collection, false);
} else { } else {
layout = inflater.inflate(R.layout.extra_keys_right, collection, false); layout = inflater.inflate(R.layout.extra_keys_right, collection, false);
final EditText editText = (EditText) layout.findViewById(R.id.text_input); final EditText editText = layout.findViewById(R.id.text_input);
editText.setOnEditorActionListener(new TextView.OnEditorActionListener() { editText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override @Override
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
@@ -264,7 +265,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
} }
@Override @Override
public void destroyItem(ViewGroup collection, int position, Object view) { public void destroyItem(@NonNull ViewGroup collection, int position, @NonNull Object view) {
collection.removeView((View) view); collection.removeView((View) view);
} }
}); });
@@ -275,7 +276,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
if (position == 0) { if (position == 0) {
mTerminalView.requestFocus(); mTerminalView.requestFocus();
} else { } else {
final EditText editText = (EditText) viewPager.findViewById(R.id.text_input); final EditText editText = viewPager.findViewById(R.id.text_input);
if (editText != null) editText.requestFocus(); if (editText != null) editText.requestFocus();
} }
} }
@@ -339,7 +340,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
} }
void toggleShowExtraKeys() { void toggleShowExtraKeys() {
final ViewPager viewPager = (ViewPager) findViewById(R.id.viewpager); final ViewPager viewPager = findViewById(R.id.viewpager);
final boolean showNow = mSettings.toggleShowExtraKeys(TermuxActivity.this); final boolean showNow = mSettings.toggleShowExtraKeys(TermuxActivity.this);
viewPager.setVisibility(showNow ? View.VISIBLE : View.GONE); viewPager.setVisibility(showNow ? View.VISIBLE : View.GONE);
if (showNow && viewPager.getCurrentItem() == 1) { if (showNow && viewPager.getCurrentItem() == 1) {
@@ -424,7 +425,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
} }
}; };
ListView listView = (ListView) findViewById(R.id.left_drawer_list); ListView listView = findViewById(R.id.left_drawer_list);
mListViewAdapter = new ArrayAdapter<TerminalSession>(getApplicationContext(), R.layout.line_in_drawer, mTermService.getSessions()) { mListViewAdapter = new ArrayAdapter<TerminalSession>(getApplicationContext(), R.layout.line_in_drawer, mTermService.getSessions()) {
final StyleSpan boldSpan = new StyleSpan(Typeface.BOLD); final StyleSpan boldSpan = new StyleSpan(Typeface.BOLD);
final StyleSpan italicSpan = new StyleSpan(Typeface.ITALIC); final StyleSpan italicSpan = new StyleSpan(Typeface.ITALIC);
@@ -441,7 +442,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
TerminalSession sessionAtRow = getItem(position); TerminalSession sessionAtRow = getItem(position);
boolean sessionRunning = sessionAtRow.isRunning(); boolean sessionRunning = sessionAtRow.isRunning();
TextView firstLineView = (TextView) row.findViewById(R.id.row_line); TextView firstLineView = row.findViewById(R.id.row_line);
String name = sessionAtRow.mSessionName; String name = sessionAtRow.mSessionName;
String sessionTitle = sessionAtRow.getTitle(); String sessionTitle = sessionAtRow.getTitle();
@@ -537,10 +538,8 @@ public final class TermuxActivity extends Activity implements ServiceConnection
@Override @Override
public void onServiceDisconnected(ComponentName name) { public void onServiceDisconnected(ComponentName name) {
if (mTermService != null) { // Respect being stopped from the TermuxService notification action.
// Respect being stopped from the TermuxService notification action. finish();
finish();
}
} }
@Nullable @Nullable
@@ -643,8 +642,8 @@ public final class TermuxActivity extends Activity implements ServiceConnection
TerminalSession session = getCurrentTermSession(); TerminalSession session = getCurrentTermSession();
final int indexOfSession = mTermService.getSessions().indexOf(session); final int indexOfSession = mTermService.getSessions().indexOf(session);
showToast(toToastTitle(session), false); showToast(toToastTitle(session), false);
mListViewAdapter.notifyDataSetChanged(); mListViewAdapter.notifyDataSetChanged();
final ListView lv = ((ListView) findViewById(R.id.left_drawer_list)); final ListView lv = findViewById(R.id.left_drawer_list);
lv.setItemChecked(indexOfSession, true); lv.setItemChecked(indexOfSession, true);
lv.smoothScrollToPosition(indexOfSession); lv.smoothScrollToPosition(indexOfSession);
} }