From 1003930a1edd6ed934532be1c71be43cbdf39b78 Mon Sep 17 00:00:00 2001 From: tom79 Date: Sat, 9 Nov 2019 18:07:33 +0100 Subject: [PATCH] some fixes --- .../activities/ShowAccountActivity.java | 14 ++-- .../android/activities/TootActivity.java | 64 +++++++------------ .../main/res/layout/activity_show_account.xml | 47 +++++++------- app/src/main/res/values/strings.xml | 2 + 4 files changed, 55 insertions(+), 72 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java index 56c0c57be..52f2f8bbf 100644 --- a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java @@ -71,7 +71,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.Timer; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; @@ -89,7 +88,6 @@ import app.fedilab.android.client.Entities.RemoteInstance; import app.fedilab.android.client.Entities.Status; import app.fedilab.android.client.Entities.UserNote; import app.fedilab.android.client.HttpsConnection; -import app.fedilab.android.drawers.AccountsInAListAdapter; import app.fedilab.android.drawers.StatusListAdapter; import app.fedilab.android.fragments.DisplayAccountsFragment; import app.fedilab.android.fragments.DisplayStatusFragment; @@ -179,9 +177,6 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt case Helper.THEME_LIGHT: setTheme(R.style.AppTheme_NoActionBar_Fedilab); break; - case Helper.THEME_DARK: - setTheme(R.style.AppThemeDark_NoActionBar); - break; case Helper.THEME_BLACK: setTheme(R.style.AppThemeBlack_NoActionBar); break; @@ -200,7 +195,6 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt account_pp = findViewById(R.id.account_pp); account_dn = findViewById(R.id.account_dn); account_un = findViewById(R.id.account_un); - TextView account_type = findViewById(R.id.account_type); account_bot = findViewById(R.id.account_bot); addToList = null; account_pp.setBackgroundResource(R.drawable.account_pp_border); @@ -245,10 +239,10 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt } }); - final ImageButton account_menu = findViewById(R.id.account_menu); - ImageButton action_more = findViewById(R.id.action_more); - ImageButton reload_tabs = findViewById(R.id.reload_tabs); - ImageButton action_back = findViewById(R.id.action_back); + final ImageView account_menu = findViewById(R.id.account_menu); + ImageView action_more = findViewById(R.id.action_more); + ImageView reload_tabs = findViewById(R.id.reload_tabs); + ImageView action_back = findViewById(R.id.action_back); account_menu.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { 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 bd3d0ea02..e78e4bb8b 100644 --- a/app/src/main/java/app/fedilab/android/activities/TootActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/TootActivity.java @@ -294,9 +294,6 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, case Helper.THEME_LIGHT: setTheme(R.style.AppTheme_Fedilab); break; - case Helper.THEME_DARK: - setTheme(R.style.AppThemeDark); - break; case Helper.THEME_BLACK: setTheme(R.style.AppThemeBlack); break; @@ -315,8 +312,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, autocomplete = false; - if (getSupportActionBar() != null) - getSupportActionBar().setDisplayHomeAsUpEnabled(true); + ActionBar actionBar = getSupportActionBar(); if (actionBar != null) { LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE); @@ -718,7 +714,6 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, String defaultVisibility = account.isLocked() ? "private" : "public"; visibility = sharedpreferences.getString(Helper.SET_TOOT_VISIBILITY + "@" + account.getAcct() + "@" + account.getInstance(), defaultVisibility); } - assert visibility != null; switch (visibility) { case "public": toot_visibility.setImageResource(R.drawable.ic_public_toot); @@ -812,14 +807,12 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, @Override public void onClick(View v) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { - if (ContextCompat.checkSelfPermission(TootActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != - PackageManager.PERMISSION_GRANTED) { - ActivityCompat.requestPermissions(TootActivity.this, - new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, - MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE); - return; - } + if (ContextCompat.checkSelfPermission(TootActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != + PackageManager.PERMISSION_GRANTED) { + ActivityCompat.requestPermissions(TootActivity.this, + new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, + MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE); + return; } Intent intent; intent = new Intent(Intent.ACTION_GET_CONTENT); @@ -832,9 +825,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, startActivityForResult(intent, PICK_IMAGE); } else { intent.setType("image/* video/* audio/mpeg audio/opus audio/flac audio/wav audio/ogg"); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) { - intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true); - } + intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true); Intent pickIntent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI); Intent chooserIntent = Intent.createChooser(intent, getString(R.string.toot_select_image)); chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[]{pickIntent}); @@ -1698,7 +1689,6 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) input.setText(Html.fromHtml(content, Html.FROM_HTML_MODE_LEGACY)); else - //noinspection deprecation input.setText(Html.fromHtml(content)); alert.setPositiveButton(R.string.close, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -2457,11 +2447,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, @Override public void onResourceReady(@NonNull Bitmap resource, Transition transition) { media_picture.setImageBitmap(resource); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { - media_picture.setImageAlpha(60); - } else { - media_picture.setAlpha(60); - } + media_picture.setImageAlpha(60); } }); @@ -3523,23 +3509,21 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, initialTootVisibility = 1; break; } - if (settingsVisibility != null) { - switch (settingsVisibility) { - case "public": - ownerTootVisibility = 4; - break; - case "unlisted": - ownerTootVisibility = 3; - break; - case "private": - visibility = "private"; - ownerTootVisibility = 2; - break; - case "direct": - visibility = "direct"; - ownerTootVisibility = 1; - break; - } + switch (settingsVisibility) { + case "public": + ownerTootVisibility = 4; + break; + case "unlisted": + ownerTootVisibility = 3; + break; + case "private": + visibility = "private"; + ownerTootVisibility = 2; + break; + case "direct": + visibility = "direct"; + ownerTootVisibility = 1; + break; } int tootVisibility; if (ownerTootVisibility >= initialTootVisibility) { diff --git a/app/src/main/res/layout/activity_show_account.xml b/app/src/main/res/layout/activity_show_account.xml index b31711baf..2e11eae01 100644 --- a/app/src/main/res/layout/activity_show_account.xml +++ b/app/src/main/res/layout/activity_show_account.xml @@ -81,7 +81,8 @@ android:scaleType="fitCenter" android:visibility="gone" app:layout_constraintStart_toEndOf="@id/account_pp" - app:layout_constraintTop_toBottomOf="@id/banner_pp" /> + app:layout_constraintTop_toBottomOf="@id/banner_pp" + android:contentDescription="@string/make_an_action" /> + app:layout_constraintTop_toBottomOf="@id/banner_pp" + android:contentDescription="@string/edit_profile" /> + app:layout_constraintTop_toBottomOf="@id/banner_pp" + android:contentDescription="@string/action_add_notes" /> - - @@ -195,7 +199,8 @@ android:text="Peertube" android:id="@+id/account_type" android:layout_width="wrap_content" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + tools:ignore="HardcodedText" /> + android:layout_height="wrap_content" + tools:ignore="HardcodedText" /> - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index db3d4f1a3..43dadfff0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1263,4 +1263,6 @@ Change the background color for timelines Pin this tag Logo of the instance + Edite profile + Make an action \ No newline at end of file