From 9e226ef4b45600bc14713961034444f4f07f06e8 Mon Sep 17 00:00:00 2001 From: RuchiraHansanaBandara <38920827+RuchiraHansanaBandara@users.noreply.github.com> Date: Sun, 4 Aug 2019 22:50:32 +0530 Subject: [PATCH 1/5] New create user --- .idea/assetWizardSettings.xml | 46 ++++++ .idea/caches/build_file_checksums.ser | Bin 537 -> 549 bytes .idea/codeStyles/Project.xml | 148 ++++++++++++++++++ app/src/main/AndroidManifest.xml | 6 +- .../java/com/dasun/soulfit/Create_user.java | 71 +++++++++ .../java/com/dasun/soulfit/nav_header.java | 13 ++ .../drawable/ic_accessibility_black_24dp.xml | 9 ++ .../res/drawable/ic_date_range_black_24dp.xml | 9 ++ .../drawable/ic_fitness_center_black_24dp.xml | 9 ++ .../main/res/drawable/ic_home_black_24dp.xml | 9 ++ .../res/drawable/ic_markunread_black_24dp.xml | 9 ++ .../drawable/ic_notifications_black_24dp.xml | 9 ++ .../res/drawable/ic_person_black_24dp.xml | 9 ++ .../main/res/drawable/ic_send_black_24dp.xml | 9 ++ .../drawable/ic_settings_power_black_24dp.xml | 9 ++ .../main/res/drawable/ic_share_black_24dp.xml | 9 ++ app/src/main/res/layout/nav_header.xml | 28 ++++ app/src/main/res/menu/drawer_menu.xml | 36 +++++ app/src/main/res/values-v21/style.xml | 8 + app/src/main/res/values/strings.xml | 1 + app/src/main/res/values/styles.xml | 4 + 21 files changed, 448 insertions(+), 3 deletions(-) create mode 100644 .idea/assetWizardSettings.xml create mode 100644 .idea/codeStyles/Project.xml create mode 100644 app/src/main/java/com/dasun/soulfit/Create_user.java create mode 100644 app/src/main/java/com/dasun/soulfit/nav_header.java create mode 100644 app/src/main/res/drawable/ic_accessibility_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_date_range_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_fitness_center_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_home_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_markunread_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_notifications_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_person_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_send_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_settings_power_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_share_black_24dp.xml create mode 100644 app/src/main/res/layout/nav_header.xml create mode 100644 app/src/main/res/menu/drawer_menu.xml create mode 100644 app/src/main/res/values-v21/style.xml diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml new file mode 100644 index 0000000..c5d9a70 --- /dev/null +++ b/.idea/assetWizardSettings.xml @@ -0,0 +1,46 @@ + + + + + + \ No newline at end of file diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 2724e7ef8f5fbab21c7353b0e0fc1638cc94f4dc..bc2a837e3b1deb806769fa89ead6b872e0edc862 100644 GIT binary patch delta 85 zcmV-b0IL6)1f>L!m;_yLDYcQDcM!DKU_W$vWQo}hQBhhL5^R$r0dg(vd&jeo&%g$S rOX$CzO)74505n57Tvc;ra&uf#bz^90a$z7yAVOhoWMOh)lePh4V00dgU?>{M8_dE=j6 f^uuNlbU+Vu04PH`Tvc;ra&ufnVRLnElfnUGk$)cw diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..728d034 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,148 @@ + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 88b4751..1b88068 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,7 +9,9 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - + + + @@ -17,9 +19,7 @@ - - \ No newline at end of file diff --git a/app/src/main/java/com/dasun/soulfit/Create_user.java b/app/src/main/java/com/dasun/soulfit/Create_user.java new file mode 100644 index 0000000..076b0c3 --- /dev/null +++ b/app/src/main/java/com/dasun/soulfit/Create_user.java @@ -0,0 +1,71 @@ +package com.dasun.soulfit; + + + +import android.support.v4.view.GravityCompat; +import android.support.v4.widget.DrawerLayout; +import android.support.v7.app.ActionBarDrawerToggle; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.view.View; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.Spinner; +import android.widget.Toast; +import android.widget.Toolbar; + +public class Create_User extends AppCompatActivity { + private DrawerLayout drawer; + + Spinner spinner; + ArrayAdapter adapter; + + @Override + public void onBackPressed() { + if(drawer.isDrawerOpen(GravityCompat.START)){ + drawer.closeDrawer(GravityCompat.START); + }else { + super.onBackPressed(); + } + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_create_user); + + Toolbar toolbar = findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + drawer = findViewById(R.id.drawer_layout); + ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this,drawer,toolbar, + R.string.Open navigation drawer, R.string.Close navigation drawer); + drawer.addDrawerListener(toggle); + toggle.syncState(); + + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + spinner = (Spinner) findViewById(R.id.spinner1); + adapter = ArrayAdapter.createFromResource(this,R.array.GenderNames,android.R.layout.simple_spinner_item); + adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + spinner.setAdapter(adapter); + spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView parent, View view, int position, long id) { + Toast.makeText(getBaseContext(),parent.getItemAtPosition(position)+" selected",Toast.LENGTH_LONG).show(); + } + + + @Override + public void onNothingSelected(AdapterView adapterView) { + + } + + }); + + + } + + private void setSupportActionBar(Toolbar toolbar) { + } + + +} diff --git a/app/src/main/java/com/dasun/soulfit/nav_header.java b/app/src/main/java/com/dasun/soulfit/nav_header.java new file mode 100644 index 0000000..f9daa25 --- /dev/null +++ b/app/src/main/java/com/dasun/soulfit/nav_header.java @@ -0,0 +1,13 @@ +package com.dasun.soulfit; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +public class nav_header extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_nav_header); + } +} diff --git a/app/src/main/res/drawable/ic_accessibility_black_24dp.xml b/app/src/main/res/drawable/ic_accessibility_black_24dp.xml new file mode 100644 index 0000000..e7e53f0 --- /dev/null +++ b/app/src/main/res/drawable/ic_accessibility_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_date_range_black_24dp.xml b/app/src/main/res/drawable/ic_date_range_black_24dp.xml new file mode 100644 index 0000000..5ac94e0 --- /dev/null +++ b/app/src/main/res/drawable/ic_date_range_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_fitness_center_black_24dp.xml b/app/src/main/res/drawable/ic_fitness_center_black_24dp.xml new file mode 100644 index 0000000..846deb4 --- /dev/null +++ b/app/src/main/res/drawable/ic_fitness_center_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_home_black_24dp.xml b/app/src/main/res/drawable/ic_home_black_24dp.xml new file mode 100644 index 0000000..70fb291 --- /dev/null +++ b/app/src/main/res/drawable/ic_home_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_markunread_black_24dp.xml b/app/src/main/res/drawable/ic_markunread_black_24dp.xml new file mode 100644 index 0000000..ce97ab8 --- /dev/null +++ b/app/src/main/res/drawable/ic_markunread_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_notifications_black_24dp.xml b/app/src/main/res/drawable/ic_notifications_black_24dp.xml new file mode 100644 index 0000000..7009a67 --- /dev/null +++ b/app/src/main/res/drawable/ic_notifications_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_person_black_24dp.xml b/app/src/main/res/drawable/ic_person_black_24dp.xml new file mode 100644 index 0000000..b2cb337 --- /dev/null +++ b/app/src/main/res/drawable/ic_person_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_send_black_24dp.xml b/app/src/main/res/drawable/ic_send_black_24dp.xml new file mode 100644 index 0000000..e145ca8 --- /dev/null +++ b/app/src/main/res/drawable/ic_send_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_settings_power_black_24dp.xml b/app/src/main/res/drawable/ic_settings_power_black_24dp.xml new file mode 100644 index 0000000..931de86 --- /dev/null +++ b/app/src/main/res/drawable/ic_settings_power_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_share_black_24dp.xml b/app/src/main/res/drawable/ic_share_black_24dp.xml new file mode 100644 index 0000000..e3fe874 --- /dev/null +++ b/app/src/main/res/drawable/ic_share_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/nav_header.xml b/app/src/main/res/layout/nav_header.xml new file mode 100644 index 0000000..769a0b3 --- /dev/null +++ b/app/src/main/res/layout/nav_header.xml @@ -0,0 +1,28 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/drawer_menu.xml b/app/src/main/res/menu/drawer_menu.xml new file mode 100644 index 0000000..2605d7f --- /dev/null +++ b/app/src/main/res/menu/drawer_menu.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-v21/style.xml b/app/src/main/res/values-v21/style.xml new file mode 100644 index 0000000..d161f5b --- /dev/null +++ b/app/src/main/res/values-v21/style.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 712e80d..c1fe6ca 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -26,4 +26,5 @@ 100 + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index f8b4820..9e4616c 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -11,5 +11,9 @@ From 44e8a6007d50e4aca1b04e81e5227e610b3d5831 Mon Sep 17 00:00:00 2001 From: RuchiraHansanaBandara <38920827+RuchiraHansanaBandara@users.noreply.github.com> Date: Sun, 4 Aug 2019 23:02:02 +0530 Subject: [PATCH 2/5] New create user. --- app/src/main/AndroidManifest.xml | 1 - .../main/java/com/dasun/soulfit/Create_user.java | 8 ++++---- app/src/main/java/com/dasun/soulfit/nav_header.java | 13 ------------- 3 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 app/src/main/java/com/dasun/soulfit/nav_header.java diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1b88068..15175bd 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,7 +9,6 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - diff --git a/app/src/main/java/com/dasun/soulfit/Create_user.java b/app/src/main/java/com/dasun/soulfit/Create_user.java index 076b0c3..c878a6f 100644 --- a/app/src/main/java/com/dasun/soulfit/Create_user.java +++ b/app/src/main/java/com/dasun/soulfit/Create_user.java @@ -14,7 +14,7 @@ import android.widget.Toast; import android.widget.Toolbar; -public class Create_User extends AppCompatActivity { +class Create_User extends AppCompatActivity { private DrawerLayout drawer; Spinner spinner; @@ -37,14 +37,14 @@ protected void onCreate(Bundle savedInstanceState) { Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); drawer = findViewById(R.id.drawer_layout); - ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this,drawer,toolbar, - R.string.Open navigation drawer, R.string.Close navigation drawer); + ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this,drawer, + R.string.navigation_drawer_open, R.string.navigation_drawer_close); drawer.addDrawerListener(toggle); toggle.syncState(); getSupportActionBar().setDisplayHomeAsUpEnabled(true); spinner = (Spinner) findViewById(R.id.spinner1); - adapter = ArrayAdapter.createFromResource(this,R.array.GenderNames,android.R.layout.simple_spinner_item); + adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); spinner.setAdapter(adapter); spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { diff --git a/app/src/main/java/com/dasun/soulfit/nav_header.java b/app/src/main/java/com/dasun/soulfit/nav_header.java deleted file mode 100644 index f9daa25..0000000 --- a/app/src/main/java/com/dasun/soulfit/nav_header.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.dasun.soulfit; - -import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; - -public class nav_header extends AppCompatActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_nav_header); - } -} From 7de652ad72664adc2d5a500006ea213dfc5239aa Mon Sep 17 00:00:00 2001 From: RuchiraHansanaBandara <38920827+RuchiraHansanaBandara@users.noreply.github.com> Date: Mon, 5 Aug 2019 13:02:55 +0530 Subject: [PATCH 3/5] Drawer and the User Activity. --- app/src/main/res/layout/activity_callorie_calc.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/res/layout/activity_callorie_calc.xml b/app/src/main/res/layout/activity_callorie_calc.xml index 1379372..0bd16d4 100644 --- a/app/src/main/res/layout/activity_callorie_calc.xml +++ b/app/src/main/res/layout/activity_callorie_calc.xml @@ -474,4 +474,6 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.128" /> + + \ No newline at end of file From 95c1919fc0e4e9a758394a7fa2c879229b24faf7 Mon Sep 17 00:00:00 2001 From: RuchiraHansanaBandara <38920827+RuchiraHansanaBandara@users.noreply.github.com> Date: Mon, 5 Aug 2019 13:18:07 +0530 Subject: [PATCH 4/5] Drawer and the User Activity updated. --- app/src/main/java/com/dasun/soulfit/Create_user.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/dasun/soulfit/Create_user.java b/app/src/main/java/com/dasun/soulfit/Create_user.java index c878a6f..41fb4fb 100644 --- a/app/src/main/java/com/dasun/soulfit/Create_user.java +++ b/app/src/main/java/com/dasun/soulfit/Create_user.java @@ -14,7 +14,7 @@ import android.widget.Toast; import android.widget.Toolbar; -class Create_User extends AppCompatActivity { +public class Create_user extends AppCompatActivity { private DrawerLayout drawer; Spinner spinner; From 662d0f467189736c2f43287160566274bd1d34cc Mon Sep 17 00:00:00 2001 From: RuchiraHansanaBandara <38920827+RuchiraHansanaBandara@users.noreply.github.com> Date: Mon, 5 Aug 2019 13:24:46 +0530 Subject: [PATCH 5/5] Drawer and the User Activity. manifest error solved. --- app/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 15175bd..ffa2aa4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,7 +9,7 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - +