Skip to content

Commit

Permalink
Added preference test and getinventory debug.
Browse files Browse the repository at this point in the history
  • Loading branch information
@filipkofron
filipkofron committed Mar 26, 2014
1 parent 8acfdc7 commit 43a8036
Show file tree
Hide file tree
Showing 11 changed files with 463 additions and 39 deletions.
73 changes: 38 additions & 35 deletions src/Client/client/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,78 +1,81 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="cz.kofron.foodinventory.client"
xmlns:android="http://schemas.android.com/apk/res/android">
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="cz.kofron.foodinventory.client" >

<uses-permission android:name="android.permission.CAMERA"/>
<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="com.android.alarm.permission.SET_ALARM"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="com.android.alarm.permission.SET_ALARM" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

<uses-feature
android:name="android.hardware.camera"
android:required="false"/>
android:required="false" />
<uses-feature
android:name="android.hardware.camera,back"
android:required="false"/>
android:required="false" />
<uses-feature
android:name="android.hardware.camera,front"
android:required="false"/>
<uses-feature android:name="android.hardware.camera.autofocus"/>
android:required="false" />
<uses-feature android:name="android.hardware.camera.autofocus" />

<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme">


android:theme="@style/AppTheme" >
<activity
android:name=".activity.MainActivity"
android:name="cz.kofron.foodinventory.client.activity.MainActivity"
android:configChanges="orientation|keyboardHidden"
android:label="@string/app_name"
android:screenOrientation="portrait"
android:configChanges="orientation|keyboardHidden">
android:screenOrientation="portrait" >
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER"/>
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".activity.FoodDetailActivity"
android:name="cz.kofron.foodinventory.client.activity.FoodDetailActivity"
android:configChanges="orientation|keyboardHidden"
android:label="@string/app_name"
android:screenOrientation="portrait"
android:configChanges="orientation|keyboardHidden">
android:screenOrientation="portrait" >
</activity>
<activity
android:name=".activity.FoodEditActivity"
android:name="cz.kofron.foodinventory.client.activity.FoodEditActivity"
android:configChanges="orientation|keyboardHidden"
android:label="@string/app_name"
android:windowSoftInputMode="stateHidden"
android:screenOrientation="portrait"
android:configChanges="orientation|keyboardHidden">
android:windowSoftInputMode="stateHidden" >
</activity>
<activity
android:name=".activity.FoodListActivity"
android:name="cz.kofron.foodinventory.client.activity.FoodListActivity"
android:configChanges="orientation|keyboardHidden"
android:label="@string/app_name"
android:windowSoftInputMode="stateHidden"
android:screenOrientation="portrait"
android:configChanges="orientation|keyboardHidden">
android:windowSoftInputMode="stateHidden" >
</activity>
<activity
android:name=".activity.GtinCaptureActivity"
android:name="cz.kofron.foodinventory.client.activity.GtinCaptureActivity"
android:configChanges="orientation|keyboardHidden"
android:label="@string/app_name"
android:windowSoftInputMode="stateHidden"
android:screenOrientation="portrait"
android:configChanges="orientation|keyboardHidden"
>
android:windowSoftInputMode="stateHidden" >
</activity>
<receiver android:name=".background.BootReceiver" >

<receiver android:name="cz.kofron.foodinventory.client.background.BootReceiver" >
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
</receiver>
<receiver android:name=".background.AlarmReceiver" >
<receiver android:name="cz.kofron.foodinventory.client.background.AlarmReceiver" >
</receiver>

<activity
android:name="cz.kofron.foodinventory.client.activity.SettingsActivity"
android:label="@string/title_activity_settings" >
</activity>
</application>

</manifest>
6 changes: 3 additions & 3 deletions ...ient/client/src/main/java/cz/kofron/foodinventory/client/activity/FoodDetailActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,9 +240,9 @@ private void setFoodDetailSync(FoodDetail foodDetail)
populateReviews(foodDetail);

name.setText(foodDetail.getName());
category.setText(foodDetail.getCategory());
vendor.setText(foodDetail.getVendor());
gtin.setText(GtinUtil.getReadableGtin(foodDetail.getGtin()));
category.setText(" - " + foodDetail.getCategory());
vendor.setText("Vendor: " + foodDetail.getVendor());
gtin.setText("GTIN: " + GtinUtil.getReadableGtin(foodDetail.getGtin()));
description.setText(foodDetail.getDescription());
Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date(foodDetail.getDefaultUseBy()));
Expand Down
3 changes: 3 additions & 0 deletions src/Client/client/src/main/java/cz/kofron/foodinventory/client/activity/MainActivity.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package cz.kofron.foodinventory.client.activity;

import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.support.v4.app.Fragment;
Expand Down Expand Up @@ -215,6 +216,8 @@ public boolean onOptionsItemSelected(MenuItem item)
int id = item.getItemId();
if (id == R.id.action_settings)
{
Intent intent = new Intent(this, SettingsActivity.class);
startActivity(intent);
return true;
}
return super.onOptionsItemSelected(item);
Expand Down
Loading

0 comments on commit 43a8036

Please sign in to comment.