Skip to content

Commit c51d9e6

Browse files
LauraMaryMLauraMaryM
committed
Small changes
1 parent a942d57 commit c51d9e6

File tree

6 files changed

+147
-0
lines changed

6 files changed

+147
-0
lines changed

‎app/src/main/AndroidManifest.xml

+5
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,11 @@
202202
android:name=".intervention.MapsActivity"
203203
android:label="@string/title_activity_maps"
204204
android:theme="@style/AppTheme.NoActionBar" />
205+
206+
<activity
207+
android:name=".reception.ArticleNewActivity"
208+
android:theme="@style/AppTheme.NoActionBar" />
209+
205210
<!--
206211
The API key for Google Maps-based APIs is defined as a string resource.
207212
(See the file "res/values/google_maps_api.xml").

‎app/src/main/java/ekylibre/zero/home/MainActivity.java

+7
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import ekylibre.zero.SettingsActivity;
3636
import ekylibre.zero.account.AccountManagerActivity;
3737
import ekylibre.zero.intervention.InterventionActivity;
38+
import ekylibre.zero.reception.ArticleNewActivity;
3839

3940
/**************************************
4041
* Created by pierre on 7/12/16. *
@@ -293,6 +294,12 @@ public boolean onNavigationItemSelected(MenuItem item)
293294
startActivity(intent);
294295
break;
295296
}
297+
case R.id.nav_reception :
298+
{
299+
Intent intent = new Intent(this, ArticleNewActivity.class);
300+
startActivity(intent);
301+
break;
302+
}
296303
case R.id.nav_sync :
297304
{
298305
forceSync_data();

‎app/src/main/java/ekylibre/zero/reception/ArticleNewActivity.java

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
package ekylibre.zero.reception;
2+
3+
import android.content.ContentResolver;
4+
import android.content.ContentValues;
5+
import android.content.Context;
6+
import android.content.Intent;
7+
import android.content.res.Resources;
8+
import android.os.Bundle;
9+
import android.support.v7.app.AppCompatActivity;
10+
import android.util.Log;
11+
import android.view.View;
12+
import android.widget.Button;
13+
import android.widget.EditText;
14+
15+
import ekylibre.database.ZeroContract;
16+
import ekylibre.zero.R;
17+
18+
/**
19+
* Created by NUMAG 1-NB on 19/12/2017.
20+
*/
21+
22+
public class ArticleNewActivity extends AppCompatActivity implements View.OnClickListener {
23+
24+
@Override
25+
public void onCreate(Bundle savedInstanceState) {
26+
super.onCreate(savedInstanceState);
27+
28+
setContentView(R.layout.article_new);
29+
30+
Button btn_save = (Button) findViewById(R.id.buttonSaveArticleId);
31+
btn_save.setOnClickListener(this);
32+
}
33+
34+
public void add_article(Context context) {
35+
ContentResolver contentResolver = context.getContentResolver();
36+
ContentValues mNewValues = new ContentValues();
37+
EditText newArticleName = (EditText) findViewById(R.id.editArticleNameId);
38+
mNewValues.put(ZeroContract.Articles.NAME, newArticleName.getText().toString());
39+
contentResolver.insert(ZeroContract.Articles.CONTENT_URI, mNewValues);
40+
}
41+
42+
@Override
43+
public void onClick(View _buttonView) {
44+
//Récupère ce qu'a tapé l'utilisateur dans la zone de texte et la renvoie à la MainActivtity
45+
if (_buttonView.getId() == R.id.buttonSaveArticleId) {
46+
add_article(this);
47+
48+
}
49+
}
50+
}
51+

‎app/src/main/java/ekylibre/zero/reception/ReceptionNewActivity.java

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
//package ekylibre.zero.reception;
2+
//
3+
//import android.accounts.Account;
4+
//import android.content.ContentValues;
5+
//import android.content.Context;
6+
//import android.content.Intent;
7+
//import android.content.pm.PackageManager;
8+
//import android.database.Cursor;
9+
//import android.graphics.Bitmap;
10+
//import android.graphics.BitmapFactory;
11+
//import android.location.Location;
12+
//import android.location.LocationManager;
13+
//import android.net.Uri;
14+
//import android.os.Build;
15+
//import android.os.Bundle;
16+
//import android.os.Environment;
17+
//import android.provider.MediaStore;
18+
//import android.support.v4.content.ContextCompat;
19+
//import android.util.Log;
20+
//import android.view.Menu;
21+
//import android.view.MenuInflater;
22+
//import android.view.MenuItem;
23+
//import android.view.View;
24+
//import android.widget.ArrayAdapter;
25+
//import android.widget.Button;
26+
//import android.widget.EditText;
27+
//import android.widget.ImageView;
28+
//import android.widget.NumberPicker;
29+
//import android.widget.Spinner;
30+
//import android.widget.Toast;
31+
//
32+
//import com.google.android.gms.appindexing.Action;
33+
//import com.google.android.gms.appindexing.AppIndex;
34+
//import com.google.android.gms.common.api.GoogleApiClient;
35+
//
36+
//import java.io.File;
37+
//import java.io.IOException;
38+
//import java.util.Date;
39+
//
40+
//import ekylibre.database.ZeroContract;
41+
//import ekylibre.util.AccountTool;
42+
//import ekylibre.util.PermissionManager;
43+
//import ekylibre.util.UpdatableActivity;
44+
//import ekylibre.zero.R;
45+
//
46+
//public class ReceptionNewActivity extends UpdatableActivity
47+
//{
48+
// protected void onCreate(Bundle savedInstanceState)
49+
// {
50+
// super.onCreate(savedInstanceState);
51+
// // TODO : changer de layout
52+
// setContentView(R.layout.activity_main);
53+
//
54+
// Button btn = (Button);
55+
// }
56+
//}

‎app/src/main/res/layout/article_new.xml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
android:orientation="vertical"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent"
7+
android:id="@+id/articleNewId"
8+
>
9+
10+
<EditText
11+
android:id="@+id/editArticleNameId"
12+
android:layout_width="wrap_content"
13+
android:layout_height="wrap_content"
14+
android:inputType="text"
15+
/>
16+
17+
<Button
18+
android:id="@+id/buttonSaveArticleId"
19+
android:layout_width="wrap_content"
20+
android:layout_height="wrap_content"
21+
android:text="Save"/>
22+
23+
</LinearLayout>

‎app/src/main/res/menu/activity_main_drawer.xml

+5
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
android:id="@+id/nav_counting"
1717
android:icon="@drawable/ic_count"
1818
android:title="@string/new_count" />
19+
<item
20+
android:id="@+id/nav_reception"
21+
android:icon="@drawable/ic_count"
22+
android:title="reception" />
1923
</group>
2024

2125
<item android:title="@string/parameters">
@@ -33,6 +37,7 @@
3337
android:icon="@drawable/ic_sync"
3438
android:title="@string/sync" />
3539

40+
3641
</menu>
3742
</item>
3843
</menu>

0 commit comments

Comments
 (0)