bug fix, layout fix

app/src/main/java/org/nuclearfog/twidda/ui/activities/UsersActivity.java

@@ -96,7 +96,7 @@ public class UsersActivity extends AppCompatActivity implements OnTabSelectedLis
 	/**
 	 * regex pattern to validate username
 	 */
-	private static final Pattern USERNAME_PATTERN = Pattern.compile("@?\\w{1,15}");
+	private static final Pattern USERNAME_PATTERN = Pattern.compile("@?\\w+(@\\w+\\.\\w+)?");
 
 	private GlobalSettings settings;
 	private UserFilterLoader filterLoader;
@@ -284,11 +284,7 @@ public class UsersActivity extends AppCompatActivity implements OnTabSelectedLis
 			Toast.makeText(getApplicationContext(), R.string.error_username_format, Toast.LENGTH_SHORT).show();
 		} else if (viewPager.getCurrentItem() == 2) {
 			if (Patterns.WEB_URL.matcher(query).matches()) {
-				FilterParam param;
+				FilterParam param = new FilterParam(FilterParam.BLOCK_DOMAIN, Uri.parse(query).getHost());
-				if (query.startsWith("https://"))
-					param = new FilterParam(FilterParam.BLOCK_DOMAIN, Uri.parse(query).getHost());
-				else
-					param = new FilterParam(FilterParam.BLOCK_DOMAIN, query);
 				filterLoader.execute(param, this);
 				return true;
 			}

app/src/main/java/org/nuclearfog/twidda/ui/dialogs/StatusPreferenceDialog.java

@@ -12,6 +12,7 @@ import android.widget.Button;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.Spinner;
+import android.widget.TextView;
 
 import com.kyleduo.switchbutton.SwitchButton;
 
@@ -22,6 +23,7 @@ import org.nuclearfog.twidda.config.GlobalSettings;
 import org.nuclearfog.twidda.model.Status;
 import org.nuclearfog.twidda.ui.adapter.listview.DropdownAdapter;
 
+import java.util.Date;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TreeMap;
@@ -35,6 +37,7 @@ public class StatusPreferenceDialog extends Dialog implements OnCheckedChangeLis
 
 	private Spinner visibilitySelector, languageSelector;
 	private SwitchButton sensitiveCheck, spoilerCheck;
+	private TextView scheduleText;
 
 	private DropdownAdapter visibility_adapter, language_adapter;
 	private TimePickerDialog timePicker;
@@ -79,6 +82,7 @@ public class StatusPreferenceDialog extends Dialog implements OnCheckedChangeLis
 		visibilitySelector = findViewById(R.id.dialog_status_visibility);
 		sensitiveCheck = findViewById(R.id.dialog_status_sensitive);
 		spoilerCheck = findViewById(R.id.dialog_status_spoiler);
+		scheduleText = findViewById(R.id.dialog_status_time_set);
 
 		AppStyles.setTheme(rootView, settings.getPopupColor());
 		languageSelector.setAdapter(language_adapter);
@@ -201,5 +205,10 @@ public class StatusPreferenceDialog extends Dialog implements OnCheckedChangeLis
 	@Override
 	public void onTimeSelected(long time) {
 		statusUpdate.setScheduleTime(time);
+		if (time != 0L) {
+			scheduleText.setText(new Date(time).toString());
+		} else {
+			scheduleText.setText("");
+		}
 	}
 }

app/src/main/java/org/nuclearfog/twidda/ui/views/LockableConstraintLayout.java

@@ -63,6 +63,7 @@ public class LockableConstraintLayout extends ConstraintLayout {
 			case MotionEvent.ACTION_CANCEL:
 			case MotionEvent.ACTION_UP:
 				xLock = false;
+				yLock = false;
 				break;
 		}
 		return yLock;

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

@@ -130,6 +130,7 @@
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
 			android:lines="1"
+			android:textSize="@dimen/dialog_status_textsize_default"
 			android:layout_marginStart="@dimen/dialog_status_layout_margins"
 			android:layout_marginEnd="@dimen/dialog_status_layout_margins" />
 

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

@@ -40,6 +40,7 @@
 			android:text="@android:string/cancel"
 			android:layout_margin="@dimen/dialog_timepicker_layout_margins"
 			android:padding="@dimen/dialog_timepicker_button_padding"
+			android:lines="1"
 			style="@style/FeedbackButton" />
 
 		<Button
@@ -49,6 +50,7 @@
 			android:text="@android:string/ok"
 			android:layout_margin="@dimen/dialog_timepicker_layout_margins"
 			android:padding="@dimen/dialog_timepicker_button_padding"
+			android:lines="1"
 			style="@style/FeedbackButton" />
 
 	</LinearLayout>

app/src/main/res/values/dimens.xml

@@ -274,6 +274,7 @@
 	<!--dimens of dialog_status.xml-->
 	<dimen name="dialog_status_textsize_title">20sp</dimen>
 	<dimen name="dialog_status_textsize_small">11sp</dimen>
+	<dimen name="dialog_status_textsize_default">13sp</dimen>
 	<dimen name="dialog_status_layout_padding">10dp</dimen>
 	<dimen name="dialog_status_layout_margins">5dp</dimen>
 	<dimen name="dialog_status_dropdown_height">28sp</dimen>