Skip to content

Commit

Permalink
re #1: Added default display drink activity.
Browse files Browse the repository at this point in the history
  • Loading branch information
randomcoder committed Aug 5, 2012
1 parent fc5b519 commit b6e0dfa
Show file tree
Hide file tree
Showing 7 changed files with 77 additions and 5 deletions.
2 changes: 1 addition & 1 deletion client/.settings/org.scala-ide.sdt.core.prefs
Expand Up @@ -31,7 +31,7 @@ optimise=false
organizeimports.expandcollapse=collapse
organizeimports.groups=java$scala$org$com$uk.co.randomcoding
organizeimports.useProjectSpecificSettings=true
organizeimports.wildcards=uk.co.randomcoding.drinkfinder.android.util.TestDrinks$uk.co.randomcoding.drinkfinder.android.util.ExternalStorageHelper$uk.co.randomcoding.drinkfinder.android.util.DrinkSearcher$net.liftweb.record.field$uk.co.randomcoding.scala.util.lift.mongodb.MongoFieldHelpers$com.foursquare.rogue.Rogue$net.liftweb.json.JsonDSL$com.mongodb.casbah.commons.Imports$uk.co.randomcoding.drinkfinder.model.drink$uk.co.randomcoding.drinkfinder.lib.TransformUtils$uk.co.randomcoding.drinkfinder.model.matcher.id$uk.co.randomcoding.scala.util.core.string.StringHelpers$scalaz$scalaz.Scalaz
organizeimports.wildcards=uk.co.randomcoding.drinkfinder.android.util.ViewHelpers$uk.co.randomcoding.drinkfinder.android.util.TestDrinks$uk.co.randomcoding.drinkfinder.android.util.ExternalStorageHelper$uk.co.randomcoding.drinkfinder.android.util.DrinkSearcher$net.liftweb.record.field$uk.co.randomcoding.scala.util.lift.mongodb.MongoFieldHelpers$com.foursquare.rogue.Rogue$net.liftweb.json.JsonDSL$com.mongodb.casbah.commons.Imports$uk.co.randomcoding.drinkfinder.model.drink$uk.co.randomcoding.drinkfinder.lib.TransformUtils$uk.co.randomcoding.drinkfinder.model.matcher.id$uk.co.randomcoding.scala.util.core.string.StringHelpers$scalaz$scalaz.Scalaz
scala.compiler.useProjectSettings=false
stopBuildOnError=false
target=jvm-1.5
Expand Down
7 changes: 7 additions & 0 deletions client/AndroidManifest.xml
Expand Up @@ -38,6 +38,13 @@
android:name="android.support.PARENT_ACTIVITY"
android:value="uk.co.randomcoding.drinkfinder.android.MainActivity" />
</activity>
<activity
android:name=".DisplayDrinkActivity"
android:label="@string/title_activity_display_drink" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="uk.co.randomcoding.drinkfinder.android.MainActivity" />
</activity>
</application>

<uses-sdk android:minSdkVersion="10" />
Expand Down
15 changes: 15 additions & 0 deletions client/res/layout/activity_display_drink.xml
@@ -0,0 +1,15 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent" >

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:padding="@dimen/padding_medium"
android:text="@string/hello_world"
tools:context=".DisplayDrinkActivity" />

</RelativeLayout>
14 changes: 10 additions & 4 deletions client/res/layout/activity_display_results.xml
Expand Up @@ -6,10 +6,16 @@
android:orientation="vertical" >

<TextView
android:layout_width="wrap_content"
android:id="@+id/drinkResultsTitle"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:padding="@dimen/padding_medium"
android:text="@string/hello_world"
tools:context=".DisplayResultsActivity" />
android:text="@string/drink_results_title"
android:textAppearance="?android:attr/textAppearanceLarge" />

<TableLayout
android:id="@+id/drinkResultsTableLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
</TableLayout>

</LinearLayout>
5 changes: 5 additions & 0 deletions client/res/menu/activity_display_drink.xml
@@ -0,0 +1,5 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/menu_settings"
android:title="@string/menu_settings"
android:orderInCategory="100" />
</menu>
2 changes: 2 additions & 0 deletions client/res/values/strings.xml
Expand Up @@ -24,11 +24,13 @@
<string name="drink_name_search_hint">Name Contains…</string>
<string name="drink_description_search_hint">Description Contains…</string>
<string name="drink_search_button_test">Find Drinks…</string>
<string name="drink_results_title">Drink Results</string>

<string-array name="available_festival_names">
<item>Worcester CAMRA Beer, Cider &amp; Perry</item>
</string-array>

<string name="title_activity_display_results">Search Results</string>
<string name="title_activity_display_drink">Display Drink</string>

</resources>
@@ -0,0 +1,37 @@
/**
* Copyright (C) 2012 - RandomCoder <randomcoder@randomcoding.co.uk>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Contributors:
* RandomCoder <randomcoder@randomcoding.co.uk> - initial API and implementation and/or initial documentation
*/
package uk.co.randomcoding.drinkfinder.android

import android.app.Activity
import android.os.Bundle

/**
* TODO: Comment for
*
* @author RandomCoder <randomcoder@randomcoding.co.uk>
*
* Created On: 5 Aug 2012
*/
class DisplayDrinkActivity extends Activity with TypedActivity {

override def onCreate(savedState: Bundle) {
super.onCreate(savedState)
}
}

0 comments on commit b6e0dfa

Please sign in to comment.