Makeshift Deploy

v1.0!
el1t · Dec 1, 2014 · 0c858ba · 0c858ba
1 parent db43ff5
commit 0c858ba
Show file tree

Hide file tree

Showing 13 changed files with 79 additions and 54 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/Iolite.iml b/Iolite.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff --git a/app/app.iml b/app/app.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="iolite" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Iolite" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -81,11 +81,11 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="support-annotations-21.0.2" level="project" />
     <orderEntry type="library" exported="" name="support-v4-21.0.2" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-21.0.2" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-21.0.2" level="project" />
-    <orderEntry type="library" exported="" name="cardview-v7-21.0.2" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-21.0.2" level="project" />
+    <orderEntry type="library" exported="" name="cardview-v7-21.0.2" level="project" />
   </component>
 </module>
 
diff --git a/app/src/main/java/com/el1t/iolite/AboutFragment.java b/app/src/main/java/com/el1t/iolite/AboutFragment.java
@@ -21,7 +21,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 		final View rootView = inflater.inflate(R.layout.fragment_about, container, false);
 		final ArrayList<AboutItem> items = new ArrayList<AboutItem>();
 		items.add(new AboutItem("Iolite", "©2014 Ellis Tsung"));
-		items.add(new AboutItem("Version", "0.7b"));
+		items.add(new AboutItem("Version", "1.0"));
 		items.add(new AboutItem("Intranet", "Iodine (v2)"));
 		mAdapter = new AboutListAdapter(getActivity(), items);
 

diff --git a/app/src/main/java/com/el1t/iolite/BlockActivity.java b/app/src/main/java/com/el1t/iolite/BlockActivity.java
@@ -82,9 +82,9 @@ protected NavDrawerActivityConfig getNavDrawerConfiguration() {
 		final NavDrawerAdapter adapter = new NavDrawerAdapter(this, R.layout.nav_item);
 		adapter.setItems(new NavMenuBuilder()
 				.addItem(NavMenuItem.create(101, "Eighth", R.drawable.ic_event_black_24dp))
-				.addItem(NavMenuItem.create(102, "Test!", R.drawable.ic_event_black_24dp))
+//				.addItem(NavMenuItem.create(102, "Test!", R.drawable.ic_event_black_24dp))
 				.addSeparator()
-				.addItem(NavMenuItem.createButton(201, "Settings", R.drawable.ic_settings_black_24dp))
+//				.addItem(NavMenuItem.createButton(201, "Settings", R.drawable.ic_settings_black_24dp))
 				.addItem(NavMenuItem.createButton(202, "About", R.drawable.ic_help_black_24dp))
 				.addItem(NavMenuItem.createButton(203, "Logout", R.drawable.ic_exit_to_app_black_24dp))
 				.build());

diff --git a/app/src/main/java/com/el1t/iolite/BlockListAdapter.java b/app/src/main/java/com/el1t/iolite/BlockListAdapter.java
@@ -52,12 +52,12 @@ public BlockListAdapter(Context context, ArrayList<EighthBlockItem> items) {
 		Resources resources = context.getResources();
 		mColors = new int[10];
 		mColors[Colors.INDIGO.ordinal()] = resources.getColor(R.color.primary_400);
-		mColors[Colors.LIGHT_BLUE.ordinal()] = resources.getColor(R.color.light_blue_400);
+		mColors[Colors.LIGHT_BLUE.ordinal()] = resources.getColor(R.color.accent_400);
 		for (int i = 2; i < 6; i++) {
 			mColors[i] = resources.getColor(R.color.grey);
 		}
-		mColors[Colors.RED.ordinal()] = resources.getColor(R.color.accent_400);
-		mColors[Colors.DARK_RED.ordinal()] = resources.getColor(R.color.accent_600);
+		mColors[Colors.RED.ordinal()] = resources.getColor(R.color.red_400);
+		mColors[Colors.DARK_RED.ordinal()] = resources.getColor(R.color.red_600);
 		mColors[Colors.BLACK.ordinal()] = resources.getColor(R.color.primary_text_default_material_light);
 		mColors[Colors.TEXT.ordinal()] = resources.getColor(R.color.secondary_text_default_material_light);
 

diff --git a/app/src/main/java/com/el1t/iolite/LoginActivity.java b/app/src/main/java/com/el1t/iolite/LoginActivity.java
@@ -45,7 +45,7 @@
 // Login request -> Authentication (Grab info) -> Start activity
 public class LoginActivity extends ActionBarActivity implements LoginFragment.OnFragmentInteractionListener
 {
-	public static final String FAKE_LOGIN = "fake";
+//	public static final String FAKE_LOGIN = "fake";
 	public static final String PREFS_NAME = "LOGIN";
 	private static final String TAG = "Login Activity";
 	private static final String[] COOKIE_NAMES = {"IODINE_PASS_VECTOR", "PHPSESSID"};
@@ -89,24 +89,24 @@ protected void onCreate(Bundle savedInstanceState) {
 		}
 	}
 
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		// Inflate the menu; this adds items to the action bar if it is present.
-		getMenuInflater().inflate(R.menu.login, menu);
-		return true;
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		// Handle action bar item clicks here. The action bar will
-		// automatically handle clicks on the Home/Up button, so long
-		// as you specify a parent activity in AndroidManifest.xml.
-		switch(item.getItemId()) {
-			case R.id.action_settings:
-				return true;
-		}
-		return super.onOptionsItemSelected(item);
-	}
+//	@Override
+//	public boolean onCreateOptionsMenu(Menu menu) {
+//		// Inflate the menu; this adds items to the action bar if it is present.
+//		getMenuInflater().inflate(R.menu.login, menu);
+//		return true;
+//	}
+//
+//	@Override
+//	public boolean onOptionsItemSelected(MenuItem item) {
+//		// Handle action bar item clicks here. The action bar will
+//		// automatically handle clicks on the Home/Up button, so long
+//		// as you specify a parent activity in AndroidManifest.xml.
+//		switch(item.getItemId()) {
+//			case R.id.action_settings:
+//				return true;
+//		}
+//		return super.onOptionsItemSelected(item);
+//	}
 
 	private void storeCookies(List<Cookie> cookies) {
 		final SharedPreferences.Editor editor = getSharedPreferences(PREFS_NAME, MODE_PRIVATE).edit();
@@ -198,7 +198,8 @@ private void clearPassword() {
 
 	// Checks if fake offline cache should be used
 	private boolean isFakeLogin() {
-		return login_username != null && login_username.toLowerCase().equals(FAKE_LOGIN);
+//		return login_username != null && login_username.toLowerCase().equals(FAKE_LOGIN);
+		return false;
 	}
 
 	// Get a fake list of blocks for debugging

diff --git a/app/src/main/java/com/el1t/iolite/SignupActivity.java b/app/src/main/java/com/el1t/iolite/SignupActivity.java
@@ -110,15 +110,15 @@ public void onDestroy() {
 		super.onDestroy();
 	}
 
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		final MenuInflater inflater = getMenuInflater();
-		inflater.inflate(R.menu.eighth_signup, menu);
-		final MenuItem searchItem = menu.findItem(R.id.action_search);
-		final SearchView searchView = (SearchView) MenuItemCompat.getActionView(searchItem);
-//		searchView.setOnQueryTextFocusChangeListener(this);
-		return super.onCreateOptionsMenu(menu);
-	}
+//	@Override
+//	public boolean onCreateOptionsMenu(Menu menu) {
+//		final MenuInflater inflater = getMenuInflater();
+//		inflater.inflate(R.menu.eighth_signup, menu);
+//		final MenuItem searchItem = menu.findItem(R.id.action_search);
+//		final SearchView searchView = (SearchView) MenuItemCompat.getActionView(searchItem);
+////		searchView.setOnQueryTextFocusChangeListener(this);
+//		return super.onCreateOptionsMenu(menu);
+//	}
 
 	public void refresh() {
 		if (!fake) {

diff --git a/app/src/main/java/com/el1t/iolite/SignupFragment.java b/app/src/main/java/com/el1t/iolite/SignupFragment.java
@@ -101,8 +101,8 @@ public boolean onContextItemSelected(MenuItem item) {
 			case R.id.context_signup:
 				mListener.submit(activityItem);
 				return true;
-			case R.id.context_info:
-				return true;
+//			case R.id.context_info:
+//				return true;
 			case R.id.context_favorite:
 				mListener.favorite(activityItem.getAID(), activityItem.getBID(), mAdapter.changeFavorite(activityItem));
 				return true;

diff --git a/app/src/main/java/com/el1t/iolite/SignupListAdapter.java b/app/src/main/java/com/el1t/iolite/SignupListAdapter.java
@@ -68,7 +68,7 @@ public SignupListAdapter(Context context, ArrayList<EighthActivityItem> items) {
 		// Cache colors
 		Resources resources = context.getResources();
 		mColors = new int[6];
-		mColors[Colors.RED.ordinal()]           = resources.getColor(R.color.accent_400);
+		mColors[Colors.RED.ordinal()]           = resources.getColor(R.color.red_400);
 		mColors[Colors.DEEP_ORANGE.ordinal()]   = resources.getColor(R.color.deep_orange_400);
 		mColors[Colors.PINK.ordinal()]          = resources.getColor(R.color.pink_400);
 		mColors[Colors.ORANGE.ordinal()]        = resources.getColor(R.color.orange_400);

diff --git a/app/src/main/res/menu/context_menu_signup.xml b/app/src/main/res/menu/context_menu_signup.xml
@@ -10,10 +10,10 @@
 	      android:orderInCategory="100"
 	      app:showAsAction="never" />
 
-	<item android:id="@+id/context_info"
+	<!--<item android:id="@+id/context_info"
 	      android:title="Info"
 	      android:orderInCategory="100"
-	      app:showAsAction="never" />
+	      app:showAsAction="never" />-->
 
 	<item android:id="@+id/context_favorite"
 	      android:title="Favorite"

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -6,21 +6,21 @@
 	<color name="primary_100">#C5CAE9</color>
 	<color name="primary_400">#5C6BC0</color>
 
-	<color name="accent">#F44336</color>
-	<color name="accent_400">#EF5350</color>
-	<color name="accent_600">#E53935</color>
-	<color name="accent_700">#D32F2F</color>
-	<color name="accent_900">#B71C1C</color>
-
 	<color name="pink">#E91E63</color>
 	<color name="pink_400">#EC407A</color>
 
-	<color name="orange">#FF9800</color>
-	<color name="orange_400">#FFA726</color>
+	<color name="red">#F44336</color>
+	<color name="red_400">#EF5350</color>
+	<color name="red_600">#E53935</color>
+	<color name="red_700">#D32F2F</color>
+	<color name="red_900">#B71C1C</color>
 
 	<color name="deep_orange">#FF5722</color>
 	<color name="deep_orange_400">#FF7043</color>
 
+	<color name="orange">#FF9800</color>
+	<color name="orange_400">#FFA726</color>
+
 	<color name="yellow">#FFEB3B</color>
 
 	<color name="amber">#FFC107</color>
@@ -31,8 +31,12 @@
 	<color name="green_700">#388E3C</color>
 	<color name="green_900">#1B5E20</color>
 
-	<color name="light_blue">#03A9F4</color>
-	<color name="light_blue_400">#29B6F6</color>
+	<color name="accent">#03A9F4</color>
+	<color name="accent_400">#29B6F6</color>
+	<color name="accent_600">#039BE5</color>
+	<color name="accent_700">#0288D1</color>
+	<color name="accent_800">#0277BD</color>
+	<color name="accent_900">#01579B</color>
 
 	<color name="blue">#2196F3</color>
 	<color name="blue_400">#42A5F5</color>