Fix captcha view not being scrollable when using portrait orientation

dev
k1rakishou 6 years ago
parent 2820d23ff7
commit 055de6c4bd
  1. 3
      Clover/app/src/main/java/org/floens/chan/ui/captcha/v2/CaptchaNoJsLayoutV2.java
  2. 25
      Clover/app/src/main/res/layout/layout_captcha_nojs_v2.xml

@ -32,6 +32,7 @@ import android.util.AttributeSet;
import android.view.View; import android.view.View;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.GridView; import android.widget.GridView;
import android.widget.ScrollView;
import android.widget.Toast; import android.widget.Toast;
import org.floens.chan.R; import org.floens.chan.R;
@ -55,7 +56,7 @@ public class CaptchaNoJsLayoutV2 extends FrameLayout
private AppCompatButton useOldCaptchaButton; private AppCompatButton useOldCaptchaButton;
private AppCompatButton reloadCaptchaButton; private AppCompatButton reloadCaptchaButton;
private ConstraintLayout buttonsHolder; private ConstraintLayout buttonsHolder;
private ConstraintLayout background; private ScrollView background;
private CaptchaNoJsV2Adapter adapter; private CaptchaNoJsV2Adapter adapter;
private CaptchaNoJsPresenterV2 presenter; private CaptchaNoJsPresenterV2 presenter;

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/captcha_layout_v2_background" android:id="@+id/captcha_layout_v2_background"
@ -8,7 +8,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<android.support.v7.widget.AppCompatTextView <android.support.v7.widget.AppCompatTextView
@ -25,18 +25,25 @@
android:textSize="18sp" android:textSize="18sp"
tools:text="Select all images with something" /> tools:text="Select all images with something" />
<org.floens.chan.ui.view.WrappingGridView <android.support.v4.widget.NestedScrollView
android:id="@+id/captcha_layout_v2_images_grid"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:gravity="center"
android:stretchMode="columnWidth" /> <org.floens.chan.ui.view.WrappingGridView
android:id="@+id/captcha_layout_v2_images_grid"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:stretchMode="columnWidth" />
</android.support.v4.widget.NestedScrollView>
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
android:id="@+id/captcha_layout_v2_buttons_holder" android:id="@+id/captcha_layout_v2_buttons_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="64dp" android:layout_height="64dp"
android:background="@color/accent"> android:background="@color/accent"
tools:layout_editor_absoluteY="40dp">
<android.support.v7.widget.AppCompatButton <android.support.v7.widget.AppCompatButton
android:id="@+id/captcha_layout_v2_use_old_captcha_button" android:id="@+id/captcha_layout_v2_use_old_captcha_button"
@ -90,4 +97,4 @@
</LinearLayout> </LinearLayout>
</android.support.constraint.ConstraintLayout> </ScrollView>
Loading…
Cancel
Save