Skip to content

Commit f0c6e30

Browse files
YtvwlDYtvwlD
committed
Remove code specific to pre-Holo versions of Android
1 parent 67a7883 commit f0c6e30

File tree

7 files changed

+16
-150
lines changed

7 files changed

+16
-150
lines changed

‎meteroid/src/main/java/de/chaosdorf/meteroid/About.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,10 @@ protected void onCreate(final Bundle savedInstanceState)
6666
catch(NameNotFoundException ignored) {}
6767
binding.setVersionName(versionName);
6868

69-
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
69+
ActionBar actionBar = getActionBar();
70+
if(actionBar != null)
7071
{
71-
ActionBar actionBar = getActionBar();
72-
if(actionBar != null)
73-
{
74-
actionBar.setDisplayHomeAsUpEnabled(true);
75-
}
72+
actionBar.setDisplayHomeAsUpEnabled(true);
7673
}
7774

7875
binding.appIcon.setOnLongClickListener(new View.OnLongClickListener()

‎meteroid/src/main/java/de/chaosdorf/meteroid/BuyDrink.java

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -101,47 +101,8 @@ protected void onCreate(final Bundle savedInstanceState)
101101

102102
barcodeIntegrator = new IntentIntegrator(this);
103103

104-
binding.buttonBack.setOnClickListener(new View.OnClickListener()
105-
{
106-
public void onClick(View view)
107-
{
108-
pickUsername();
109-
}
110-
});
111-
112-
binding.buttonReload.setOnClickListener(new View.OnClickListener()
113-
{
114-
public void onClick(View view)
115-
{
116-
reload();
117-
}
118-
});
119-
120-
binding.buttonEdit.setOnClickListener(new View.OnClickListener()
121-
{
122-
public void onClick(View view)
123-
{
124-
Utility.startActivity(activity, UserSettings.class);
125-
}
126-
});
127-
128-
binding.buttonBarcode.setOnClickListener(new View.OnClickListener()
129-
{
130-
public void onClick(View view)
131-
{
132-
scanBarcode();
133-
}
134-
});
135-
136-
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
137-
{
138-
ActionBar actionBar = getActionBar();
139-
actionBar.setDisplayHomeAsUpEnabled(true);
140-
binding.buttonReload.setVisibility(View.GONE);
141-
binding.buttonBack.setVisibility(View.GONE);
142-
binding.buttonEdit.setVisibility(View.GONE);
143-
binding.buttonBarcode.setVisibility(View.GONE);
144-
}
104+
ActionBar actionBar = getActionBar();
105+
actionBar.setDisplayHomeAsUpEnabled(true);
145106

146107
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
147108
{

‎meteroid/src/main/java/de/chaosdorf/meteroid/PickUsername.java

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -71,29 +71,8 @@ protected void onCreate(final Bundle savedInstanceState)
7171
super.onCreate(savedInstanceState);
7272
binding = DataBindingUtil.setContentView(this, R.layout.activity_pick_username);
7373

74-
binding.buttonBack.setOnClickListener(new View.OnClickListener()
75-
{
76-
public void onClick(View view)
77-
{
78-
Utility.startActivity(activity, SetHostname.class);
79-
}
80-
});
81-
82-
binding.buttonReload.setOnClickListener(new View.OnClickListener()
83-
{
84-
public void onClick(View view)
85-
{
86-
reload();
87-
}
88-
});
89-
90-
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
91-
{
92-
ActionBar actionBar = getActionBar();
93-
actionBar.setDisplayHomeAsUpEnabled(true);
94-
binding.buttonReload.setVisibility(View.GONE);
95-
binding.buttonBack.setVisibility(View.GONE);
96-
}
74+
ActionBar actionBar = getActionBar();
75+
actionBar.setDisplayHomeAsUpEnabled(true);
9776

9877
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
9978
{
@@ -211,10 +190,6 @@ public void processIOResult(final LongRunningIOTask task, final List<User> resul
211190
{
212191
final List<User> itemList = result;
213192
editHostnameOnBackButton = false;
214-
if(Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB)
215-
{
216-
itemList.add(new User(config.NO_USER_ID, getResources().getString(R.string.pick_username_new_user), "", 0, true, false, true));
217-
}
218193
final UserAdapter userAdapter = new UserAdapter(itemList);
219194

220195
binding.gridView.setAdapter(userAdapter);

‎meteroid/src/main/java/de/chaosdorf/meteroid/SetHostname.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,10 @@ public void onClick(View view)
8080
}
8181
});
8282

83-
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
83+
ActionBar actionBar = getActionBar();
84+
if(actionBar != null)
8485
{
85-
ActionBar actionBar = getActionBar();
86-
if(actionBar != null)
87-
{
88-
binding.buttonSave.setVisibility(View.GONE);
89-
}
86+
binding.buttonSave.setVisibility(View.GONE);
9087
}
9188
}
9289

‎meteroid/src/main/java/de/chaosdorf/meteroid/UserSettings.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,13 @@ public void onClick(View view)
9393
}
9494
});
9595

96-
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
96+
ActionBar actionBar = getActionBar();
97+
if(actionBar != null)
9798
{
98-
ActionBar actionBar = getActionBar();
99-
if(actionBar != null)
100-
{
101-
actionBar.setDisplayHomeAsUpEnabled(true);
102-
binding.buttonBack.setVisibility(View.GONE);
103-
binding.buttonDelete.setVisibility(View.GONE);
104-
binding.buttonSave.setVisibility(View.GONE);
105-
}
99+
actionBar.setDisplayHomeAsUpEnabled(true);
100+
binding.buttonBack.setVisibility(View.GONE);
101+
binding.buttonDelete.setVisibility(View.GONE);
102+
binding.buttonSave.setVisibility(View.GONE);
106103
}
107104

108105
makeReadOnly();

‎meteroid/src/main/res/layout/activity_buy_drink.xml

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -62,43 +62,6 @@
6262
android:orientation="vertical"
6363
android:layout_width="fill_parent"
6464
android:layout_height="fill_parent">
65-
66-
<!-- Buttons for old Android versions -->
67-
<LinearLayout
68-
android:orientation="horizontal"
69-
android:layout_width="wrap_content"
70-
android:layout_height="wrap_content"
71-
android:layout_gravity="right">
72-
73-
<ImageButton
74-
android:id="@+id/button_back"
75-
android:layout_width="50dp"
76-
android:layout_height="50dp"
77-
android:src="@drawable/button_back"
78-
android:contentDescription="@string/button_back"/>
79-
80-
<ImageButton
81-
android:id="@+id/button_barcode"
82-
android:layout_width="50dp"
83-
android:layout_height="50dp"
84-
android:src="@drawable/button_barcode"
85-
android:contentDescription="@string/button_barcode"/>
86-
87-
<ImageButton
88-
android:id="@+id/button_reload"
89-
android:layout_width="50dp"
90-
android:layout_height="50dp"
91-
android:src="@drawable/button_reload"
92-
android:contentDescription="@string/button_reload"/>
93-
94-
<ImageButton
95-
android:id="@+id/button_edit"
96-
android:layout_width="50dp"
97-
android:layout_height="50dp"
98-
android:src="@android:drawable/ic_menu_edit"
99-
android:contentDescription="@string/buy_drink_edit_user"/>
100-
101-
</LinearLayout>
10265

10366
<!-- Display user data -->
10467
<LinearLayout

‎meteroid/src/main/res/layout/activity_pick_username.xml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -50,30 +50,6 @@
5050
android:layout_height="wrap_content"
5151
android:textSize="16sp"
5252
android:text="@string/pick_username_error"/>
53-
54-
<LinearLayout
55-
android:layout_height="wrap_content"
56-
android:layout_width="wrap_content"
57-
android:orientation="horizontal"
58-
android:layout_gravity="end">
59-
60-
<ImageButton
61-
android:id="@+id/button_back"
62-
android:layout_width="wrap_content"
63-
android:layout_height="wrap_content"
64-
android:layout_gravity="right"
65-
android:src="@drawable/button_back"
66-
android:contentDescription="@string/button_back"/>
67-
68-
<ImageButton
69-
android:id="@+id/button_reload"
70-
android:layout_width="wrap_content"
71-
android:layout_height="wrap_content"
72-
android:layout_gravity="right"
73-
android:src="@drawable/button_reload"
74-
android:contentDescription="@string/button_reload"/>
75-
76-
</LinearLayout>
7753
</LinearLayout>
7854

7955
<ProgressBar

0 commit comments

Comments
 (0)