Skip to content
This repository was archived by the owner on May 4, 2023. It is now read-only.

Commit c95e84f

Browse files
Fox2CodeFox2Code
committed
Fix some layout problems.
1 parent 5d2a08d commit c95e84f

File tree

2 files changed

+59
-69
lines changed

2 files changed

+59
-69
lines changed

‎app/src/main/java/com/fox2code/mmm/module/ModuleViewAdapter.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import android.view.LayoutInflater;
1010
import android.view.View;
1111
import android.view.ViewGroup;
12+
import android.widget.HorizontalScrollView;
1213
import android.widget.ImageButton;
13-
import android.widget.LinearLayout;
1414
import android.widget.TextView;
1515

1616
import androidx.annotation.ColorInt;
@@ -74,7 +74,7 @@ public static class ViewHolder extends RecyclerView.ViewHolder {
7474
private final TextView titleText;
7575
private final TextView creditText;
7676
private final TextView descriptionText;
77-
private final LinearLayout moduleOptionsHolder;
77+
private final HorizontalScrollView moduleOptionsHolder;
7878
private final TextView updateText;
7979
private final Chip[] actionsButtons;
8080
private final ArrayList<ActionButtonType> actionButtonsTypes;
@@ -274,6 +274,7 @@ public boolean update(ModuleHolder moduleHolder) {
274274
}
275275
this.switchMaterial.setVisibility(View.GONE);
276276
this.creditText.setVisibility(View.GONE);
277+
this.moduleOptionsHolder.setVisibility(View.GONE);
277278
this.descriptionText.setVisibility(View.GONE);
278279
this.updateText.setVisibility(View.GONE);
279280
this.titleText.setText(" ");

‎app/src/main/res/layout/module_entry.xml‎

Lines changed: 56 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -117,80 +117,69 @@
117117
</LinearLayout>
118118

119119
<!-- Buttons -->
120-
<LinearLayout
121-
android:id="@+id/module_options_holder"
120+
<HorizontalScrollView
122121
android:visibility="gone"
122+
android:id="@+id/module_options_holder"
123123
android:layout_width="match_parent"
124-
android:layout_height="wrap_content"
125-
android:layout_margin="8dp"
126-
android:orientation="horizontal">
127-
<HorizontalScrollView
128-
android:id="@+id/horizontalScrollView"
129-
android:layout_width="match_parent"
124+
android:layout_height="wrap_content">
125+
126+
<com.google.android.material.chip.ChipGroup
127+
android:layout_width="wrap_content"
130128
android:layout_height="wrap_content"
131-
app:layout_constraintStart_toStartOf="parent"
132-
app:layout_constraintTop_toTopOf="parent"
133-
tools:ignore="UselessParent">
129+
android:layout_gravity="end"
130+
android:padding="4dp"
131+
app:singleLine="true">
134132

135-
<com.google.android.material.chip.ChipGroup
133+
<com.google.android.material.chip.Chip
134+
android:id="@+id/button_action1"
136135
android:layout_width="wrap_content"
137136
android:layout_height="wrap_content"
138-
android:layout_gravity="end"
139-
android:padding="4dp"
140-
app:singleLine="true">
141-
142-
<com.google.android.material.chip.Chip
143-
android:id="@+id/button_action1"
144-
android:layout_width="wrap_content"
145-
android:layout_height="wrap_content"
146-
android:text="@string/loading"
147-
android:visibility="gone"
148-
app:chipIcon="@drawable/ic_baseline_error_24" />
149-
150-
<com.google.android.material.chip.Chip
151-
android:id="@+id/button_action2"
152-
android:layout_width="wrap_content"
153-
android:layout_height="wrap_content"
154-
android:text="@string/loading"
155-
android:visibility="gone"
156-
app:chipIcon="@drawable/ic_baseline_error_24" />
157-
158-
159-
<com.google.android.material.chip.Chip
160-
android:id="@+id/button_action3"
161-
android:layout_width="wrap_content"
162-
android:layout_height="wrap_content"
163-
android:text="@string/loading"
164-
android:visibility="gone"
165-
app:chipIcon="@drawable/ic_baseline_error_24" />
166-
167-
<com.google.android.material.chip.Chip
168-
android:id="@+id/button_action4"
169-
android:layout_width="wrap_content"
170-
android:layout_height="wrap_content"
171-
android:text="@string/loading"
172-
android:visibility="gone"
173-
app:chipIcon="@drawable/ic_baseline_error_24" />
174-
175-
<com.google.android.material.chip.Chip
176-
android:id="@+id/button_action5"
177-
android:layout_width="wrap_content"
178-
android:layout_height="wrap_content"
179-
android:text="@string/loading"
180-
android:visibility="gone"
181-
app:chipIcon="@drawable/ic_baseline_error_24" />
182-
183-
<com.google.android.material.chip.Chip
184-
android:id="@+id/button_action6"
185-
android:layout_width="wrap_content"
186-
android:layout_height="wrap_content"
187-
android:text="@string/loading"
188-
android:visibility="gone"
189-
app:chipIcon="@drawable/ic_baseline_error_24" />
190-
</com.google.android.material.chip.ChipGroup>
191-
</HorizontalScrollView>
192-
</LinearLayout>
137+
android:text="@string/loading"
138+
android:visibility="gone"
139+
app:chipIcon="@drawable/ic_baseline_error_24" />
193140

141+
<com.google.android.material.chip.Chip
142+
android:id="@+id/button_action2"
143+
android:layout_width="wrap_content"
144+
android:layout_height="wrap_content"
145+
android:text="@string/loading"
146+
android:visibility="gone"
147+
app:chipIcon="@drawable/ic_baseline_error_24" />
148+
149+
150+
<com.google.android.material.chip.Chip
151+
android:id="@+id/button_action3"
152+
android:layout_width="wrap_content"
153+
android:layout_height="wrap_content"
154+
android:text="@string/loading"
155+
android:visibility="gone"
156+
app:chipIcon="@drawable/ic_baseline_error_24" />
157+
158+
<com.google.android.material.chip.Chip
159+
android:id="@+id/button_action4"
160+
android:layout_width="wrap_content"
161+
android:layout_height="wrap_content"
162+
android:text="@string/loading"
163+
android:visibility="gone"
164+
app:chipIcon="@drawable/ic_baseline_error_24" />
165+
166+
<com.google.android.material.chip.Chip
167+
android:id="@+id/button_action5"
168+
android:layout_width="wrap_content"
169+
android:layout_height="wrap_content"
170+
android:text="@string/loading"
171+
android:visibility="gone"
172+
app:chipIcon="@drawable/ic_baseline_error_24" />
173+
174+
<com.google.android.material.chip.Chip
175+
android:id="@+id/button_action6"
176+
android:layout_width="wrap_content"
177+
android:layout_height="wrap_content"
178+
android:text="@string/loading"
179+
android:visibility="gone"
180+
app:chipIcon="@drawable/ic_baseline_error_24" />
181+
</com.google.android.material.chip.ChipGroup>
182+
</HorizontalScrollView>
194183
</LinearLayout>
195184

196185
</com.google.android.material.card.MaterialCardView>

0 commit comments

Comments
 (0)