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

dialog bug fix

This commit is contained in:
nuclearfog 2022-01-23 19:39:38 +01:00
parent 3ab6d8f82f
commit af3aa8016f
No known key found for this signature in database
GPG Key ID: AA0271FBE406DB98
7 changed files with 59 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/nuclearfog/twidda/activities/AccountActivity.java
View File

@ -98,7 +98,7 @@ public class AccountActivity extends AppCompatActivity {
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == REQUEST_LOGIN && resultCode == LoginActivity.REQURN_LOGIN_SUCCESSFUL) {
if (requestCode == REQUEST_LOGIN && resultCode == LoginActivity.RETURN_LOGIN_SUCCESSFUL) {
setResult(AccountActivity.RETURN_ACCOUNT_CHANGED);
// new account registered, reload fragment
fragment.reset();

1
app/src/main/java/org/nuclearfog/twidda/activities/AppSettings.java
View File

@ -14,7 +14,6 @@ import android.util.Patterns;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemSelectedListener;

4
app/src/main/java/org/nuclearfog/twidda/activities/LoginActivity.java
View File

@ -50,7 +50,7 @@ public class LoginActivity extends AppCompatActivity implements OnClickListener
/**
* return code to recognize the parent activity that a login process finished successful
*/
public static final int REQURN_LOGIN_SUCCESSFUL = 0x145;
public static final int RETURN_LOGIN_SUCCESSFUL = 0x145;
private Registration registerAsync;
private GlobalSettings settings;
@ -178,7 +178,7 @@ public class LoginActivity extends AppCompatActivity implements OnClickListener
* Called when the app is registered successfully to twitter
*/
public void onSuccess() {
setResult(REQURN_LOGIN_SUCCESSFUL);
setResult(RETURN_LOGIN_SUCCESSFUL);
finish();
}

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

@ -133,14 +133,22 @@ public class MainActivity extends AppCompatActivity implements OnTabSelectedList
super.onActivityResult(reqCode, returnCode, intent);
switch (reqCode) {
case REQUEST_APP_LOGIN:
AppStyles.setTheme(root, settings.getBackgroundColor());
// check if app login cancelled
if (returnCode == RESULT_CANCELED) {
finish();
}
// check if account changed
else if (returnCode == LoginActivity.REQURN_LOGIN_SUCCESSFUL) {
else if (returnCode == LoginActivity.RETURN_LOGIN_SUCCESSFUL) {
adapter.setupForHomePage();
AppStyles.setTabIcons(tabLayout, settings, R.array.home_tab_icons);
AppStyles.setTheme(root, settings.getBackgroundColor());
}
break;
case REQUEST_ACCOUNT_CHANGE:
// check if account changed
if (returnCode == AccountActivity.RETURN_ACCOUNT_CHANGED) {
adapter.notifySettingsChanged();
}
break;
@ -150,6 +158,7 @@ public class MainActivity extends AppCompatActivity implements OnTabSelectedList
AppStyles.setTabIcons(tabLayout, settings, R.array.home_tab_icons);
// check if an account was removed
if (returnCode == AppSettings.RETURN_APP_LOGOUT) {
// clear old login fragments
adapter.clear();
pager.setAdapter(adapter);
}
@ -158,13 +167,6 @@ public class MainActivity extends AppCompatActivity implements OnTabSelectedList
adapter.notifySettingsChanged();
}
break;
case REQUEST_ACCOUNT_CHANGE:
// check if account changed
if (returnCode == AccountActivity.RETURN_ACCOUNT_CHANGED) {
adapter.notifySettingsChanged();
}
break;
}
}

56
app/src/main/java/org/nuclearfog/twidda/dialog/ConfirmDialog.java
View File

@ -84,33 +84,45 @@ public class ConfirmDialog extends Dialog implements OnClickListener {
if (isShowing())
return;
confirm.setTag(type);
// reset modifications
if (cancel.getVisibility() != View.VISIBLE)
cancel.setVisibility(View.VISIBLE);
if (confirm.getCompoundDrawables()[0] == null)
confirm.setCompoundDrawablesWithIntrinsicBounds(R.drawable.check, 0, 0, 0);
// setup buttons and message
switch (type) {
case MESSAGE_DELETE:
txtTitle.setVisibility(View.GONE);
txtMessage.setText(R.string.confirm_delete_message);
confirm.setText(android.R.string.ok);
cancel.setText(android.R.string.cancel);
break;
case WRONG_PROXY:
txtTitle.setText(R.string.info_error);
txtMessage.setText(R.string.error_wrong_connection_settings);
confirm.setText(R.string.dialog_button_cancel);
cancel.setText(R.string.confirm_back);
confirm.setText(android.R.string.ok);
cancel.setText(android.R.string.cancel);
break;
case DELETE_APP_DATA:
txtTitle.setVisibility(View.GONE);
txtMessage.setText(R.string.confirm_delete_database);
confirm.setText(android.R.string.ok);
cancel.setText(android.R.string.cancel);
break;
case APP_LOG_OUT:
txtTitle.setVisibility(View.GONE);
txtMessage.setText(R.string.confirm_log_lout);
confirm.setText(android.R.string.ok);
cancel.setText(android.R.string.cancel);
break;
case VIDEO_ERROR:
txtTitle.setText(R.string.error_cant_load_video);
confirm.setText(R.string.confirm_open_link);
confirm.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
confirm.setText(R.string.confirm_open_link);
cancel.setVisibility(View.GONE);
break;
@ -118,11 +130,22 @@ public class ConfirmDialog extends Dialog implements OnClickListener {
case PROFILE_EDITOR_LEAVE:
txtTitle.setVisibility(View.GONE);
txtMessage.setText(R.string.confirm_discard);
confirm.setText(android.R.string.ok);
cancel.setText(android.R.string.cancel);
break;
case TWEET_EDITOR_LEAVE:
txtTitle.setVisibility(View.GONE);
txtMessage.setText(R.string.confirm_cancel_tweet);
confirm.setText(android.R.string.ok);
cancel.setText(android.R.string.cancel);
break;
case MESSAGE_EDITOR_LEAVE:
txtTitle.setVisibility(View.GONE);
txtMessage.setText(R.string.confirm_cancel_message);
confirm.setText(android.R.string.ok);
cancel.setText(android.R.string.cancel);
break;
case LIST_EDITOR_ERROR:
@ -131,56 +154,63 @@ public class ConfirmDialog extends Dialog implements OnClickListener {
case PROFILE_EDITOR_ERROR:
txtTitle.setText(R.string.info_error);
confirm.setText(R.string.confirm_retry_button);
cancel.setText(R.string.dialog_button_cancel);
break;
case MESSAGE_EDITOR_LEAVE:
txtTitle.setVisibility(View.GONE);
txtMessage.setText(R.string.confirm_cancel_message);
cancel.setText(android.R.string.cancel);
break;
case TWEET_DELETE:
txtTitle.setVisibility(View.GONE);
txtMessage.setText(R.string.confirm_delete_tweet);
confirm.setText(android.R.string.ok);
cancel.setText(android.R.string.cancel);
break;
case PROFILE_UNFOLLOW:
txtTitle.setVisibility(View.GONE);
txtMessage.setText(R.string.confirm_unfollow);
confirm.setText(android.R.string.ok);
cancel.setText(android.R.string.cancel);
break;
case PROFILE_BLOCK:
txtTitle.setVisibility(View.GONE);
txtMessage.setText(R.string.confirm_block);
confirm.setText(android.R.string.ok);
cancel.setText(android.R.string.cancel);
break;
case PROFILE_MUTE:
txtTitle.setVisibility(View.GONE);
txtMessage.setText(R.string.confirm_mute);
confirm.setText(android.R.string.ok);
cancel.setText(android.R.string.cancel);
break;
case LIST_REMOVE_USER:
txtTitle.setVisibility(View.GONE);
txtMessage.setText(R.string.confirm_remove_user_from_list);
confirm.setText(R.string.dialog_button_ok);
cancel.setText(R.string.dialog_button_cancel);
confirm.setText(android.R.string.ok);
cancel.setText(android.R.string.cancel);
break;
case LIST_UNFOLLOW:
txtMessage.setText(R.string.confirm_unfollow_list);
txtTitle.setVisibility(View.GONE);
confirm.setText(android.R.string.ok);
cancel.setText(android.R.string.cancel);
break;
case LIST_DELETE:
txtMessage.setText(R.string.confirm_delete_list);
txtTitle.setVisibility(View.GONE);
confirm.setText(android.R.string.ok);
cancel.setText(android.R.string.cancel);
break;
case REMOVE_ACCOUNT:
txtMessage.setText(R.string.confirm_remove_account);
confirm.setText(R.string.dialog_button_ok);
cancel.setText(R.string.dialog_button_cancel);
txtTitle.setVisibility(View.GONE);
confirm.setText(android.R.string.ok);
cancel.setText(android.R.string.cancel);
break;
}
super.show();

2
app/src/main/res/values-de-rDE/strings.xml
View File

@ -125,7 +125,7 @@
<string name="error_cant_load_video">Video kann nicht abgespielt werden!</string>
<string name="settings_enable_proxy">Proxy aktivieren</string>
<string name="settings_enable_proxy_auth">Proxy Authentifizierung aktivieren</string>
<string name="error_wrong_connection_settings">Falsche Verbindung angegeben!</string>
<string name="error_wrong_connection_settings">Falsche Proxykonfiguration! Änderung verwerfen?</string>
<string name="error_open_link">Link konnte nicht geöffnet werden!</string>
<string name="tweet_sensitive_media">Sensible Inhalte</string>
<string name="login_info">3 Schritte zum Login</string>

2
app/src/main/res/values/strings.xml
View File

@ -19,7 +19,7 @@
<string name="info_list_created">Userlist created</string>
<string name="info_fetching_link">redirecting to Twitter login</string>
<string name="info_login_to_twitter">login to Twitter</string>
<string name="error_wrong_connection_settings">wrong connection settings!</string>
<string name="error_wrong_connection_settings">wrong connection settings! Discarc changes?</string>
<string name="info_get_link">please open twitter login page first to get the PIN</string>
<string name="info_gps_attached">GPS position added</string>
<string name="info_tweet_retweeted">retweeted</string>