Skip to content

Commit 6ac6f77

Browse files
wowHolliswowHollis
committed
Merge branch 'release/v0.1.2'
# Conflicts: # app/build.gradle # app/src/main/java/com/firstbuild/androidapp/Paragon/ParagonMainActivity.java # app/src/main/java/com/firstbuild/androidapp/Paragon/SousvideStatusFragment.java
2 parents 1c26858 + ba38a16 commit 6ac6f77

File tree

143 files changed

+8003
-1601
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+8003
-1601
lines changed

‎app/build.gradle‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ android {
99
minSdkVersion 18
1010
targetSdkVersion 21
1111
versionCode 1
12-
versionName "0.0.2a"
12+
versionName "0.1.2"
1313
}
1414
buildTypes {
1515
release {
@@ -19,10 +19,16 @@ android {
1919
}
2020
}
2121

22+
repositories {
23+
maven { url "https://jitpack.io" }
24+
}
25+
2226
dependencies {
2327
compile fileTree(dir: 'libs', include: ['*.jar'])
24-
compile 'com.android.support:appcompat-v7:21.0.3'
25-
compile 'com.android.support:recyclerview-v7:+'
28+
compile 'com.android.support:appcompat-v7:22.2.1'
29+
compile 'com.android.support:recyclerview-v7:22.2.0'
2630
compile 'com.getbase:floatingactionbutton:1.9.0'
2731
compile 'jp.wasabeef:recyclerview-animators:1.2.1'
32+
compile 'com.android.support:design:22.2.1'
33+
compile 'com.afollestad:material-dialogs:0.7.3.1'
2834
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@
99
<uses-permission android:name="android.permission.BLUETOOTH" />
1010
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
1111

12-
<android:uses-permission
13-
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
14-
android:maxSdkVersion="18" />
15-
<android:uses-permission android:name="android.permission.READ_PHONE_STATE" />
16-
<android:uses-permission
17-
android:name="android.permission.READ_EXTERNAL_STORAGE"
18-
android:maxSdkVersion="18" />
12+
<uses-permission
13+
android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
14+
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
15+
<uses-permission
16+
android:name="android.permission.READ_EXTERNAL_STORAGE"/>
17+
18+
<uses-feature android:name="android.hardware.camera"
19+
android:required="true" />
1920

2021
<application
2122
android:allowBackup="true"
@@ -33,28 +34,28 @@
3334
</intent-filter>
3435
</activity>
3536
<activity
36-
android:name=".cookingMethod.CookingMethodActivity"
37-
android:label="@string/title_activity_cooking_method"
37+
android:name=".dashboard.DashboardActivity"
38+
android:label="@string/title_activity_dashboard"
3839
android:screenOrientation="portrait" >
3940
</activity>
4041
<activity
41-
android:name=".sousvideUI.SousvideActivity"
42-
android:label="@string/title_activity_sousvide"
42+
android:name=".paragon.ParagonMainActivity"
43+
android:label="@string/title_activity_paragon_main"
44+
android:windowSoftInputMode="adjustUnspecified|adjustPan"
4345
android:screenOrientation="portrait" >
4446
</activity>
4547
<activity
46-
android:name=".dashboard.DashboardActivity"
47-
android:label="@string/title_activity_dashboard"
48-
android:screenOrientation="portrait" >
48+
android:name=".addProduct.AddProductActivity"
49+
android:label="@string/title_activity_add_product"
50+
android:screenOrientation="portrait">
4951
</activity>
5052
<activity
51-
android:name=".Paragon.ParagonMainActivity"
52-
android:label="@string/title_activity_paragon_main"
53-
android:screenOrientation="portrait" >
53+
android:name=".paragon.settings.SettingsActivity"
54+
android:label="@string/title_activity_settings" >
5455
</activity>
5556
<activity
56-
android:name=".AddProduct.AddProductActivity"
57-
android:label="@string/title_activity_add_product" >
57+
android:name=".paragon.settings.TermsActivity"
58+
android:label="@string/title_activity_terms" >
5859
</activity>
5960
</application>
6061

‎app/src/main/java/com/firstbuild/androidapp/AddProduct/AddProductActivity.java‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1-
package com.firstbuild.androidapp.AddProduct;
1+
package com.firstbuild.androidapp.addProduct;
22

3-
import android.animation.Animator;
4-
import android.annotation.TargetApi;
53
import android.app.Activity;
6-
import android.os.Build;
74
import android.os.Bundle;
5+
import android.support.v7.app.ActionBarActivity;
6+
import android.support.v7.widget.Toolbar;
87
import android.view.Menu;
98
import android.view.MenuItem;
10-
import android.view.View;
11-
import android.view.ViewAnimationUtils;
9+
import android.widget.TextView;
1210

1311
import com.firstbuild.androidapp.R;
1412

15-
public class AddProductActivity extends Activity {
13+
public class AddProductActivity extends ActionBarActivity {
1614
private String TAG = AddProductActivity.class.getSimpleName();
1715

1816
@Override
@@ -21,7 +19,12 @@ protected void onCreate(Bundle savedInstanceState) {
2119

2220
setContentView(R.layout.activity_add_product);
2321

22+
// Set title name
23+
Toolbar toolbar = (Toolbar) findViewById(R.id.app_bar);
24+
toolbar.setTitle("");
25+
((TextView) toolbar.findViewById(R.id.toolbar_title)).setText("ADD PRODUCT");
2426

27+
setSupportActionBar(toolbar);
2528

2629
getFragmentManager().
2730
beginTransaction().

‎app/src/main/java/com/firstbuild/androidapp/AddProduct/AddProductConnectionErrorFragment.java‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
package com.firstbuild.androidapp.addProduct;
2+
3+
4+
import android.app.Fragment;
5+
import android.os.Bundle;
6+
import android.util.Log;
7+
import android.view.KeyEvent;
8+
import android.view.LayoutInflater;
9+
import android.view.View;
10+
import android.view.ViewGroup;
11+
12+
import com.firstbuild.androidapp.R;
13+
14+
/**
15+
* A simple {@link Fragment} subclass.
16+
*/
17+
public class AddProductConnectionErrorFragment extends Fragment {
18+
private String TAG = AddProductActivity.class.getSimpleName();
19+
20+
public AddProductConnectionErrorFragment() {
21+
// Required empty public constructor
22+
Log.d(TAG, "AddProductSearchParagonFragment IN");
23+
}
24+
25+
@Override
26+
public View onCreateView(LayoutInflater inflater, ViewGroup container,
27+
Bundle savedInstanceState) {
28+
// Inflate the layout for this fragment
29+
View view = inflater.inflate(R.layout.fragment_add_product_connection_error, container, false);
30+
31+
view.findViewById(R.id.button_try_again).setOnClickListener(new View.OnClickListener() {
32+
@Override
33+
public void onClick(View v) {
34+
Log.d(TAG, "onClick pressed");
35+
getFragmentManager().
36+
beginTransaction().
37+
replace(R.id.content_frame, new AddProductSearchParagonFragment()).
38+
addToBackStack(null).
39+
commit();
40+
}
41+
});
42+
43+
// Catch back button
44+
view.setFocusableInTouchMode(true);
45+
view.requestFocus();
46+
view.setOnKeyListener(new View.OnKeyListener() {
47+
@Override
48+
public boolean onKey(View v, int keyCode, KeyEvent event) {
49+
if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_UP) {
50+
Log.i(TAG, "Back button pressed");
51+
getFragmentManager().
52+
beginTransaction().
53+
replace(R.id.content_frame, new AddProductSelectFragment()).
54+
addToBackStack(null).
55+
commit();
56+
return true;
57+
}
58+
else {
59+
return false;
60+
}
61+
}
62+
});
63+
64+
return view;
65+
}
66+
}

‎app/src/main/java/com/firstbuild/androidapp/AddProduct/AddProductFoundParagonFragment.java‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
package com.firstbuild.androidapp.addProduct;
2+
3+
4+
import android.app.Fragment;
5+
import android.os.Bundle;
6+
import android.os.Handler;
7+
import android.util.Log;
8+
import android.view.LayoutInflater;
9+
import android.view.View;
10+
import android.view.ViewGroup;
11+
12+
import com.firstbuild.androidapp.R;
13+
14+
/**
15+
* A simple {@link Fragment} subclass.
16+
*/
17+
public class AddProductFoundParagonFragment extends Fragment {
18+
private String TAG = AddProductActivity.class.getSimpleName();
19+
private Handler handler;
20+
private Runnable runnable;
21+
22+
23+
public AddProductFoundParagonFragment() {
24+
// Required empty public constructor
25+
Log.d(TAG, "AddProductSearchParagonFragment IN");
26+
}
27+
28+
@Override
29+
public View onCreateView(LayoutInflater inflater, ViewGroup container,
30+
Bundle savedInstanceState) {
31+
// Inflate the layout for this fragment
32+
View view = inflater.inflate(R.layout.fragment_add_product_found_paragon, container, false);
33+
34+
runnable = new Runnable() {
35+
@Override
36+
public void run() {
37+
getFragmentManager().
38+
beginTransaction().
39+
replace(R.id.content_frame, new AddProductSetParagonNameFragment()).
40+
addToBackStack(null).
41+
commit();
42+
}
43+
};
44+
45+
handler = new Handler();
46+
handler.postDelayed(runnable, 3000);
47+
48+
return view;
49+
}
50+
51+
@Override
52+
public void onResume() {
53+
super.onResume();
54+
Log.d(TAG, "onResume");
55+
handler.postDelayed(runnable, 1000);
56+
}
57+
58+
@Override
59+
public void onPause() {
60+
Log.d(TAG, "onPause");
61+
62+
// Cancel the runnable
63+
handler.removeCallbacks(runnable);
64+
65+
super.onPause();
66+
}
67+
}

‎app/src/main/java/com/firstbuild/androidapp/AddProduct/AddProductParagonFragment.java‎

Lines changed: 0 additions & 61 deletions
This file was deleted.

0 commit comments

Comments
 (0)