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

Show logo in splash screen.

Browse Source
This commit is contained in:
akwizgran
2014-02-05 12:36:40 +00:00
parent 3a036551c3
commit f62d964332
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
briar-android/res/drawable/briar_logo_large.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

16
briar-android/src/org/briarproject/android/SplashScreenActivity.java
View File

@@ -8,14 +8,17 @@ import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.briarproject.R;
import org.briarproject.android.util.LayoutUtils;
import org.briarproject.api.db.DatabaseConfig; import org.briarproject.api.db.DatabaseConfig;
import roboguice.RoboGuice; import roboguice.RoboGuice;
import roboguice.activity.RoboSplashActivity; import roboguice.activity.RoboSplashActivity;
import android.content.Intent; import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle; import android.os.Bundle;
import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.ProgressBar;
import com.google.inject.Injector; import com.google.inject.Injector;
@@ -30,7 +33,7 @@ public class SplashScreenActivity extends RoboSplashActivity {
private long start = System.currentTimeMillis(); private long start = System.currentTimeMillis();
public SplashScreenActivity() { public SplashScreenActivity() {
minDisplayMs = 0; minDisplayMs = 500;
} }
@Override @Override
@@ -40,9 +43,12 @@ public class SplashScreenActivity extends RoboSplashActivity {
LinearLayout layout = new LinearLayout(this); LinearLayout layout = new LinearLayout(this);
layout.setLayoutParams(MATCH_MATCH); layout.setLayoutParams(MATCH_MATCH);
layout.setGravity(CENTER); layout.setGravity(CENTER);
ProgressBar spinner = new ProgressBar(this); layout.setBackgroundColor(Color.WHITE);
spinner.setIndeterminate(true); int pad = LayoutUtils.getLargeItemPadding(this);
layout.addView(spinner); ImageView logo = new ImageView(this);
logo.setPadding(pad, pad, pad, pad);
logo.setImageResource(R.drawable.briar_logo_large);
layout.addView(logo);
setContentView(layout); setContentView(layout);
} }

17
briar-android/src/org/briarproject/android/util/LayoutUtils.java
View File

@@ -8,17 +8,26 @@ import android.view.WindowManager;
public class LayoutUtils { public class LayoutUtils {
public static int getSeparatorWidth(Context ctx) { public static int getSeparatorWidth(Context ctx) {
return Math.max(2, getMaxDisplayDimension(ctx) / 100 - 6); DisplayMetrics metrics = getDisplayMetrics(ctx);
int percent = Math.max(metrics.widthPixels, metrics.heightPixels) / 100;
return Math.max(2, percent - 6);
} }
public static int getPadding(Context ctx) { public static int getPadding(Context ctx) {
return getMaxDisplayDimension(ctx) / 100 + 7; DisplayMetrics metrics = getDisplayMetrics(ctx);
int percent = Math.max(metrics.widthPixels, metrics.heightPixels) / 100;
return percent + 7;
} }
private static int getMaxDisplayDimension(Context ctx) { public static int getLargeItemPadding(Context ctx) {
DisplayMetrics metrics = getDisplayMetrics(ctx);
return Math.min(metrics.widthPixels, metrics.heightPixels) / 4;
}
private static DisplayMetrics getDisplayMetrics(Context ctx) {
DisplayMetrics metrics = new DisplayMetrics(); DisplayMetrics metrics = new DisplayMetrics();
WindowManager wm = (WindowManager) ctx.getSystemService(WINDOW_SERVICE); WindowManager wm = (WindowManager) ctx.getSystemService(WINDOW_SERVICE);
wm.getDefaultDisplay().getMetrics(metrics); wm.getDefaultDisplay().getMetrics(metrics);
return Math.max(metrics.widthPixels, metrics.heightPixels); return metrics;
} }
} }