Skip to content

Commit

Permalink
Added a grid activity and a login/register activity
Browse files Browse the repository at this point in the history
  • Loading branch information
timothyandrew committed Oct 3, 2011
1 parent 29429c2 commit e209b82
Show file tree
Hide file tree
Showing 17 changed files with 247 additions and 28 deletions.
18 changes: 18 additions & 0 deletions InstaDroid/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
.DS_Store
.DS_Store
# built application files
*.apk
*.ap_

# files for the dex VM
*.dex

# Java class files
*.class

# generated files
bin/
gen/

# Local configuration file (sdk path, etc)
local.properties
12 changes: 9 additions & 3 deletions InstaDroid/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,19 @@
<uses-sdk android:minSdkVersion="8" />

<application android:icon="@drawable/icon" android:label="@string/app_name">
<activity android:name=".InstaDroid"
android:label="@string/app_name">
<intent-filter>
<activity android:name=".ImageIndexActivity"
android:label="@string/app_name"
android:theme="@android:style/Theme.NoTitleBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<activity android:name=".LoginRegisterActivity"
android:label="Login/Register"
android:theme="@android:style/Theme.NoTitleBar">
</activity>

</application>
</manifest>
Binary file removed InstaDroid/bin/InstaDroid.apk
Binary file not shown.
Binary file removed InstaDroid/bin/classes.dex
Binary file not shown.
Binary file removed InstaDroid/bin/resources.ap_
Binary file not shown.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
41 changes: 41 additions & 0 deletions InstaDroid/res/layout/image_index.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/indexlayout"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center"
android:orientation="vertical">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/indexlayout"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="20dp">
<Button
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_weight="1"
android:text="Login"
android:id="@+id/login_button"
android:textSize="20dp"/>
<Button
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_weight="1"
android:text="Register"
android:id="@+id/register_button"
android:textSize="20dp" />
</LinearLayout>
<GridView
android:id="@+id/gridview"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:columnWidth="90dp"
android:numColumns="auto_fit"
android:verticalSpacing="20dp"
android:horizontalSpacing="20dp"
android:stretchMode="columnWidth"
android:padding="20dp"
android:gravity="center"
/>
</LinearLayout>
49 changes: 49 additions & 0 deletions InstaDroid/res/layout/login.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/appname_label"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textSize="50dp"
android:text="App Name"
android:gravity="center"
android:layout_marginTop="80dp"
android:layout_marginBottom="50dp"/>

<EditText
android:id="@+id/username"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@android:drawable/editbox_background"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:hint="Username"
android:typeface="monospace"
android:textSize="20dp"/>
<EditText
android:id="@+id/password"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@android:drawable/editbox_background"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:hint="Password"
android:layout_marginTop="10dp"
android:typeface="monospace"
android:textSize="20dp"/>

<Button
android:id="@+id/ok"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/password"
android:gravity="center"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="19dp"
android:textSize="15dp" />
</LinearLayout>
12 changes: 0 additions & 12 deletions InstaDroid/res/layout/main.xml

This file was deleted.

51 changes: 51 additions & 0 deletions InstaDroid/src/com/cmrit/instadroid/ImageAdapter.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package com.cmrit.instadroid;

import android.content.Context;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
import android.widget.GridView;
import android.widget.ImageView;

public class ImageAdapter extends BaseAdapter {
private Context mContext;

public ImageAdapter(Context c) {
mContext = c;
}

public int getCount() {
return mThumbIds.length;
}

public Object getItem(int position) {
return null;
}

public long getItemId(int position) {
return 0;
}

// create a new ImageView for each item referenced by the Adapter
public View getView(int position, View convertView, ViewGroup parent) {
ImageView imageView;
if (convertView == null) { // if it's not recycled, initialize some attributes
imageView = new ImageView(mContext);
imageView.setLayoutParams(new GridView.LayoutParams(200, 200));
imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
imageView.setPadding(25, 25, 25, 25);
} else {
imageView = (ImageView) convertView;
}

imageView.setImageResource(mThumbIds[position]);
return imageView;
}

// references to our images
private Integer[] mThumbIds = {
R.drawable.pic1, R.drawable.pic2,
R.drawable.pic3, R.drawable.pic4,
R.drawable.pic5
};
}
51 changes: 51 additions & 0 deletions InstaDroid/src/com/cmrit/instadroid/ImageIndexActivity.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package com.cmrit.instadroid;

import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.Button;
import android.widget.GridView;
import android.widget.Toast;

public class ImageIndexActivity extends Activity {
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.image_index);

GridView gridView = (GridView) findViewById(R.id.gridview);
gridView.setAdapter(new ImageAdapter(this));

gridView.setOnItemClickListener(new OnItemClickListener() {
public void onItemClick(AdapterView<?> parent, View v, int position, long id){
Toast toast = Toast.makeText(ImageIndexActivity.this, "You clicked " + position, Toast.LENGTH_SHORT);
toast.show();
}
});

Button loginButton = (Button) findViewById(R.id.login_button);
loginButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(ImageIndexActivity.this, LoginRegisterActivity.class);
intent.putExtra("currentState", "login");
startActivity(intent);
}
});

Button registerButton = (Button) findViewById(R.id.register_button);
registerButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(ImageIndexActivity.this, LoginRegisterActivity.class);
intent.putExtra("currentState", "register");
startActivity(intent);
}
});
}
}
13 changes: 0 additions & 13 deletions InstaDroid/src/com/cmrit/instadroid/InstaDroid.java

This file was deleted.

28 changes: 28 additions & 0 deletions InstaDroid/src/com/cmrit/instadroid/LoginRegisterActivity.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package com.cmrit.instadroid;

import android.app.Activity;
import android.os.Bundle;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.Toast;

public class LoginRegisterActivity extends Activity {
private String currentState;

@Override
public void onCreate(Bundle savedInstanceState){
super.onCreate(savedInstanceState);
setContentView(R.layout.login);

Bundle b = getIntent().getExtras();
currentState = b.getString("currentState");

Button ok = (Button) findViewById(R.id.ok);
if(currentState.equals("login")){
ok.setText("Login");
} else {
ok.setText("Register");
}
}
}

0 comments on commit e209b82

Please sign in to comment.