Skip to content

Commit 4eced52

Browse files
Fix xml files naming convention
1 parent b856e16 commit 4eced52

13 files changed

+9
-9
lines changed

app/src/main/java/com/termux/app/TermuxActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public void onCreate(Bundle savedInstanceState) {
163163

164164
super.onCreate(savedInstanceState);
165165

166-
setContentView(R.layout.termux_activity);
166+
setContentView(R.layout.activity_termux);
167167

168168
View content = findViewById(android.R.id.content);
169169
content.setOnApplyWindowInsetsListener((v, insets) -> {

app/src/main/java/com/termux/app/activities/SettingsActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class SettingsActivity extends AppCompatActivity {
1313
@Override
1414
protected void onCreate(Bundle savedInstanceState) {
1515
super.onCreate(savedInstanceState);
16-
setContentView(R.layout.settings_activity);
16+
setContentView(R.layout.activity_settings);
1717
if (savedInstanceState == null) {
1818
getSupportFragmentManager()
1919
.beginTransaction()

app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class TermuxSessionsListViewController extends ArrayAdapter<TerminalSessi
3232
final StyleSpan italicSpan = new StyleSpan(Typeface.ITALIC);
3333

3434
public TermuxSessionsListViewController(TermuxActivity activity, List<TerminalSession> sessionList) {
35-
super(activity.getApplicationContext(), R.layout.terminal_sessions_list_item, sessionList);
35+
super(activity.getApplicationContext(), R.layout.item_terminal_sessions_list, sessionList);
3636
this.mActivity = activity;
3737
}
3838

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

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

5959
if (isUsingBlackUI) {
6060
sessionTitleView.setBackground(
61-
ContextCompat.getDrawable(mActivity, R.drawable.selected_session_background_black)
61+
ContextCompat.getDrawable(mActivity, R.drawable.session_background_black_selected)
6262
);
6363
}
6464

app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public Object instantiateItem(@NonNull ViewGroup collection, int position) {
4242
LayoutInflater inflater = LayoutInflater.from(mActivity);
4343
View layout;
4444
if (position == 0) {
45-
layout = inflater.inflate(R.layout.terminal_toolbar_extra_keys_view, collection, false);
45+
layout = inflater.inflate(R.layout.view_terminal_toolbar_extra_keys, collection, false);
4646
ExtraKeysView extraKeysView = (ExtraKeysView) layout;
4747
mActivity.setExtraKeysView(extraKeysView);
4848
extraKeysView.reload(mActivity.getProperties().getExtraKeysInfo());
@@ -53,7 +53,7 @@ public Object instantiateItem(@NonNull ViewGroup collection, int position) {
5353
}
5454

5555
} else {
56-
layout = inflater.inflate(R.layout.terminal_toolbar_text_input_view, collection, false);
56+
layout = inflater.inflate(R.layout.view_terminal_toolbar_text_input, collection, false);
5757
final EditText editText = layout.findViewById(R.id.terminal_toolbar_text_input);
5858

5959
if(mSavedTextInput != null) {

app/src/main/res/layout/activity_report.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
android:orientation="vertical">
66

77
<include
8-
layout="@layout/toolbar_layout"
8+
layout="@layout/partial_toolbar"
99
android:id="@+id/toolbar_layout"/>
1010

1111
<androidx.recyclerview.widget.RecyclerView

app/src/main/res/layout/terminal_sessions_list_item.xml renamed to app/src/main/res/layout/item_terminal_sessions_list.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
android:id="@+id/session_title"
33
android:layout_width="fill_parent"
44
android:layout_height="?android:attr/listPreferredItemHeight"
5-
android:background="@drawable/selected_session_background"
5+
android:background="@drawable/session_background_selected"
66
android:ellipsize="marquee"
77
android:gravity="start|center_vertical"
88
android:padding="6dip"

0 commit comments

Comments
 (0)