Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 11:49:04 +01:00
Code Issues Projects Releases Wiki Activity

Padding now depends on screen size. Closes dev task #57.

Browse Source
This commit is contained in:
akwizgran
2014-01-09 12:42:19 +00:00
parent 452f8bd7e1
commit 0cebc42ddb
34 changed files with 227 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/org/briarproject/android/util/HorizontalSpace.java → briar-android/src/org/briarproject/android/util/ElasticHorizontalSpace.java
View File

@@ -5,9 +5,9 @@ import android.content.Context;
import android.view.View;
import android.widget.LinearLayout.LayoutParams;
public class HorizontalSpace extends View {
public class ElasticHorizontalSpace extends View {
public HorizontalSpace(Context ctx) {
public ElasticHorizontalSpace(Context ctx) {
super(ctx);
setLayoutParams(new LayoutParams(WRAP_CONTENT, 0, 1));
}

15
briar-android/src/org/briarproject/android/util/FixedVerticalSpace.java Normal file
View File

@@ -0,0 +1,15 @@
package org.briarproject.android.util;
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
import android.content.Context;
import android.view.View;
import android.widget.LinearLayout.LayoutParams;
public class FixedVerticalSpace extends View {
public FixedVerticalSpace(Context ctx) {
super(ctx);
int pad = LayoutUtils.getPadding(ctx);
setLayoutParams(new LayoutParams(WRAP_CONTENT, pad));
}
}

6
briar-android/src/org/briarproject/android/util/HorizontalBorder.java
View File

@@ -1,9 +1,10 @@
package org.briarproject.android.util;
import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
import org.briarproject.R;
import android.content.Context;
import android.content.res.Resources;
import android.view.View;
import android.widget.LinearLayout.LayoutParams;
@@ -11,8 +12,7 @@ public class HorizontalBorder extends View {
public HorizontalBorder(Context ctx) {
super(ctx);
Resources res = ctx.getResources();
int width = res.getInteger(R.integer.horizontal_border_width);
int width = LayoutUtils.getSeparatorWidth(ctx);
setLayoutParams(new LayoutParams(MATCH_PARENT, width));
setBackgroundColor(getResources().getColor(R.color.horizontal_border));
}

24
briar-android/src/org/briarproject/android/util/LayoutUtils.java Normal file
View File

@@ -0,0 +1,24 @@
package org.briarproject.android.util;
import static android.content.Context.WINDOW_SERVICE;
import android.content.Context;
import android.util.DisplayMetrics;
import android.view.WindowManager;
public class LayoutUtils {
public static int getSeparatorWidth(Context ctx) {
return Math.max(2, getMaxDisplayDimension(ctx) / 100 - 6);
}
public static int getPadding(Context ctx) {
return getMaxDisplayDimension(ctx) / 100 + 7;
}
private static int getMaxDisplayDimension(Context ctx) {
DisplayMetrics metrics = new DisplayMetrics();
WindowManager wm = (WindowManager) ctx.getSystemService(WINDOW_SERVICE);
wm.getDefaultDisplay().getMetrics(metrics);
return Math.max(metrics.widthPixels, metrics.heightPixels);
}
}