Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
26db8087f0
|
@ -41,8 +41,6 @@
|
||||||
|
|
||||||
|
|
||||||
Lead developer: [toot.fedilab.app/@fedilab](https://toot.fedilab.app/@fedilab)
|
Lead developer: [toot.fedilab.app/@fedilab](https://toot.fedilab.app/@fedilab)
|
||||||
<br>
|
|
||||||
Developer: [toot.fedilab.app/@kasun](https://toot.fedilab.app/@kasun)
|
|
||||||
|
|
||||||
## Backers
|
## Backers
|
||||||
|
|
||||||
|
|
|
@ -130,7 +130,6 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
|
||||||
TextView txt_developers, txt_ux, txt_thankyou3, txt_thankyou1, txt_thankyou2;
|
TextView txt_developers, txt_ux, txt_thankyou3, txt_thankyou1, txt_thankyou2;
|
||||||
txt_developers = findViewById(R.id.txt_developers);
|
txt_developers = findViewById(R.id.txt_developers);
|
||||||
txt_ux = findViewById(R.id.txt_ux);
|
txt_ux = findViewById(R.id.txt_ux);
|
||||||
txt_thankyou3 = findViewById(R.id.txt_thankyou3);
|
|
||||||
txt_thankyou1 = findViewById(R.id.txt_thankyou1);
|
txt_thankyou1 = findViewById(R.id.txt_thankyou1);
|
||||||
txt_thankyou2 = findViewById(R.id.txt_thankyou2);
|
txt_thankyou2 = findViewById(R.id.txt_thankyou2);
|
||||||
|
|
||||||
|
@ -241,7 +240,6 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
|
||||||
lv_ux.setAdapter(accountSearchWebAdapterUxUiDesigners);
|
lv_ux.setAdapter(accountSearchWebAdapterUxUiDesigners);
|
||||||
|
|
||||||
if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) {
|
if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) {
|
||||||
new RetrieveRemoteDataAsyncTask(getApplicationContext(), "kasun", "toot.fedilab.app", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
|
||||||
new RetrieveRemoteDataAsyncTask(getApplicationContext(), "fedilab", "toot.fedilab.app", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
new RetrieveRemoteDataAsyncTask(getApplicationContext(), "fedilab", "toot.fedilab.app", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
||||||
new RetrieveRemoteDataAsyncTask(getApplicationContext(), "mmarif", "mastodon.social", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
new RetrieveRemoteDataAsyncTask(getApplicationContext(), "mmarif", "mastodon.social", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
||||||
new RetrieveRemoteDataAsyncTask(getApplicationContext(), "PhotonQyv", "mastodon.xyz", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
new RetrieveRemoteDataAsyncTask(getApplicationContext(), "PhotonQyv", "mastodon.xyz", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
||||||
|
@ -288,17 +286,6 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
|
||||||
Helper.openBrowser(AboutActivity.this, "https://social.tchncs.de/@angrytux");
|
Helper.openBrowser(AboutActivity.this, "https://social.tchncs.de/@angrytux");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
name = new SpannableString("@kasun@stoot.fedilab.app");
|
|
||||||
name.setSpan(new UnderlineSpan(), 0, name.length(), 0);
|
|
||||||
txt_thankyou3.setText(name);
|
|
||||||
txt_thankyou3.setVisibility(View.VISIBLE);
|
|
||||||
txt_thankyou3.setOnClickListener(new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
Helper.openBrowser(AboutActivity.this, "https://toot.fedilab.app/@kasun");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -972,13 +972,29 @@ public abstract class BaseMainActivity extends BaseActivity
|
||||||
public boolean onMenuItemClick(MenuItem item) {
|
public boolean onMenuItemClick(MenuItem item) {
|
||||||
switch (item.getItemId()) {
|
switch (item.getItemId()) {
|
||||||
case R.id.action_logout:
|
case R.id.action_logout:
|
||||||
Helper.logout(getApplicationContext());
|
AlertDialog.Builder dialogBuilderLogout = new AlertDialog.Builder(BaseMainActivity.this, style);
|
||||||
Intent myIntent = new Intent(BaseMainActivity.this, LoginActivity.class);
|
dialogBuilderLogout.setMessage(R.string.logout_confirmation);
|
||||||
startActivity(myIntent);
|
dialogBuilderLogout.setPositiveButton(R.string.action_logout, (dialog, id) -> {
|
||||||
finish();
|
Helper.logout(getApplicationContext());
|
||||||
|
Intent myIntent = new Intent(BaseMainActivity.this, LoginActivity.class);
|
||||||
|
startActivity(myIntent);
|
||||||
|
dialog.dismiss();
|
||||||
|
finish();
|
||||||
|
});
|
||||||
|
dialogBuilderLogout.setNegativeButton(R.string.cancel, (dialog, id) -> dialog.dismiss());
|
||||||
|
AlertDialog alertDialogLogout = dialogBuilderLogout.create();
|
||||||
|
alertDialogLogout.show();
|
||||||
return true;
|
return true;
|
||||||
case R.id.action_logout_account:
|
case R.id.action_logout_account:
|
||||||
Helper.logoutCurrentUser(BaseMainActivity.this);
|
AlertDialog.Builder dialogBuilderLogoutAccount = new AlertDialog.Builder(BaseMainActivity.this, style);
|
||||||
|
dialogBuilderLogoutAccount.setMessage(R.string.logout_confirmation);
|
||||||
|
dialogBuilderLogoutAccount.setPositiveButton(R.string.action_logout, (dialog, id) -> {
|
||||||
|
Helper.logoutCurrentUser(BaseMainActivity.this);
|
||||||
|
dialog.dismiss();
|
||||||
|
});
|
||||||
|
dialogBuilderLogoutAccount.setNegativeButton(R.string.cancel, (dialog, id) -> dialog.dismiss());
|
||||||
|
AlertDialog alertDialogLogoutAccount = dialogBuilderLogoutAccount.create();
|
||||||
|
alertDialogLogoutAccount.show();
|
||||||
return true;
|
return true;
|
||||||
case R.id.action_privacy:
|
case R.id.action_privacy:
|
||||||
Intent intent = new Intent(getApplicationContext(), PrivacyActivity.class);
|
Intent intent = new Intent(getApplicationContext(), PrivacyActivity.class);
|
||||||
|
|
|
@ -591,7 +591,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu
|
||||||
} else {
|
} else {
|
||||||
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(PixelfedComposeActivity.this, style);
|
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(PixelfedComposeActivity.this, style);
|
||||||
dialogBuilder.setMessage(R.string.save_draft);
|
dialogBuilder.setMessage(R.string.save_draft);
|
||||||
dialogBuilder.setPositiveButton(R.string.validate, new DialogInterface.OnClickListener() {
|
dialogBuilder.setPositiveButton(R.string.save, new DialogInterface.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(DialogInterface dialog, int id) {
|
public void onClick(DialogInterface dialog, int id) {
|
||||||
if (accountReply == null) {
|
if (accountReply == null) {
|
||||||
|
@ -603,7 +603,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu
|
||||||
finish();
|
finish();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
|
dialogBuilder.setNegativeButton(R.string.discard, new DialogInterface.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(DialogInterface dialog, int id) {
|
public void onClick(DialogInterface dialog, int id) {
|
||||||
dialog.dismiss();
|
dialog.dismiss();
|
||||||
|
@ -1473,7 +1473,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu
|
||||||
} else {
|
} else {
|
||||||
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(PixelfedComposeActivity.this, style);
|
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(PixelfedComposeActivity.this, style);
|
||||||
dialogBuilder.setMessage(R.string.save_draft);
|
dialogBuilder.setMessage(R.string.save_draft);
|
||||||
dialogBuilder.setPositiveButton(R.string.validate, new DialogInterface.OnClickListener() {
|
dialogBuilder.setPositiveButton(R.string.save, new DialogInterface.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(DialogInterface dialog, int id) {
|
public void onClick(DialogInterface dialog, int id) {
|
||||||
if (accountReply == null) {
|
if (accountReply == null) {
|
||||||
|
@ -1485,7 +1485,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu
|
||||||
finish();
|
finish();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
|
dialogBuilder.setNegativeButton(R.string.discard, new DialogInterface.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(DialogInterface dialog, int id) {
|
public void onClick(DialogInterface dialog, int id) {
|
||||||
dialog.dismiss();
|
dialog.dismiss();
|
||||||
|
|
|
@ -51,6 +51,7 @@ import android.view.MotionEvent;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
import android.view.ViewTreeObserver;
|
import android.view.ViewTreeObserver;
|
||||||
|
import android.view.WindowManager;
|
||||||
import android.view.inputmethod.InputMethodManager;
|
import android.view.inputmethod.InputMethodManager;
|
||||||
import android.widget.AdapterView;
|
import android.widget.AdapterView;
|
||||||
import android.widget.ArrayAdapter;
|
import android.widget.ArrayAdapter;
|
||||||
|
@ -758,7 +759,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
|
||||||
} else {
|
} else {
|
||||||
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(TootActivity.this, style);
|
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(TootActivity.this, style);
|
||||||
dialogBuilder.setMessage(R.string.save_draft);
|
dialogBuilder.setMessage(R.string.save_draft);
|
||||||
dialogBuilder.setPositiveButton(R.string.validate, new DialogInterface.OnClickListener() {
|
dialogBuilder.setPositiveButton(R.string.save, new DialogInterface.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(DialogInterface dialog, int id) {
|
public void onClick(DialogInterface dialog, int id) {
|
||||||
if (accountReply == null) {
|
if (accountReply == null) {
|
||||||
|
@ -770,7 +771,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
|
||||||
finish();
|
finish();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
|
dialogBuilder.setNegativeButton(R.string.discard, new DialogInterface.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(DialogInterface dialog, int id) {
|
public void onClick(DialogInterface dialog, int id) {
|
||||||
dialog.dismiss();
|
dialog.dismiss();
|
||||||
|
@ -2510,7 +2511,9 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
AlertDialog alertDialog = builderInner.create();
|
AlertDialog alertDialog = builderInner.create();
|
||||||
|
alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
|
||||||
alertDialog.show();
|
alertDialog.show();
|
||||||
|
input.requestFocus();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -2634,7 +2637,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
|
||||||
} else {
|
} else {
|
||||||
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(TootActivity.this, style);
|
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(TootActivity.this, style);
|
||||||
dialogBuilder.setMessage(R.string.save_draft);
|
dialogBuilder.setMessage(R.string.save_draft);
|
||||||
dialogBuilder.setPositiveButton(R.string.validate, new DialogInterface.OnClickListener() {
|
dialogBuilder.setPositiveButton(R.string.save, new DialogInterface.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(DialogInterface dialog, int id) {
|
public void onClick(DialogInterface dialog, int id) {
|
||||||
if (accountReply == null) {
|
if (accountReply == null) {
|
||||||
|
@ -2646,7 +2649,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
|
||||||
finish();
|
finish();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
|
dialogBuilder.setNegativeButton(R.string.discard, new DialogInterface.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(DialogInterface dialog, int id) {
|
public void onClick(DialogInterface dialog, int id) {
|
||||||
dialog.dismiss();
|
dialog.dismiss();
|
||||||
|
|
|
@ -165,13 +165,6 @@
|
||||||
android:divider="@null"
|
android:divider="@null"
|
||||||
android:scrollbars="none" />
|
android:scrollbars="none" />
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/txt_thankyou3"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:textSize="16sp"
|
|
||||||
android:visibility="gone" />
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/txt_thankyou1"
|
android:id="@+id/txt_thankyou1"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|
|
@ -84,6 +84,7 @@
|
||||||
<string name="insert_emoji">Insert emoji</string>
|
<string name="insert_emoji">Insert emoji</string>
|
||||||
<string name="no_emoji">The app did not collect custom emojis for the moment.</string>
|
<string name="no_emoji">The app did not collect custom emojis for the moment.</string>
|
||||||
<string name="live_notif">Live notifications</string>
|
<string name="live_notif">Live notifications</string>
|
||||||
|
<string name="logout_confirmation">Are you sure you want to logout?</string>
|
||||||
<!-- Status -->
|
<!-- Status -->
|
||||||
<string name="no_status">No toot to display</string>
|
<string name="no_status">No toot to display</string>
|
||||||
<string name="no_stories">No stories to display</string>
|
<string name="no_stories">No stories to display</string>
|
||||||
|
|
Loading…
Reference in New Issue