diff --git a/app/src/main/java/com/danvelazco/fbwrapper/FbWrapper.java b/app/src/main/java/com/danvelazco/fbwrapper/FbWrapper.java index 2aef026..852f8aa 100644 --- a/app/src/main/java/com/danvelazco/fbwrapper/FbWrapper.java +++ b/app/src/main/java/com/danvelazco/fbwrapper/FbWrapper.java @@ -9,6 +9,8 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; +import android.support.annotation.NonNull; +import android.support.v4.content.ContextCompat; import android.support.v4.view.GravityCompat; import android.support.v4.widget.DrawerLayout; import android.text.TextUtils; @@ -27,7 +29,7 @@ public class FbWrapper extends BaseFacebookWebViewActivity { // Constant private final static String LOG_TAG = "FbWrapper"; - private final static int MENU_DRAWER_GRAVITY = GravityCompat.END; + private final static int MENU_DRAWER_GRAVITY = GravityCompat.START; protected final static int DELAY_RESTORE_STATE = (60 * 1000) * 30; // Members @@ -51,6 +53,7 @@ protected void onActivityCreated() { // Keep a reference of the DrawerLayout mDrawerLayout = (DrawerLayout) findViewById(R.id.layout_main); mWebViewContainer = (RelativeLayout) findViewById(R.id.webview_container); + mDrawerLayout.setDrawerShadow(ContextCompat.getDrawable(this, R.drawable.shadow), MENU_DRAWER_GRAVITY); // Set the click listener interface for the buttons setOnClickListeners(); @@ -162,7 +165,6 @@ private void setOnClickListeners() { findViewById(R.id.menu_share_this).setOnClickListener(buttonsListener); findViewById(R.id.menu_preferences).setOnClickListener(buttonsListener); findViewById(R.id.menu_about).setOnClickListener(buttonsListener); - findViewById(R.id.menu_kill).setOnClickListener(buttonsListener); } /** @@ -381,11 +383,6 @@ public void onClick(View v) { case R.id.menu_about: showAboutAlert(); break; - case R.id.menu_kill: - mWebViewContainer.removeView(mWebView); - destroyWebView(); - finish(); - break; } closeMenuDrawer(); } @@ -413,7 +410,7 @@ public void onClick(DialogInterface dialog, int which) { * {@inheritDoc} */ @Override - public boolean onKeyDown(int keyCode, KeyEvent event) { + public boolean onKeyDown(int keyCode, @NonNull KeyEvent event) { switch(keyCode){ case KeyEvent.KEYCODE_MENU: toggleMenuDrawer(); diff --git a/app/src/main/java/com/danvelazco/fbwrapper/activity/BaseFacebookWebViewActivity.java b/app/src/main/java/com/danvelazco/fbwrapper/activity/BaseFacebookWebViewActivity.java index 63f6532..6f7a574 100644 --- a/app/src/main/java/com/danvelazco/fbwrapper/activity/BaseFacebookWebViewActivity.java +++ b/app/src/main/java/com/danvelazco/fbwrapper/activity/BaseFacebookWebViewActivity.java @@ -469,10 +469,7 @@ protected void destroyWebView() { private boolean checkNetworkConnection() { try { NetworkInfo networkInfo = mConnectivityManager.getActiveNetworkInfo(); - if (networkInfo != null) { - return networkInfo.isConnected(); - } - return false; + return networkInfo != null && networkInfo.isConnected(); } catch (SecurityException e) { // Catch the Security Exception in case the user revokes the ACCESS_NETWORK_STATE permission e.printStackTrace(); @@ -643,7 +640,7 @@ public void openExternalSite(String url) { * {@inheritDoc} */ @Override - public boolean onKeyDown(int keyCode, KeyEvent event) { + public boolean onKeyDown(int keyCode, @NonNull KeyEvent event) { // Override the back button if (keyCode == KeyEvent.KEYCODE_BACK) { if (mWebView.canGoBack()) { diff --git a/app/src/main/java/com/danvelazco/fbwrapper/util/OrbotHelper.java b/app/src/main/java/com/danvelazco/fbwrapper/util/OrbotHelper.java index f3ac18f..c4cd2d0 100644 --- a/app/src/main/java/com/danvelazco/fbwrapper/util/OrbotHelper.java +++ b/app/src/main/java/com/danvelazco/fbwrapper/util/OrbotHelper.java @@ -52,7 +52,7 @@ public boolean isOrbotInstalled() { private boolean isAppInstalled(String uri) { PackageManager pm = mContext.getPackageManager(); - boolean installed = false; + boolean installed; try { pm.getPackageInfo(uri, PackageManager.GET_ACTIVITIES); installed = true; diff --git a/app/src/main/res/layout/drawer_menu.xml b/app/src/main/res/layout/drawer_menu.xml index 734badf..448ce39 100644 --- a/app/src/main/res/layout/drawer_menu.xml +++ b/app/src/main/res/layout/drawer_menu.xml @@ -17,7 +17,7 @@ android:id="@+id/menu_drawer_right" android:layout_width="@dimen/navigation_drawer_width" android:layout_height="match_parent" - android:layout_gravity="end" + android:layout_gravity="start" android:orientation="vertical" android:clickable="false" android:focusable="false" @@ -33,38 +33,44 @@ - - + android:background="@color/blue_primary"> - + + + + @@ -96,6 +104,12 @@ android:id="@+id/menu_item_refresh" android:layout_width="match_parent" android:layout_height="@dimen/navigation_drawer_items_height" + android:paddingTop="@dimen/navigation_drawer_items_padding" + android:paddingLeft="@dimen/navigation_drawer_items_padding_left" + android:paddingStart="@dimen/navigation_drawer_items_padding_left" + android:paddingRight="@dimen/navigation_drawer_items_padding" + android:paddingEnd="@dimen/navigation_drawer_items_padding" + android:paddingBottom="@dimen/navigation_drawer_items_padding" android:padding="@dimen/navigation_drawer_items_padding" android:clickable="true" android:focusable="true" @@ -106,7 +120,7 @@ android:layout_width="@dimen/navigation_drawer_icon_size" android:layout_height="@dimen/navigation_drawer_icon_size" android:layout_centerVertical="true" - android:src="@android:drawable/ic_menu_rotate" + android:src="@drawable/ic_refresh_grey600_24dp" android:contentDescription="@string/menu_refresh" /> @@ -127,6 +143,12 @@ android:id="@+id/menu_item_newsfeed" android:layout_width="match_parent" android:layout_height="@dimen/navigation_drawer_items_height" + android:paddingTop="@dimen/navigation_drawer_items_padding" + android:paddingLeft="@dimen/navigation_drawer_items_padding_left" + android:paddingStart="@dimen/navigation_drawer_items_padding_left" + android:paddingRight="@dimen/navigation_drawer_items_padding" + android:paddingEnd="@dimen/navigation_drawer_items_padding" + android:paddingBottom="@dimen/navigation_drawer_items_padding" android:padding="@dimen/navigation_drawer_items_padding" android:clickable="true" android:focusable="true" @@ -137,8 +159,8 @@ android:layout_width="@dimen/navigation_drawer_icon_size" android:layout_height="@dimen/navigation_drawer_icon_size" android:layout_centerVertical="true" - android:src="@android:drawable/ic_menu_view" - android:contentDescription="@string/menu_refresh" /> + android:src="@drawable/ic_eye_grey600_24dp" + android:contentDescription="@string/menu_news_feed" /> @@ -158,6 +182,12 @@ android:id="@+id/menu_items_notifications" android:layout_width="match_parent" android:layout_height="@dimen/navigation_drawer_items_height" + android:paddingTop="@dimen/navigation_drawer_items_padding" + android:paddingLeft="@dimen/navigation_drawer_items_padding_left" + android:paddingStart="@dimen/navigation_drawer_items_padding_left" + android:paddingRight="@dimen/navigation_drawer_items_padding" + android:paddingEnd="@dimen/navigation_drawer_items_padding" + android:paddingBottom="@dimen/navigation_drawer_items_padding" android:padding="@dimen/navigation_drawer_items_padding" android:clickable="true" android:focusable="true" @@ -168,7 +198,7 @@ android:layout_width="@dimen/navigation_drawer_icon_size" android:layout_height="@dimen/navigation_drawer_icon_size" android:layout_centerVertical="true" - android:src="@android:drawable/ic_menu_info_details" + android:src="@drawable/ic_information_grey600_24dp" android:contentDescription="@string/menu_notifications" /> @@ -189,6 +221,12 @@ android:id="@+id/menu_item_messages" android:layout_width="match_parent" android:layout_height="@dimen/navigation_drawer_items_height" + android:paddingTop="@dimen/navigation_drawer_items_padding" + android:paddingLeft="@dimen/navigation_drawer_items_padding_left" + android:paddingStart="@dimen/navigation_drawer_items_padding_left" + android:paddingRight="@dimen/navigation_drawer_items_padding" + android:paddingEnd="@dimen/navigation_drawer_items_padding" + android:paddingBottom="@dimen/navigation_drawer_items_padding" android:padding="@dimen/navigation_drawer_items_padding" android:clickable="true" android:focusable="true" @@ -199,7 +237,7 @@ android:layout_width="@dimen/navigation_drawer_icon_size" android:layout_height="@dimen/navigation_drawer_icon_size" android:layout_centerVertical="true" - android:src="@android:drawable/ic_menu_edit" + android:src="@drawable/ic_pencil_grey600_24dp" android:contentDescription="@string/menu_messages" /> @@ -220,6 +260,12 @@ android:id="@+id/menu_share_this" android:layout_width="match_parent" android:layout_height="@dimen/navigation_drawer_items_height" + android:paddingTop="@dimen/navigation_drawer_items_padding" + android:paddingLeft="@dimen/navigation_drawer_items_padding_left" + android:paddingStart="@dimen/navigation_drawer_items_padding_left" + android:paddingRight="@dimen/navigation_drawer_items_padding" + android:paddingEnd="@dimen/navigation_drawer_items_padding" + android:paddingBottom="@dimen/navigation_drawer_items_padding" android:padding="@dimen/navigation_drawer_items_padding" android:clickable="true" android:focusable="true" @@ -230,7 +276,7 @@ android:layout_width="@dimen/navigation_drawer_icon_size" android:layout_height="@dimen/navigation_drawer_icon_size" android:layout_centerVertical="true" - android:src="@android:drawable/ic_menu_share" + android:src="@drawable/ic_share_variant_grey600_24dp" android:contentDescription="@string/menu_refresh" /> + + + + + + @@ -282,6 +361,12 @@ android:id="@+id/menu_about" android:layout_width="match_parent" android:layout_height="@dimen/navigation_drawer_items_height" + android:paddingTop="@dimen/navigation_drawer_items_padding" + android:paddingLeft="@dimen/navigation_drawer_items_padding_left" + android:paddingStart="@dimen/navigation_drawer_items_padding_left" + android:paddingRight="@dimen/navigation_drawer_items_padding" + android:paddingEnd="@dimen/navigation_drawer_items_padding" + android:paddingBottom="@dimen/navigation_drawer_items_padding" android:padding="@dimen/navigation_drawer_items_padding" android:clickable="true" android:focusable="true" @@ -292,7 +377,7 @@ android:layout_width="@dimen/navigation_drawer_icon_size" android:layout_height="@dimen/navigation_drawer_icon_size" android:layout_centerVertical="true" - android:src="@android:drawable/ic_menu_help" + android:src="@drawable/ic_help_circle_grey600_24dp" android:contentDescription="@string/menu_refresh" /> - - - - - - - - - - diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml new file mode 100644 index 0000000..6578dc3 --- /dev/null +++ b/app/src/main/res/values-it/strings.xml @@ -0,0 +1,120 @@ + + + + + + Tinfoil for Facebook + Tinfoil + + + Alert + Chiudi + OK + Caricamento video… + Scegli file + Si + No + Salva immagine + + + Condividi pagina corrente + Pagina Facebook + + + Desktop + Mobile + Torna in cima + Novità + Condividi + Copia URL + Aggiorna + Notifiche + Messaggi + Preferenze + Aiuto + Esci + + + Accesso Facebook + Generali + Proxy + Permetti localizzazione + Permetti all\'app di usare la localizzazione per taggare i luoghi + Apri link dentro l\'app + Qualsiasi link aperto dall\'app verrà aperto nell\'app stessa inveche che nel browser + Blocca immagini + Risparmia tempo e connessione impedendo all\'app di caricare le immagini + Nascondi la ActionBar + Nascondi automaticamente la ActionBar quando si scorre verso il basso. Scorri verso l\'alto per farla apparire di nuovo + Sito Mobile/Desktop + Forza l\'uso del sito in modalità desktop o mobile + Abilita proxy + Configura il proxy + Proxy host + Proxy port + + + Auto + Forza sito mobile + Forza sito desktop + Forza sito di base + Facebook Zero + Facebook.onion (richiede Orbot) + + + auto + mobile + desktop + base + zero + onion + + + Aiuto + Sviluppato da Daniel Velazco. Clicca qui per maggiori informazioni. + + + Immagine scaricata e salvata nella cartella download + Impossibile salvare immagine + + + market://search?q=pname:org.torproject.android + Avviare Orbot? + Orbot non è in esecuzione. Vuoi avviarlo e connetterti a Tor? + + + \nFacebook sta tentando di localizzarti.\n +\nProbabilmente stai cercando di \"taggarti\" in un luogo. Nonostante Tinfoil abbia i permessi per farlo, questi sono per default disabilitati.\n +\nPuoi abilitare questa opzione andando nelle preferenze e selezionando\"Permetti localizzazione\".\n +\nTinfoil ha accesso solo alla \"Localizzazione grossolana\", e non fa uso del GPS ma solo della rete e del Wi-Fi, allo scopo di risparmiare batteria.\n +\n + + + \nSviluppato da Daniel Velazco. +\nvelazcod@gmail.com +\nhttp://www.danvelazco.com\n +\n +\nSorgente: +\nhttps://github.com/velazcod/Tinfoil-Facebook\n +\n +\nQuest\'app è per quegli utenti che hanno bisogno di un \"cappello di alluminio\" quando si connettono a Facebook. Crea un reindirizzamento al sito mobile di Facebook. Richiede i permessi INTERNET, e se sei scettico, sentiti libero di verificare il sorgente. I permessi di localizzazione grezza sono richiesti ma non utilizzati, a meno che l\'opzione \"Permetti localizzazione\" nelle preferenze non sia selezionata.\n +\n + Altro + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index b6d8ac5..7312c6d 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -24,6 +24,7 @@ #aeaeae #888888 #555555 + #DE000000 #3B5998 #ff293c68 diff --git a/app/src/main/res/values/dimensions.xml b/app/src/main/res/values/dimensions.xml index bd7b78e..7103816 100644 --- a/app/src/main/res/values/dimensions.xml +++ b/app/src/main/res/values/dimensions.xml @@ -24,14 +24,14 @@ 14sp - 240dp + 264dp - 50dp - 5dp - 17sp - 5dp + 48dp + 12dp + 16dp + 20dp + 32dp 42dp - 30dp - + 24dp \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ae4b153..6b2a00f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -113,5 +113,5 @@ \n \nThis app is for those users that require a Tinfoil Hat when logging in to Facebook. It creates a sandbox for facebook\'s mobile site. Requires INTERNET permissions, and if you are skeptic about it, feel free to check the source code listed above. Coarse location permissions are required but location is not used unless you turn \"Allow Check-ins\" in the preferences.\n \n - + Other diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 66744fc..2a52c86 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -46,11 +46,4 @@ - -