mirror of
https://github.com/TrianguloY/UrlChecker.git
synced 2024-09-19 20:02:16 +02:00
revert shortcut button from main screen, force action one to be shown
This commit is contained in:
TrianguloY
parent
4680e81e0c
commit
4809cc3042
@ -5,11 +5,13 @@ import android.content.Intent;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.trianguloy.urlchecker.R;
|
||||
import com.trianguloy.urlchecker.utilities.AndroidSettings;
|
||||
import com.trianguloy.urlchecker.utilities.AndroidUtils;
|
||||
import com.trianguloy.urlchecker.utilities.PackageUtils;
|
||||
|
||||
import java.util.Objects;
|
||||
@ -38,8 +40,9 @@ public class MainActivity extends Activity {
|
||||
@Override
|
||||
public boolean onCreateOptionsMenu(Menu menu) {
|
||||
// option for the open in clipboard shortcut
|
||||
/* menu.add(R.string.shortcut_checkClipboard)
|
||||
.setIcon(R.mipmap.clipboard_launcher)
|
||||
menu.add(R.string.shortcut_checkClipboard)
|
||||
.setIcon(AndroidUtils.getColoredDrawable(R.drawable.ic_clipboard, android.R.attr.textColorPrimary, this))
|
||||
.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
|
||||
.setOnMenuItemClickListener(o -> {
|
||||
PackageUtils.startActivity(
|
||||
new Intent(this, ShortcutsActivity.class),
|
||||
@ -47,7 +50,7 @@ public class MainActivity extends Activity {
|
||||
this
|
||||
);
|
||||
return true;
|
||||
}); */
|
||||
});
|
||||
return super.onCreateOptionsMenu(menu);
|
||||
}
|
||||
|
||||
@ -88,8 +91,4 @@ public class MainActivity extends Activity {
|
||||
Toast.makeText(this, getString(R.string.app_name) + " - " + getString(R.string.trianguloy), Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
|
||||
public void openURLActivity(View view) {
|
||||
PackageUtils.startActivity(new Intent(this, ShortcutsActivity.class), R.string.toast_noApp,this);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -7,11 +7,13 @@ import android.content.ClipboardManager;
|
||||
import android.content.Context;
|
||||
import android.content.res.Configuration;
|
||||
import android.graphics.PorterDuff;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.net.Uri;
|
||||
import android.os.Build;
|
||||
import android.text.SpannableStringBuilder;
|
||||
import android.text.style.ClickableSpan;
|
||||
import android.util.Log;
|
||||
import android.util.TypedValue;
|
||||
import android.view.View;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
@ -199,4 +201,20 @@ public interface AndroidUtils {
|
||||
view.setText(text);
|
||||
view.setVisibility(text == null || text.length() == 0 ? View.GONE : View.VISIBLE);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a drawable with a different color
|
||||
*/
|
||||
static Drawable getColoredDrawable(int drawableId, int colorAttr, Context cntx) {
|
||||
// get drawable
|
||||
var drawable = cntx.getResources().getDrawable(drawableId).mutate();
|
||||
|
||||
// get color
|
||||
var resolvedAttr = new TypedValue();
|
||||
cntx.getTheme().resolveAttribute(colorAttr, resolvedAttr, true);
|
||||
|
||||
// tint
|
||||
drawable.setColorFilter(cntx.getResources().getColor(resolvedAttr.resourceId), PorterDuff.Mode.SRC_IN);
|
||||
return drawable;
|
||||
}
|
||||
}
|
||||
|
||||
@ -11,9 +11,9 @@
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="@dimen/padding"
|
||||
android:gravity="center"
|
||||
android:orientation="vertical"
|
||||
android:padding="@dimen/padding">
|
||||
android:orientation="vertical">
|
||||
|
||||
<ImageButton
|
||||
android:layout_width="64dp"
|
||||
@ -40,7 +40,7 @@
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/smallPadding"
|
||||
android:layout_marginTop="@dimen/padding"
|
||||
android:autoLink="web"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
@ -61,34 +61,11 @@
|
||||
android:padding="@dimen/smallPadding"
|
||||
android:text="@string/sample_url" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/smallPadding"
|
||||
android:autoLink="web"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:gravity="center"
|
||||
android:linksClickable="false"
|
||||
android:text="@string/txt_or" />
|
||||
|
||||
<Button
|
||||
style="@android:style/Widget.DeviceDefault.Button"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/smallPadding"
|
||||
android:layout_weight="1"
|
||||
android:drawablePadding="@dimen/smallPadding"
|
||||
android:onClick="openURLActivity"
|
||||
android:paddingLeft="@dimen/padding"
|
||||
android:paddingRight="@dimen/padding"
|
||||
android:text="@string/a_checkUrl" />
|
||||
|
||||
<Button
|
||||
style="?android:attr/buttonBarButtonStyle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/smallPadding"
|
||||
android:layout_marginTop="@dimen/padding"
|
||||
android:layout_weight="1"
|
||||
android:drawableStart="@android:drawable/ic_menu_sort_by_size"
|
||||
android:drawableLeft="@android:drawable/ic_menu_sort_by_size"
|
||||
|
||||
@ -14,7 +14,6 @@
|
||||
-->
|
||||
<string name="txt_info">Esta aplicación actúa como intermediario al abrir enlaces URL. Se muestra un diálogo con información sobre el enlace cuando se elige esta aplicación para abrirlo. Pulse el botón \'Módulos\' de abajo para comprobar y configurar todos los módulos disponibles.</string>
|
||||
<string name="txt_sample">Pulsa el enlace de debajo para probar la app:</string>
|
||||
<string name="txt_or">O:</string>
|
||||
<string name="a_modules">Módulos</string>
|
||||
<string name="a_settings">Ajustes</string>
|
||||
<string name="a_about">Acerca de</string>
|
||||
|
||||
@ -14,7 +14,6 @@
|
||||
-->
|
||||
<string name="txt_info">Cette application agit comme une étape intermédiaire pour l\'ouverture de liens URL. Lorsque vous cliquez sur un lien et choisissez cette application pour l\'ouvrir, une boîte de dialogue contenant des informations sur le lien s\'affiche. Appuyez sur le bouton Module ci-dessous pour vérifier et configurer tous les modules disponibles.</string>
|
||||
<string name="txt_sample">Appuyez sur le lien ci-dessous pour la tester:</string>
|
||||
<string name="txt_or">OU:</string>
|
||||
<string name="a_modules">Modules</string>
|
||||
<string name="a_settings">Paramètres</string>
|
||||
<string name="a_about">À Propos</string>
|
||||
|
||||
@ -14,8 +14,6 @@
|
||||
-->
|
||||
<string name="txt_info">This app acts as an intermediary when opening clicked URL links. A dialog with some info about the link is shown when choosing this app to open it. Press the module button below to check and configure all available modules.</string>
|
||||
<string name="txt_sample">Press the link below to test it:</string>
|
||||
<string name="txt_or">OR:</string>
|
||||
<string name="a_checkUrl">Check URL from clipboard</string>
|
||||
<string name="a_modules">Modules</string>
|
||||
<string name="a_settings">Settings</string>
|
||||
<string name="a_about">About</string>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user