From f126f87917e8cd2e93009776f879e9571823cd4a Mon Sep 17 00:00:00 2001
From: David Barnes <dbarnes@kvcc.edu>
Date: Sun, 8 Nov 2015 22:11:06 -0500
Subject: [PATCH] Moved the beverage list to a location that can be loaded at
run time. Renamed the main activity from Wine to Beverage.
---
app/src/main/AndroidManifest.xml | 2 +-
.../{WineActivity.java => BeverageActivity.java} | 2 +-
.../BeverageList.csv => app/src/main/res/raw/beverage_list.csv | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename app/src/main/java/edu/kvcc/cis298/cis298assignment3/{WineActivity.java => BeverageActivity.java} (83%)
rename datafiles/BeverageList.csv => app/src/main/res/raw/beverage_list.csv (100%)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0c56e18..759c11d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
android:label="@string/app_name"
android:theme="@style/AppTheme" >
<activity
- android:name=".WineActivity"
+ android:name=".BeverageActivity"
android:label="@string/app_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/edu/kvcc/cis298/cis298assignment3/WineActivity.java b/app/src/main/java/edu/kvcc/cis298/cis298assignment3/BeverageActivity.java
similarity index 83%
rename from app/src/main/java/edu/kvcc/cis298/cis298assignment3/WineActivity.java
rename to app/src/main/java/edu/kvcc/cis298/cis298assignment3/BeverageActivity.java
index 8056b82..fc56582 100644
--- a/app/src/main/java/edu/kvcc/cis298/cis298assignment3/WineActivity.java
+++ b/app/src/main/java/edu/kvcc/cis298/cis298assignment3/BeverageActivity.java
@@ -3,7 +3,7 @@ package edu.kvcc.cis298.cis298assignment3;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
-public class WineActivity extends AppCompatActivity {
+public class BeverageActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
diff --git a/datafiles/BeverageList.csv b/app/src/main/res/raw/beverage_list.csv
similarity index 100%
rename from datafiles/BeverageList.csv
rename to app/src/main/res/raw/beverage_list.csv
--
GitLab