Changed Resource names

LUGM · Oct 2, 2014 · 8758a59 · 8758a59
1 parent 063b6cb
commit 8758a59
Show file tree

Hide file tree

Showing 28 changed files with 106 additions and 105 deletions.
diff --git a/App/bin/Mobivision.apk b/App/bin/Mobivision.apk
diff --git a/App/bin/classes.dex b/App/bin/classes.dex
diff --git a/App/bin/classes/chipset/mobivision/DayOneActivity$1.class b/App/bin/classes/chipset/mobivision/DayOneActivity$1.class
diff --git a/App/bin/classes/chipset/mobivision/DayOneActivity$2.class b/App/bin/classes/chipset/mobivision/DayOneActivity$2.class
diff --git a/App/bin/classes/chipset/mobivision/DayOneActivity$3.class b/App/bin/classes/chipset/mobivision/DayOneActivity$3.class
diff --git a/App/bin/classes/chipset/mobivision/DayOneActivity.class b/App/bin/classes/chipset/mobivision/DayOneActivity.class
diff --git a/App/bin/classes/chipset/mobivision/DayThreeActivity$1.class b/App/bin/classes/chipset/mobivision/DayThreeActivity$1.class
diff --git a/App/bin/classes/chipset/mobivision/DayThreeActivity.class b/App/bin/classes/chipset/mobivision/DayThreeActivity.class
diff --git a/App/bin/classes/chipset/mobivision/DayTwoActivity$1.class b/App/bin/classes/chipset/mobivision/DayTwoActivity$1.class
diff --git a/App/bin/classes/chipset/mobivision/DayTwoActivity$2.class b/App/bin/classes/chipset/mobivision/DayTwoActivity$2.class
diff --git a/App/bin/classes/chipset/mobivision/DayTwoActivity$3.class b/App/bin/classes/chipset/mobivision/DayTwoActivity$3.class
diff --git a/App/bin/classes/chipset/mobivision/DayTwoActivity$4.class b/App/bin/classes/chipset/mobivision/DayTwoActivity$4.class
diff --git a/App/bin/classes/chipset/mobivision/DayTwoActivity$5.class b/App/bin/classes/chipset/mobivision/DayTwoActivity$5.class
diff --git a/App/bin/classes/chipset/mobivision/DayTwoActivity$6.class b/App/bin/classes/chipset/mobivision/DayTwoActivity$6.class
diff --git a/App/bin/classes/chipset/mobivision/DayTwoActivity.class b/App/bin/classes/chipset/mobivision/DayTwoActivity.class
diff --git a/App/bin/classes/chipset/mobivision/ListViewAdapter.class b/App/bin/classes/chipset/mobivision/ListViewAdapter.class
diff --git a/App/bin/classes/chipset/mobivision/R$id.class b/App/bin/classes/chipset/mobivision/R$id.class
diff --git a/App/bin/dexedLibs/android-support-v4-72ea86cd88da8377ab1e65244f257655.jar b/App/bin/dexedLibs/android-support-v4-72ea86cd88da8377ab1e65244f257655.jar
diff --git a/App/bin/dexedLibs/picasso-2.3.4-fd24a2e20751788475f5b87a71503fad.jar b/App/bin/dexedLibs/picasso-2.3.4-fd24a2e20751788475f5b87a71503fad.jar
diff --git a/App/bin/resources.ap_ b/App/bin/resources.ap_
diff --git a/App/gen/chipset/mobivision/R.java b/App/gen/chipset/mobivision/R.java
@@ -20,28 +20,28 @@ public static final class drawable {
         public static final int image5=0x7f020006;
     }
     public static final class id {
-        public static final int Button1=0x7f060001;
-        public static final int Button2=0x7f060003;
-        public static final int Button3=0x7f060004;
-        public static final int Button4=0x7f060005;
-        public static final int calc=0x7f060010;
-        public static final int gotoDay3=0x7f060012;
-        public static final int image=0x7f060013;
-        public static final int input=0x7f060007;
+        public static final int counterTextView=0x7f060002;
+        public static final int dayThreeIntentButton=0x7f060012;
+        public static final int dayTwoIntentButton=0x7f060005;
+        public static final int decrementButton=0x7f060004;
+        public static final int hideShowButton=0x7f060001;
+        public static final int imageView=0x7f060013;
+        public static final int incrementButton=0x7f060003;
+        public static final int inputLayout=0x7f060007;
         public static final int listView=0x7f060006;
-        public static final int num1=0x7f060008;
-        public static final int num2=0x7f06000a;
-        public static final int op=0x7f060009;
-        public static final int op1=0x7f06000c;
-        public static final int op2=0x7f06000d;
-        public static final int op3=0x7f06000e;
-        public static final int op4=0x7f06000f;
-        public static final int operation=0x7f06000b;
-        public static final int res=0x7f060011;
-        public static final int textView1=0x7f060000;
-        public static final int textView2=0x7f060002;
-        public static final int tv1=0x7f060014;
-        public static final int tv2=0x7f060015;
+        public static final int numOneEditText=0x7f060008;
+        public static final int numTwoEditText=0x7f06000a;
+        public static final int operationFourButton=0x7f06000f;
+        public static final int operationLayout=0x7f06000b;
+        public static final int operationOneButton=0x7f06000c;
+        public static final int operationThreeButton=0x7f06000e;
+        public static final int operationTwoButton=0x7f06000d;
+        public static final int opertationTextView=0x7f060009;
+        public static final int resultButton=0x7f060010;
+        public static final int resultTextView=0x7f060011;
+        public static final int someTextTextView=0x7f060000;
+        public static final int subtitleTextView=0x7f060015;
+        public static final int titleTextView=0x7f060014;
     }
     public static final class layout {
         public static final int activity_day_one=0x7f030000;

diff --git a/App/res/layout/activity_day_one.xml b/App/res/layout/activity_day_one.xml
@@ -5,21 +5,21 @@
     android:orientation="vertical" >
 
     <TextView
-        android:id="@+id/textView1"
+        android:id="@+id/someTextTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:text="Some Text" />
 
     <Button
-        android:id="@+id/Button1"
+        android:id="@+id/hideShowButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:text="Hide/Show" />
 
     <TextView
-        android:id="@+id/textView2"
+        android:id="@+id/counterTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -29,21 +29,21 @@
         android:textStyle="bold" />
 
     <Button
-        android:id="@+id/Button2"
+        android:id="@+id/incrementButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:text="Increase" />
 
     <Button
-        android:id="@+id/Button3"
+        android:id="@+id/decrementButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:text="Decrease" />
 
     <Button
-        android:id="@+id/Button4"
+        android:id="@+id/dayTwoIntentButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="50dp"

diff --git a/App/res/layout/activity_day_two.xml b/App/res/layout/activity_day_two.xml
@@ -3,29 +3,30 @@
     android:layout_height="match_parent" >
 
     <LinearLayout
-        android:id="@+id/input"
+        android:id="@+id/inputLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:orientation="horizontal"
         android:padding="15dp" >
 
         <EditText
-            android:id="@+id/num1"
+            android:id="@+id/numOneEditText"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="0.4"
             android:hint="Num 1"
             android:inputType="number" />
 
         <TextView
-            android:id="@+id/op"
+            android:id="@+id/opertationTextView"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="0.2" />
+            android:layout_weight="0.2"
+            android:gravity="center" />
 
         <EditText
-            android:id="@+id/num2"
+            android:id="@+id/numTwoEditText"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="0.4"
@@ -34,39 +35,39 @@
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/operation"
+        android:id="@+id/operationLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:orientation="horizontal"
         android:padding="15dp" >
 
         <Button
-            android:id="@+id/op1"
+            android:id="@+id/operationOneButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="0.25"
             android:text="+" >
         </Button>
 
         <Button
-            android:id="@+id/op2"
+            android:id="@+id/operationTwoButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="0.25"
             android:text="-" >
         </Button>
 
         <Button
-            android:id="@+id/op3"
+            android:id="@+id/operationThreeButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="0.25"
             android:text="*" >
         </Button>
 
         <Button
-            android:id="@+id/op4"
+            android:id="@+id/operationFourButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="0.25"
@@ -75,25 +76,25 @@
     </LinearLayout>
 
     <Button
-        android:id="@+id/calc"
+        android:id="@+id/resultButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/operation"
+        android:layout_below="@id/operationLayout"
         android:layout_centerHorizontal="true"
         android:text="=" />
 
     <TextView
-        android:id="@+id/res"
+        android:id="@+id/resultTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/calc"
+        android:layout_below="@id/resultButton"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="15dp"
         android:text="Result"
         android:textSize="20sp" />
 
     <Button
-        android:id="@+id/gotoDay3"
+        android:id="@+id/dayThreeIntentButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"

diff --git a/App/res/layout/list_item.xml b/App/res/layout/list_item.xml
@@ -14,7 +14,7 @@
         android:padding="15dp" >
 
         <ImageView
-            android:id="@+id/image"
+            android:id="@+id/imageView"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="0.3"
@@ -28,7 +28,7 @@
             android:orientation="vertical" >
 
             <TextView
-                android:id="@+id/tv1"
+                android:id="@+id/titleTextView"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="0.5"
@@ -39,7 +39,7 @@
                 android:textStyle="bold|italic" />
 
             <TextView
-                android:id="@+id/tv2"
+                android:id="@+id/subtitleTextView"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="0.5"

diff --git a/App/src/chipset/mobivision/DayOneActivity.java b/App/src/chipset/mobivision/DayOneActivity.java
@@ -10,8 +10,8 @@
 
 public class DayOneActivity extends Activity {
 
-	TextView textView1, textView2;
-	Button button1, button2, button3, button4;
+	TextView someTextTextView, counterTextView;
+	Button hideShowButton, incrementButton, decrementButton, dayTwoIntentButton;
 	boolean flag = true;
 	int x = 0;
 
@@ -21,46 +21,46 @@ protected void onCreate(Bundle savedInstanceState) {
 		getActionBar().setTitle(
 				getResources().getString(R.string.title_activity_day_one));
 		setContentView(R.layout.activity_day_one);
-		textView1 = (TextView) findViewById(R.id.textView1);
-		button1 = (Button) findViewById(R.id.Button1);
-		textView2 = (TextView) findViewById(R.id.textView2);
-		button2 = (Button) findViewById(R.id.Button2);
-		button3 = (Button) findViewById(R.id.Button3);
-		button4 = (Button) findViewById(R.id.Button4);
+		someTextTextView = (TextView) findViewById(R.id.someTextTextView);
+		hideShowButton = (Button) findViewById(R.id.hideShowButton);
+		counterTextView = (TextView) findViewById(R.id.counterTextView);
+		incrementButton = (Button) findViewById(R.id.incrementButton);
+		decrementButton = (Button) findViewById(R.id.decrementButton);
+		dayTwoIntentButton = (Button) findViewById(R.id.dayTwoIntentButton);
 
-		button1.setOnClickListener(new OnClickListener() {
+		hideShowButton.setOnClickListener(new OnClickListener() {
 
 			@Override
 			public void onClick(View arg0) {
 				if (flag == true) {
-					textView1.setVisibility(View.GONE);
+					someTextTextView.setVisibility(View.GONE);
 					flag = false;
 				} else {
-					textView1.setVisibility(View.VISIBLE);
+					someTextTextView.setVisibility(View.VISIBLE);
 					flag = true;
 				}
 
 			}
 		});
 
-		button2.setOnClickListener(new OnClickListener() {
+		incrementButton.setOnClickListener(new OnClickListener() {
 
 			@Override
 			public void onClick(View arg0) {
-				textView2.setText(String.valueOf(x++));
+				counterTextView.setText(String.valueOf(x++));
 
 			}
 		});
-		button3.setOnClickListener(new OnClickListener() {
+		decrementButton.setOnClickListener(new OnClickListener() {
 
 			@Override
 			public void onClick(View arg0) {
-				textView2.setText(String.valueOf(x--));
+				counterTextView.setText(String.valueOf(x--));
 
 			}
 		});
 
-		button4.setOnClickListener(new OnClickListener() {
+		dayTwoIntentButton.setOnClickListener(new OnClickListener() {
 
 			@Override
 			public void onClick(View arg0) {

diff --git a/App/src/chipset/mobivision/DayThreeActivity.java b/App/src/chipset/mobivision/DayThreeActivity.java
@@ -18,9 +18,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
 		ListView list = (ListView) findViewById(R.id.listView);
 
-		final String text1[] = { "Hello", "Android", "Workshop", "Custom",
-				"ListView" };
-		final String text2[] = { "Hi", "This", "is", "really", "nice" };
+		final String text1[] = { "Hi", "is", "ListView", "Turing", "AppDev" };
+		final String text2[] = { "This", "custom", "in", "Android", "Workshop" };
 		int[] images = { R.drawable.image1, R.drawable.image2,
 				R.drawable.image3, R.drawable.image4, R.drawable.image5 };