Skip to content

Commit

Permalink
Fix xml files naming convention
Browse files Browse the repository at this point in the history
  • Loading branch information
agnostic-apollo committed Mar 24, 2021
1 parent b856e16 commit 4eced52
Show file tree
Hide file tree
Showing 13 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion app/src/main/java/com/termux/app/TermuxActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public void onCreate(Bundle savedInstanceState) {

super.onCreate(savedInstanceState);

setContentView(R.layout.termux_activity);
setContentView(R.layout.activity_termux);

View content = findViewById(android.R.id.content);
content.setOnApplyWindowInsetsListener((v, insets) -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class SettingsActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.settings_activity);
setContentView(R.layout.activity_settings);
if (savedInstanceState == null) {
getSupportFragmentManager()
.beginTransaction()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class TermuxSessionsListViewController extends ArrayAdapter<TerminalSessi
final StyleSpan italicSpan = new StyleSpan(Typeface.ITALIC);

public TermuxSessionsListViewController(TermuxActivity activity, List<TerminalSession> sessionList) {
super(activity.getApplicationContext(), R.layout.terminal_sessions_list_item, sessionList);
super(activity.getApplicationContext(), R.layout.item_terminal_sessions_list, sessionList);
this.mActivity = activity;
}

Expand All @@ -43,7 +43,7 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) {
View sessionRowView = convertView;
if (sessionRowView == null) {
LayoutInflater inflater = mActivity.getLayoutInflater();
sessionRowView = inflater.inflate(R.layout.terminal_sessions_list_item, parent, false);
sessionRowView = inflater.inflate(R.layout.item_terminal_sessions_list, parent, false);
}

TextView sessionTitleView = sessionRowView.findViewById(R.id.session_title);
Expand All @@ -58,7 +58,7 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) {

if (isUsingBlackUI) {
sessionTitleView.setBackground(
ContextCompat.getDrawable(mActivity, R.drawable.selected_session_background_black)
ContextCompat.getDrawable(mActivity, R.drawable.session_background_black_selected)
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public Object instantiateItem(@NonNull ViewGroup collection, int position) {
LayoutInflater inflater = LayoutInflater.from(mActivity);
View layout;
if (position == 0) {
layout = inflater.inflate(R.layout.terminal_toolbar_extra_keys_view, collection, false);
layout = inflater.inflate(R.layout.view_terminal_toolbar_extra_keys, collection, false);
ExtraKeysView extraKeysView = (ExtraKeysView) layout;
mActivity.setExtraKeysView(extraKeysView);
extraKeysView.reload(mActivity.getProperties().getExtraKeysInfo());
Expand All @@ -53,7 +53,7 @@ public Object instantiateItem(@NonNull ViewGroup collection, int position) {
}

} else {
layout = inflater.inflate(R.layout.terminal_toolbar_text_input_view, collection, false);
layout = inflater.inflate(R.layout.view_terminal_toolbar_text_input, collection, false);
final EditText editText = layout.findViewById(R.id.terminal_toolbar_text_input);

if(mSavedTextInput != null) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_report.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
android:orientation="vertical">

<include
layout="@layout/toolbar_layout"
layout="@layout/partial_toolbar"
android:id="@+id/toolbar_layout"/>

<androidx.recyclerview.widget.RecyclerView
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
android:id="@+id/session_title"
android:layout_width="fill_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:background="@drawable/selected_session_background"
android:background="@drawable/session_background_selected"
android:ellipsize="marquee"
android:gravity="start|center_vertical"
android:padding="6dip"
Expand Down
File renamed without changes.

0 comments on commit 4eced52

Please sign in to comment.