From 422f5c86c5d9808a720da70aa74f66ae609fa7e7 Mon Sep 17 00:00:00 2001 From: Kasun Date: Mon, 10 Feb 2020 21:09:39 +0530 Subject: [PATCH 1/4] change text in draft dialog buttons --- .../android/activities/PixelfedComposeActivity.java | 8 ++++---- .../java/app/fedilab/android/activities/TootActivity.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java b/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java index affaed3d1..bb40e4db4 100644 --- a/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java @@ -591,7 +591,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu } else { AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(PixelfedComposeActivity.this, style); dialogBuilder.setMessage(R.string.save_draft); - dialogBuilder.setPositiveButton(R.string.validate, new DialogInterface.OnClickListener() { + dialogBuilder.setPositiveButton(R.string.save, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { if (accountReply == null) { @@ -603,7 +603,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu finish(); } }); - dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { + dialogBuilder.setNegativeButton(R.string.discard, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); @@ -1473,7 +1473,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu } else { AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(PixelfedComposeActivity.this, style); dialogBuilder.setMessage(R.string.save_draft); - dialogBuilder.setPositiveButton(R.string.validate, new DialogInterface.OnClickListener() { + dialogBuilder.setPositiveButton(R.string.save, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { if (accountReply == null) { @@ -1485,7 +1485,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu finish(); } }); - dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { + dialogBuilder.setNegativeButton(R.string.discard, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/activities/TootActivity.java b/app/src/main/java/app/fedilab/android/activities/TootActivity.java index c7b806a32..329bc7f8c 100644 --- a/app/src/main/java/app/fedilab/android/activities/TootActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/TootActivity.java @@ -758,7 +758,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, } else { AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(TootActivity.this, style); dialogBuilder.setMessage(R.string.save_draft); - dialogBuilder.setPositiveButton(R.string.validate, new DialogInterface.OnClickListener() { + dialogBuilder.setPositiveButton(R.string.save, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { if (accountReply == null) { @@ -770,7 +770,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, finish(); } }); - dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { + dialogBuilder.setNegativeButton(R.string.discard, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); @@ -2634,7 +2634,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, } else { AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(TootActivity.this, style); dialogBuilder.setMessage(R.string.save_draft); - dialogBuilder.setPositiveButton(R.string.validate, new DialogInterface.OnClickListener() { + dialogBuilder.setPositiveButton(R.string.save, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { if (accountReply == null) { @@ -2646,7 +2646,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, finish(); } }); - dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { + dialogBuilder.setNegativeButton(R.string.discard, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); From 61d9fc53b0aa31a8dc968b119eed7748ac6c9df5 Mon Sep 17 00:00:00 2001 From: Kasun Date: Mon, 10 Feb 2020 21:30:08 +0530 Subject: [PATCH 2/4] ask for confirmation before logout --- .../android/activities/BaseMainActivity.java | 26 +++++++++++++++---- app/src/main/res/values/strings.xml | 1 + 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java index 56214d394..5d97c1950 100644 --- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java @@ -972,13 +972,29 @@ public abstract class BaseMainActivity extends BaseActivity public boolean onMenuItemClick(MenuItem item) { switch (item.getItemId()) { case R.id.action_logout: - Helper.logout(getApplicationContext()); - Intent myIntent = new Intent(BaseMainActivity.this, LoginActivity.class); - startActivity(myIntent); - finish(); + AlertDialog.Builder dialogBuilderLogout = new AlertDialog.Builder(BaseMainActivity.this, style); + dialogBuilderLogout.setMessage(R.string.logout_confirmation); + dialogBuilderLogout.setPositiveButton(R.string.action_logout, (dialog, id) -> { + 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; 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; case R.id.action_privacy: Intent intent = new Intent(getApplicationContext(), PrivacyActivity.class); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 398be701e..74926c2de 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -84,6 +84,7 @@ Insert emoji The app did not collect custom emojis for the moment. Live notifications + Are you sure you want to logout? No toot to display No stories to display From 98279f81b7b14af4a2ac88a115b4288de5ce95a0 Mon Sep 17 00:00:00 2001 From: Kasun Date: Mon, 10 Feb 2020 21:54:43 +0530 Subject: [PATCH 3/4] show keyboard in content description dialog --- .../main/java/app/fedilab/android/activities/TootActivity.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/java/app/fedilab/android/activities/TootActivity.java b/app/src/main/java/app/fedilab/android/activities/TootActivity.java index 329bc7f8c..c38fb1fd4 100644 --- a/app/src/main/java/app/fedilab/android/activities/TootActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/TootActivity.java @@ -51,6 +51,7 @@ import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.view.ViewTreeObserver; +import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; import android.widget.AdapterView; import android.widget.ArrayAdapter; @@ -2510,7 +2511,9 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, } }); AlertDialog alertDialog = builderInner.create(); + alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); alertDialog.show(); + input.requestFocus(); } /** From 25c05ef42618509efc6717cbc123dffa2588d643 Mon Sep 17 00:00:00 2001 From: Kasun Date: Tue, 11 Feb 2020 01:06:11 +0530 Subject: [PATCH 4/4] update about page and readme --- README.md | 2 -- .../fedilab/android/activities/AboutActivity.java | 13 ------------- app/src/main/res/layout/activity_about.xml | 7 ------- 3 files changed, 22 deletions(-) diff --git a/README.md b/README.md index 6053674b2..296f0d488 100644 --- a/README.md +++ b/README.md @@ -41,8 +41,6 @@ Lead developer: [toot.fedilab.app/@fedilab](https://toot.fedilab.app/@fedilab) -
-Developer: [toot.fedilab.app/@kasun](https://toot.fedilab.app/@kasun) ## Backers diff --git a/app/src/main/java/app/fedilab/android/activities/AboutActivity.java b/app/src/main/java/app/fedilab/android/activities/AboutActivity.java index dda95cf50..aa37020fb 100644 --- a/app/src/main/java/app/fedilab/android/activities/AboutActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/AboutActivity.java @@ -130,7 +130,6 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou TextView txt_developers, txt_ux, txt_thankyou3, txt_thankyou1, txt_thankyou2; txt_developers = findViewById(R.id.txt_developers); txt_ux = findViewById(R.id.txt_ux); - txt_thankyou3 = findViewById(R.id.txt_thankyou3); txt_thankyou1 = findViewById(R.id.txt_thankyou1); txt_thankyou2 = findViewById(R.id.txt_thankyou2); @@ -241,7 +240,6 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou lv_ux.setAdapter(accountSearchWebAdapterUxUiDesigners); 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(), "mmarif", "mastodon.social", 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"); } }); - - 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"); - } - }); } } diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 918fe230c..8e2835155 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -165,13 +165,6 @@ android:divider="@null" android:scrollbars="none" /> - -