Skip to content

Commit 13ce151

Browse files
committed
remove old ok-button in ListPicker, fix margin
Signed-off-by: Aron Heinecke <aron.heinecke@t-online.de>
1 parent 41eb549 commit 13ce151

File tree

2 files changed

+1
-28
lines changed

2 files changed

+1
-28
lines changed

app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/fragment/ListPickerFragment.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import android.view.MenuItem;
2020
import android.view.View;
2121
import android.view.ViewGroup;
22-
import android.widget.Button;
2322

2423
import java.util.ArrayList;
2524

@@ -54,7 +53,6 @@ public class ListPickerFragment extends PagerFragment implements ListRecyclerAda
5453
private RecyclerView recyclerView;
5554
private ListRecyclerAdapter adapter;
5655
private boolean delete;
57-
private Button bOk;
5856
private int sort_type;
5957
private GenTableComparator compName;
6058
private GenTableComparator compA;
@@ -227,15 +225,11 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
227225
GenTableComparator.retA, GenTableComparator.retName}
228226
,ID_RESERVED_SKIP);
229227

230-
bOk = view.findViewById(R.id.btnOkSelect);
231-
bOk.setVisibility(showOkButton && multiSelect ? View.VISIBLE : View.GONE);
232-
233228
SharedPreferences settings = getActivity().getSharedPreferences(PREFS_NAME, 0);
234229
sort_type = settings.getInt(P_KEY_LA_SORT, R.id.lMenu_sort_Name);
235230
updateComp();
236231

237232
initRecyclerView();
238-
updateOkButton();
239233
return view;
240234
}
241235

@@ -338,13 +332,6 @@ private void initRecyclerView() {
338332
}
339333
}
340334

341-
/**
342-
* Update enabled state of OK button
343-
*/
344-
private void updateOkButton() {
345-
bOk.setEnabled(listPickerViewModel.getSelectedLists().size() > 0);
346-
}
347-
348335
@Override
349336
public void onStop() {
350337
super.onStop();

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

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,9 @@
1010
android:id="@+id/listViewRecyclerView"
1111
android:layout_width="0dp"
1212
android:layout_height="0dp"
13-
android:layout_marginTop="8dp"
14-
android:layout_marginBottom="8dp"
15-
app:layout_constraintBottom_toTopOf="@+id/btnOkSelect"
13+
app:layout_constraintBottom_toBottomOf="parent"
1614
app:layout_constraintEnd_toEndOf="parent"
1715
app:layout_constraintStart_toStartOf="parent"
1816
app:layout_constraintTop_toTopOf="parent" />
1917

20-
<Button
21-
android:id="@+id/btnOkSelect"
22-
android:layout_width="0dp"
23-
android:layout_height="wrap_content"
24-
android:layout_marginBottom="8dp"
25-
android:layout_marginEnd="8dp"
26-
android:layout_marginStart="8dp"
27-
android:text="@string/GEN_OK"
28-
android:visibility="visible"
29-
app:layout_constraintBottom_toBottomOf="parent"
30-
app:layout_constraintEnd_toEndOf="parent"
31-
app:layout_constraintStart_toStartOf="parent" />
3218
</android.support.constraint.ConstraintLayout>

0 commit comments

Comments
 (0)