mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Show application name on larger screens 

Fixes #332
This commit is contained in:
M66B 2016-02-21 12:39:24 +01:00
parent 48bafdcf00
commit 144b1e3a67
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/eu/faircode/netguard/ActivityMain.java
View File

@ -26,6 +26,7 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.net.Uri;
@ -136,9 +137,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
swEnabled = (SwitchCompat) actionView.findViewById(R.id.swEnabled);
ivMetered = (ImageView) actionView.findViewById(R.id.ivMetered);
// Icon, no title
getSupportActionBar().setTitle(null);
// Icon
ivIcon.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View view) {
@ -147,6 +146,12 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
}
});
// Title
getSupportActionBar().setTitle(null);
if ((getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK)
== Configuration.SCREENLAYOUT_SIZE_LARGE)
actionView.findViewById(R.id.tvTitle).setVisibility(View.VISIBLE);
// Netguard is busy
ivQueue.setOnLongClickListener(new View.OnLongClickListener() {
@Override

11
app/src/main/res/layout/actionmain.xml
View File

@ -21,6 +21,17 @@
android:src="@drawable/ic_hourglass_empty_white_24dp"
android:visibility="gone" />
<TextView
android:id="@+id/tvTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:text="@string/app_name"
android:textAppearance="@style/TextLarge"
android:visibility="gone" />
<android.support.v7.widget.SwitchCompat
android:id="@+id/swEnabled"
android:layout_width="wrap_content"