Mastodon
/
Shitter-android-app
mirror of https://github.com/nuclearfog/Shitter.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug fix, layout fix

This commit is contained in:
nuclearfog 2023-07-31 19:57:18 +02:00
parent 6d6c60c03d
commit c48ddf6e66
No known key found for this signature in database
GPG Key ID: 03488A185C476379
9 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/nuclearfog/twidda/backend/utils/LinkUtils.java
View File

@ -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);
}
});

12
app/src/main/java/org/nuclearfog/twidda/config/Configuration.java
View File

@ -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
*/

4
app/src/main/java/org/nuclearfog/twidda/config/GlobalSettings.java
View File

@ -823,7 +823,9 @@ public class GlobalSettings {
edit.putString(PROXY_PASS, proxyPass);
edit.apply();
setProxyWarning(true);
if (!proxyWarning) {
setProxyWarning(true);
}
notifySettingsChange();
}

23
app/src/main/java/org/nuclearfog/twidda/ui/activities/MainActivity.java
View File

@ -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) {

3
app/src/main/java/org/nuclearfog/twidda/ui/activities/UserlistEditor.java
View File

@ -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);
}

2
app/src/main/java/org/nuclearfog/twidda/ui/adapter/recyclerview/holder/UserlistHolder.java
View File

@ -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) {

1
app/src/main/java/org/nuclearfog/twidda/ui/dialogs/ConfirmDialog.java
View File

@ -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;

3
app/src/main/res/layout/dialog_confirm.xml
View File

@ -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"

2
app/src/main/res/layout/popup_userlist.xml
View File

@ -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" />