bug fix, layout fix
This commit is contained in:
parent
6d6c60c03d
commit
c48ddf6e66
|
@ -60,11 +60,12 @@ public class LinkUtils {
|
|||
url = "https://nitter.net" + Uri.parse(url).getPath();
|
||||
}
|
||||
final Uri link = Uri.parse(url);
|
||||
if (settings.isProxyWarningEnabled()) {
|
||||
// warn when trying to open a link externally with proxy enabled
|
||||
if (settings.isProxyEnabled() && settings.isProxyWarningEnabled()) {
|
||||
ConfirmDialog dialog = new ConfirmDialog(activity, new ConfirmDialog.OnConfirmListener() {
|
||||
@Override
|
||||
public void onConfirm(int type, boolean remember) {
|
||||
settings.setProxyWarning(remember);
|
||||
settings.setProxyWarning(!remember);
|
||||
redirectToBrowser(activity, link);
|
||||
}
|
||||
});
|
||||
|
|
|
@ -30,6 +30,7 @@ public enum Configuration {
|
|||
private final String name;
|
||||
private final int accountType;
|
||||
private final boolean userlistExtended;
|
||||
private final boolean userlistDescriptionEnabled;
|
||||
private final boolean searchFilterEnabled;
|
||||
private final boolean profileLocationEnabled;
|
||||
private final boolean profileUrlEnabled;
|
||||
|
@ -62,6 +63,7 @@ public enum Configuration {
|
|||
idBlocklistEnabled = true;
|
||||
postLocationSupported = true;
|
||||
userlistVisibility = true;
|
||||
userlistDescriptionEnabled = true;
|
||||
notificationDismissSupported = false;
|
||||
statusSpoilerSupported = false;
|
||||
statusVisibilitySupported = false;
|
||||
|
@ -77,6 +79,7 @@ public enum Configuration {
|
|||
case Account.API_MASTODON:
|
||||
name = "Mastodon";
|
||||
userlistExtended = false;
|
||||
userlistDescriptionEnabled = false;
|
||||
searchFilterEnabled = false;
|
||||
profileLocationEnabled = false;
|
||||
profileUrlEnabled = false;
|
||||
|
@ -113,10 +116,17 @@ public enum Configuration {
|
|||
/**
|
||||
* @return true to show extra userlist information
|
||||
*/
|
||||
public boolean showListExtras() {
|
||||
public boolean showUserlistsExtras() {
|
||||
return userlistExtended;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return true if userlist description is supported
|
||||
*/
|
||||
public boolean userlsitDescriptionSupported() {
|
||||
return userlistDescriptionEnabled;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return true if userlist visibility is supported
|
||||
*/
|
||||
|
|
|
@ -823,7 +823,9 @@ public class GlobalSettings {
|
|||
edit.putString(PROXY_PASS, proxyPass);
|
||||
edit.apply();
|
||||
|
||||
setProxyWarning(true);
|
||||
if (!proxyWarning) {
|
||||
setProxyWarning(true);
|
||||
}
|
||||
notifySettingsChange();
|
||||
}
|
||||
|
||||
|
|
|
@ -124,6 +124,7 @@ public class MainActivity extends AppCompatActivity implements ActivityResultCal
|
|||
loadingCircle = new ProgressDialog(this, null);
|
||||
settings = GlobalSettings.get(this);
|
||||
picasso = PicassoBuilder.get(this);
|
||||
|
||||
tabSelector.addViewPager(viewPager);
|
||||
viewPager.setOffscreenPageLimit(4);
|
||||
if (navigationView.getLayoutParams() != null) {
|
||||
|
@ -135,6 +136,17 @@ public class MainActivity extends AppCompatActivity implements ActivityResultCal
|
|||
if (!settings.getLogin().getConfiguration().isFilterSupported()) {
|
||||
navigationView.getMenu().findItem(R.id.menu_navigator_filter).setVisible(false);
|
||||
}
|
||||
toolbar.setTitle("");
|
||||
toolbar.setNavigationIcon(R.drawable.menu);
|
||||
setSupportActionBar(toolbar);
|
||||
AppStyles.setTheme(header);
|
||||
|
||||
navigationView.post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
AppStyles.setTheme(navigationView);
|
||||
}
|
||||
});
|
||||
if (savedInstanceState != null) {
|
||||
Serializable data = savedInstanceState.getSerializable(KEY_USER_SAVE);
|
||||
if (data instanceof User) {
|
||||
|
@ -143,17 +155,6 @@ public class MainActivity extends AppCompatActivity implements ActivityResultCal
|
|||
}
|
||||
}
|
||||
|
||||
toolbar.setTitle("");
|
||||
toolbar.setNavigationIcon(R.drawable.menu);
|
||||
setSupportActionBar(toolbar);
|
||||
AppStyles.setTheme(header);
|
||||
navigationView.post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
AppStyles.setTheme(navigationView);
|
||||
}
|
||||
});
|
||||
|
||||
toolbar.setNavigationOnClickListener(new OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
|
|
|
@ -114,6 +114,9 @@ public class UserlistEditor extends AppCompatActivity implements OnClickListener
|
|||
visibilitySwitch.setVisibility(View.INVISIBLE);
|
||||
visibilityLabel.setVisibility(View.INVISIBLE);
|
||||
}
|
||||
if (!settings.getLogin().getConfiguration().userlsitDescriptionSupported()) {
|
||||
descriptionText.setVisibility(View.GONE);
|
||||
}
|
||||
updateButton.setOnClickListener(this);
|
||||
visibilitySwitch.setOnCheckedChangeListener(this);
|
||||
}
|
||||
|
|
|
@ -91,7 +91,7 @@ public class UserlistHolder extends ViewHolder implements OnClickListener {
|
|||
followList = itemView.findViewById(R.id.item_list_following_indicator);
|
||||
placeholder = new ColorDrawable(EMPTY_COLOR);
|
||||
|
||||
enableExtras = settings.getLogin().getConfiguration().showListExtras();
|
||||
enableExtras = settings.getLogin().getConfiguration().showUserlistsExtras();
|
||||
enableImages = settings.imagesEnabled();
|
||||
|
||||
if (!enableExtras) {
|
||||
|
|
|
@ -293,6 +293,7 @@ public class ConfirmDialog extends Dialog implements OnClickListener {
|
|||
break;
|
||||
|
||||
case CONTINUE_BROWSER:
|
||||
titleVis = View.VISIBLE;
|
||||
remember_label.setVisibility(View.VISIBLE);
|
||||
remember.setVisibility(View.VISIBLE);
|
||||
titleRes = R.string.confirm_warning;
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:visibility="gone"
|
||||
android:layout_marginStart="@dimen/confirm_button_margin"
|
||||
android:layout_margin="@dimen/confirm_button_margin"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/confirm_message" />
|
||||
|
||||
|
@ -50,6 +50,7 @@
|
|||
android:visibility="gone"
|
||||
android:lines="1"
|
||||
android:text="@string/confirm_remember"
|
||||
android:textSize="@dimen/confirm_button_fontsize"
|
||||
android:layout_marginStart="@dimen/confirm_text_margin"
|
||||
android:layout_marginEnd="@dimen/confirm_text_margin"
|
||||
app:layout_constraintStart_toEndOf="@id/confirm_remember"
|
||||
|
|
|
@ -49,7 +49,6 @@
|
|||
android:lines="1"
|
||||
app:layout_constraintStart_toStartOf="@id/userlist_popup_background"
|
||||
app:layout_constraintTop_toBottomOf="@id/popup_list_title"
|
||||
app:layout_constraintBottom_toTopOf="@id/list_edit_descr"
|
||||
app:layout_constraintEnd_toEndOf="@id/userlist_popup_background" />
|
||||
|
||||
<EditText
|
||||
|
@ -80,7 +79,6 @@
|
|||
android:layout_marginBottom="@dimen/popup_userlist_background_margin"
|
||||
android:layout_marginEnd="@dimen/popup_userlist_layout_margin"
|
||||
app:layout_constraintStart_toStartOf="@id/userlist_popup_background"
|
||||
app:layout_constraintTop_toBottomOf="@id/list_edit_descr"
|
||||
app:layout_constraintBottom_toBottomOf="@id/userlist_popup_background"
|
||||
app:layout_constraintEnd_toStartOf="@id/userlist_switch_text" />
|
||||
|
||||
|
|
Loading…
Reference in New Issue