Skip to content

Commit

Permalink
Adding loading screen, and some minor layout changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Peter Krenesky committed May 26, 2010
1 parent 9bae164 commit b0bde5f
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 11 deletions.
7 changes: 5 additions & 2 deletions AndroidManifest.xml
Expand Up @@ -4,16 +4,19 @@
android:versionCode="1"
android:versionName="1.0">
<application android:icon="@drawable/icon" android:label="@string/app_name">
<activity android:name=".OpenSourceBridgeSchedule"
<activity android:name=".OpenSourceBridge"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".OpenSourceBridgeSchedule"
android:label="@string/app_name">
</activity>

</application>
<uses-permission android:name="android.permission.INTERNET" />
<uses-sdk android:minSdkVersion="7" />
<uses-sdk android:minSdkVersion="3" />

</manifest>
2 changes: 1 addition & 1 deletion default.properties
Expand Up @@ -10,4 +10,4 @@
# Indicates whether an apk should be generated for each density.
split.density=false
# Project target.
target=android-7
target=android-3
Binary file added res/drawable/logo.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 32 additions & 0 deletions res/layout/loading.xml
@@ -0,0 +1,32 @@
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center"
android:background="#FFF"
android:orientation="vertical"
xmlns:android="http://schemas.android.com/apk/res/android">

<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/logo"
android:layout_marginBottom="35dip"
/>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="The conference for open source citizens"
android:textColor="#222222"
android:textStyle="bold"
android:layout_marginBottom="5dip"
/>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="June 1–4, 2010 | Portland, Oregon"
android:textColor="#08B9A6"
android:textStyle="bold"
/>
</LinearLayout>
13 changes: 6 additions & 7 deletions res/layout/main.xml
Expand Up @@ -4,20 +4,21 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
xmlns:android="http://schemas.android.com/apk/res/android"
android:background="#191919"
>

<ListView
android:id="@+id/events"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="#000"
/>


<LinearLayout
android:id="@+id/detail"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
android:orientation="vertical"
android:background="#191919"
>
<LinearLayout
android:id="@+id/detail"
android:layout_width="fill_parent"
Expand All @@ -31,16 +32,14 @@
android:text="Back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>

/>
<TextView
android:id="@+id/title"
android:text="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#fff"
/>

<LinearLayout
android:id="@+id/detail"
android:layout_width="fill_parent"
Expand Down
2 changes: 1 addition & 1 deletion src/org/osb/OpenSourceBridgeSchedule.java
Expand Up @@ -49,7 +49,7 @@ public class OpenSourceBridgeSchedule extends Activity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
setContentView(R.layout.main);

mBack = (Button) findViewById(R.id.back);
mFlipper = (ViewFlipper) findViewById(R.id.flipper);
Expand Down

0 comments on commit b0bde5f

Please sign in to comment.