From 75e5536adb2888ec59319c9b8a1f81525e6d5227 Mon Sep 17 00:00:00 2001 From: Anamika Tripathi Date: Thu, 29 Mar 2018 23:54:21 +0530 Subject: [PATCH 1/5] room library added for SQLite (#13) --- app/build.gradle | 6 +- .../majorproject/HomeScreen.java | 19 ++++- .../majorproject/RoomSample/AppDatabase.java | 33 ++++++++ .../RoomSample/DatabaseInitializer.java | 61 +++++++++++++++ .../majorproject/RoomSample/Project.java | 75 +++++++++++++++++++ .../majorproject/RoomSample/ProjectDao.java | 27 +++++++ app/src/main/res/values/colors.xml | 11 ++- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 9 files changed, 227 insertions(+), 11 deletions(-) create mode 100644 app/src/main/java/com/example/androidtechies/majorproject/RoomSample/AppDatabase.java create mode 100644 app/src/main/java/com/example/androidtechies/majorproject/RoomSample/DatabaseInitializer.java create mode 100644 app/src/main/java/com/example/androidtechies/majorproject/RoomSample/Project.java create mode 100644 app/src/main/java/com/example/androidtechies/majorproject/RoomSample/ProjectDao.java diff --git a/app/build.gradle b/app/build.gradle index 9ede0a1..10200c9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,7 +28,11 @@ dependencies { androidTestImplementation 'com.android.support.test:runner:1.0.1' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' + + //Room dependencies + implementation 'android.arch.persistence.room:runtime:1.0.0' + annotationProcessor 'android.arch.persistence.room:compiler:1.0.0' // butter knife - compile 'com.jakewharton:butterknife:8.8.1' + implementation 'com.jakewharton:butterknife:8.8.1' annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1' } diff --git a/app/src/main/java/com/example/androidtechies/majorproject/HomeScreen.java b/app/src/main/java/com/example/androidtechies/majorproject/HomeScreen.java index 65a80ca..0e5eb3d 100644 --- a/app/src/main/java/com/example/androidtechies/majorproject/HomeScreen.java +++ b/app/src/main/java/com/example/androidtechies/majorproject/HomeScreen.java @@ -6,12 +6,16 @@ import android.view.View; import android.widget.Button; +import com.example.androidtechies.majorproject.RoomSample.AppDatabase; +import com.example.androidtechies.majorproject.RoomSample.DatabaseInitializer; + public class HomeScreen extends AppCompatActivity { public static final String HomeScreenTag = "HomeScreen"; public static final Integer cseValue = 0; public static final Integer it = 0; public static final Integer ece = 0; public static final Integer eee = 0; + AppDatabase appDatabase; @Override protected void onCreate(Bundle savedInstanceState) { @@ -24,12 +28,17 @@ protected void onCreate(Bundle savedInstanceState) { cse.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - Intent cseIntent = new Intent(HomeScreen.this, ListPage.class); - cseIntent.putExtra(HomeScreenTag, cseValue); - startActivity(cseIntent); +// Intent cseIntent = new Intent(HomeScreen.this, ListPage.class); +// cseIntent.putExtra(HomeScreenTag, cseValue); +// startActivity(cseIntent); + populateDatabase(); } }); + + + + // ece.setOnClickListener(new View.OnClickListener() { // @Override // public void onClick(View view) { @@ -55,5 +64,9 @@ public void onClick(View view) { // } // }); } + + private void populateDatabase() { + DatabaseInitializer.populateAsync(AppDatabase.getAppDatabase(this)); } +} diff --git a/app/src/main/java/com/example/androidtechies/majorproject/RoomSample/AppDatabase.java b/app/src/main/java/com/example/androidtechies/majorproject/RoomSample/AppDatabase.java new file mode 100644 index 0000000..17fa5ca --- /dev/null +++ b/app/src/main/java/com/example/androidtechies/majorproject/RoomSample/AppDatabase.java @@ -0,0 +1,33 @@ +package com.example.androidtechies.majorproject.RoomSample; + +import android.arch.persistence.room.Database; +import android.arch.persistence.room.Room; +import android.arch.persistence.room.RoomDatabase; +import android.content.Context; + + +@Database(entities = {Project.class}, version = 1) +public abstract class AppDatabase extends RoomDatabase { + + private static AppDatabase INSTANCE; + + public abstract ProjectDao projectDao(); + + + public static AppDatabase getAppDatabase(Context context) { + if (INSTANCE == null) { + INSTANCE = + Room.databaseBuilder(context.getApplicationContext(), AppDatabase.class, "user-database") + // allow queries on the main thread. + // Not suggested to do on real application! + .allowMainThreadQueries() + .build(); + } + return INSTANCE; + } + + public static void destroyInstance() { + INSTANCE = null; + } + +} diff --git a/app/src/main/java/com/example/androidtechies/majorproject/RoomSample/DatabaseInitializer.java b/app/src/main/java/com/example/androidtechies/majorproject/RoomSample/DatabaseInitializer.java new file mode 100644 index 0000000..ab45c0d --- /dev/null +++ b/app/src/main/java/com/example/androidtechies/majorproject/RoomSample/DatabaseInitializer.java @@ -0,0 +1,61 @@ +package com.example.androidtechies.majorproject.RoomSample; + +import android.content.Context; +import android.os.AsyncTask; +import android.support.annotation.NonNull; +import android.util.Log; + +import java.util.List; + +public class DatabaseInitializer { + private static final String TAG = DatabaseInitializer.class.getName(); + + + public static void populateAsync(@NonNull final AppDatabase db) { + PopulateDbAsync task = new PopulateDbAsync(db); + task.execute(); + } + + public static void populateSync(@NonNull final AppDatabase db) { + populateWithTestData(db); + } + + private static Project addProject (final AppDatabase db, Project project) { + db.projectDao().insertAll(project); + return project; + } + + private static void populateWithTestData(AppDatabase db) { + + Project project = new Project(); + project.setTitleOfProject("Hinton"); + project.setIntroOfProject("Hinton is a fake news generator (video) platform that aims to create\n" + + " awareness among the society "); + project.setModulesOfProject("news"); + project.setProjectBranch("IT"); + project.setTechnologyUsed("Machine learning"); + addProject(db, project); + + List projectsList = db.projectDao().getAll(); + + int count = db.projectDao().countProjects(); + // Log.d(DatabaseInitializer.TAG,); + Log.d(DatabaseInitializer.TAG, "Branch name: " + projectsList.get(0).getProjectBranch()+ "\nNumber of rows: "+count); + } + + private static class PopulateDbAsync extends AsyncTask { + + private final AppDatabase mDb; + + PopulateDbAsync(AppDatabase db) { + mDb = db; + } + + @Override + protected Void doInBackground(final Void... params) { + populateWithTestData(mDb); + return null; + } + + } +} diff --git a/app/src/main/java/com/example/androidtechies/majorproject/RoomSample/Project.java b/app/src/main/java/com/example/androidtechies/majorproject/RoomSample/Project.java new file mode 100644 index 0000000..dab46d9 --- /dev/null +++ b/app/src/main/java/com/example/androidtechies/majorproject/RoomSample/Project.java @@ -0,0 +1,75 @@ +package com.example.androidtechies.majorproject.RoomSample; + +import android.arch.persistence.room.ColumnInfo; +import android.arch.persistence.room.Entity; +import android.arch.persistence.room.PrimaryKey; + +@Entity(tableName = "project_table") +public class Project { + + @PrimaryKey(autoGenerate = true) + private int id; + + @ColumnInfo(name = "branch") + private String projectBranch; + + @ColumnInfo(name = "title_project") + private String titleOfProject; + + @ColumnInfo(name = "intro_project") + private String introOfProject; + + @ColumnInfo(name = "technology_used") + private String technologyUsed; + + @ColumnInfo(name = "modules") + private String modulesOfProject; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getProjectBranch() { + return projectBranch; + } + + public void setProjectBranch(String projectBranch) { + this.projectBranch = projectBranch; + } + + public String getTitleOfProject() { + return titleOfProject; + } + + public void setTitleOfProject(String titleOfProject) { + this.titleOfProject = titleOfProject; + } + + public String getIntroOfProject() { + return introOfProject; + } + + public void setIntroOfProject(String introOfProject) { + this.introOfProject = introOfProject; + } + + public String getTechnologyUsed() { + return technologyUsed; + } + + public void setTechnologyUsed(String technologyUsed) { + this.technologyUsed = technologyUsed; + } + + public String getModulesOfProject() { + return modulesOfProject; + } + + public void setModulesOfProject(String modulesOfProject) { + this.modulesOfProject = modulesOfProject; + } +} diff --git a/app/src/main/java/com/example/androidtechies/majorproject/RoomSample/ProjectDao.java b/app/src/main/java/com/example/androidtechies/majorproject/RoomSample/ProjectDao.java new file mode 100644 index 0000000..26ded65 --- /dev/null +++ b/app/src/main/java/com/example/androidtechies/majorproject/RoomSample/ProjectDao.java @@ -0,0 +1,27 @@ +package com.example.androidtechies.majorproject.RoomSample; + + +import android.arch.persistence.room.Dao; +import android.arch.persistence.room.Delete; +import android.arch.persistence.room.Insert; +import android.arch.persistence.room.Query; + +import java.util.List; + +@Dao +public interface ProjectDao { + + @Query("SELECT * FROM project_table") + List getAll(); + + + @Query("SELECT COUNT(*) from project_table") + int countProjects(); + + @Insert + void insertAll(Project... users); + + @Delete + void delete(Project user); + +} diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index e04526b..fe20846 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,8 +1,11 @@ - #9E9E9E - #616161 - #FF4081 + #673AB7 + #512DA8 + #607D8B #000000 - + #212121 + #757575 + #FFFFFF + #BDBDBD diff --git a/build.gradle b/build.gradle index e6b32bc..47825b2 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.0' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 57a3ad8..abedcad 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Mar 13 13:19:59 IST 2018 +#Tue Mar 27 20:08:43 IST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip From a541ea514837b23fdbe12b6044243621f91c4987 Mon Sep 17 00:00:00 2001 From: Anamika Tripathi Date: Fri, 30 Mar 2018 00:03:54 +0530 Subject: [PATCH 2/5] Created travis (#14) * Update .travis file --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b80f170..45362f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ android: components: - platform-tools - tools - - build-tools-26.0.2 - - android-26 + - build-tools-27.0.3 + - android-27 - extra-android-m2repository before_script: - chmod +x gradlew From 58751342d8fbff5baa497dbb9015e9bcc9e53b85 Mon Sep 17 00:00:00 2001 From: Anamika Tripathi Date: Fri, 30 Mar 2018 00:06:18 +0530 Subject: [PATCH 3/5] Revert "Created travis (#14)" (#15) This reverts commit a541ea514837b23fdbe12b6044243621f91c4987. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 45362f6..b80f170 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ android: components: - platform-tools - tools - - build-tools-27.0.3 - - android-27 + - build-tools-26.0.2 + - android-26 - extra-android-m2repository before_script: - chmod +x gradlew From 410389ff97e9d50f3246ef333c98e2167f3c0e4a Mon Sep 17 00:00:00 2001 From: Anamika Tripathi Date: Fri, 30 Mar 2018 00:08:28 +0530 Subject: [PATCH 4/5] Created travis (#16) * Update .travis file --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b80f170..45362f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ android: components: - platform-tools - tools - - build-tools-26.0.2 - - android-26 + - build-tools-27.0.3 + - android-27 - extra-android-m2repository before_script: - chmod +x gradlew From 93ceabdec15c88f804cd28b163628815f59f3102 Mon Sep 17 00:00:00 2001 From: Jaspreet Date: Sun, 8 Apr 2018 13:45:44 +0530 Subject: [PATCH 5/5] tablayout included --- app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 2 +- .../majorproject/DescriptionActivity.java | 69 +++++++++++++++++++ .../majorproject/FragmentOne.java | 33 +++++++++ .../majorproject/FragmentThree.java | 34 +++++++++ .../majorproject/FragmentTwo.java | 33 +++++++++ app/src/main/res/layout/description.xml | 25 ++++++- .../main/res/layout/fragment_fragment_one.xml | 17 +++++ .../res/layout/fragment_fragment_three.xml | 16 +++++ .../main/res/layout/fragment_fragment_two.xml | 16 +++++ app/src/main/res/values/colors.xml | 3 + app/src/main/res/values/dimens.xml | 9 +++ app/src/main/res/values/strings.xml | 7 ++ app/src/main/res/values/styles.xml | 5 ++ 14 files changed, 267 insertions(+), 4 deletions(-) create mode 100644 app/src/main/java/com/example/androidtechies/majorproject/FragmentOne.java create mode 100644 app/src/main/java/com/example/androidtechies/majorproject/FragmentThree.java create mode 100644 app/src/main/java/com/example/androidtechies/majorproject/FragmentTwo.java create mode 100644 app/src/main/res/layout/fragment_fragment_one.xml create mode 100644 app/src/main/res/layout/fragment_fragment_three.xml create mode 100644 app/src/main/res/layout/fragment_fragment_two.xml create mode 100644 app/src/main/res/values/dimens.xml diff --git a/app/build.gradle b/app/build.gradle index 10200c9..b5ad89e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,11 +24,11 @@ dependencies { implementation 'com.android.support:design:26.1.0' implementation 'com.android.support:cardview-v7:26.1.0' implementation 'com.android.support.constraint:constraint-layout:1.0.2' + implementation 'com.android.support:support-v4:26.1.0' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.1' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' - //Room dependencies implementation 'android.arch.persistence.room:runtime:1.0.0' annotationProcessor 'android.arch.persistence.room:compiler:1.0.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ba96da7..a57c11c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -8,7 +8,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/AppTheme"> + android:theme="@style/MyMaterialTheme.Base"> diff --git a/app/src/main/java/com/example/androidtechies/majorproject/DescriptionActivity.java b/app/src/main/java/com/example/androidtechies/majorproject/DescriptionActivity.java index 6c842fa..c733d4b 100644 --- a/app/src/main/java/com/example/androidtechies/majorproject/DescriptionActivity.java +++ b/app/src/main/java/com/example/androidtechies/majorproject/DescriptionActivity.java @@ -7,11 +7,32 @@ import android.util.Log; import android.widget.TextView; +import android.os.Bundle; +import android.support.design.widget.TabLayout; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentPagerAdapter; +import android.support.v4.view.ViewPager; +import android.support.v7.widget.Toolbar; + +import java.util.ArrayList; +import java.util.List; + +import com.example.androidtechies.majorproject.R; +import com.example.androidtechies.majorproject.FragmentOne; +import com.example.androidtechies.majorproject.FragmentTwo; +import com.example.androidtechies.majorproject.FragmentThree; + import butterknife.BindView; import butterknife.ButterKnife; public class DescriptionActivity extends AppCompatActivity { + private Toolbar toolbar; + private TabLayout tabLayout; + private ViewPager viewPager; + private CollapsingToolbarLayout collapsingToolbar; + @BindView(R.id.intro_brief) TextView introDescription; @BindView(R.id.tech_brief) @@ -34,5 +55,53 @@ protected void onCreate(Bundle savedInstanceState) { introDescription.setText(intro); techDescription.setText(tech); cToolBar.setTitle(title); + + toolbar = (Toolbar) findViewById(R.id.toolbarid); + setSupportActionBar(toolbar); + + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + + viewPager = (ViewPager) findViewById(R.id.viewpager); + setupViewPager(viewPager); + + tabLayout = (TabLayout) findViewById(R.id.tabs); + tabLayout.setupWithViewPager(viewPager); + } + + private void setupViewPager(ViewPager viewPager) { + ViewPagerAdapter adapter = new ViewPagerAdapter(getSupportFragmentManager()); + adapter.addFragment(new FragmentOne(), "INTRO"); + adapter.addFragment(new FragmentTwo(), "TECH"); + adapter.addFragment(new FragmentThree(), "TEAM"); + viewPager.setAdapter(adapter); + } + + class ViewPagerAdapter extends FragmentPagerAdapter { + private final List mFragmentList = new ArrayList<>(); + private final List mFragmentTitleList = new ArrayList<>(); + + public ViewPagerAdapter(FragmentManager manager) { + super(manager); + } + + @Override + public Fragment getItem(int position) { + return mFragmentList.get(position); + } + + @Override + public int getCount() { + return mFragmentList.size(); + } + + public void addFragment(Fragment fragment, String title) { + mFragmentList.add(fragment); + mFragmentTitleList.add(title); + } + + @Override + public CharSequence getPageTitle(int position) { + return mFragmentTitleList.get(position); + } } } diff --git a/app/src/main/java/com/example/androidtechies/majorproject/FragmentOne.java b/app/src/main/java/com/example/androidtechies/majorproject/FragmentOne.java new file mode 100644 index 0000000..8d70c53 --- /dev/null +++ b/app/src/main/java/com/example/androidtechies/majorproject/FragmentOne.java @@ -0,0 +1,33 @@ +package com.example.androidtechies.majorproject; + +/** + * Created by jaspreet on 8/4/18. + */ + +import android.os.Bundle; + import android.support.v4.app.Fragment; + import android.view.LayoutInflater; + import android.view.View; + import android.view.ViewGroup; + + import com.example.androidtechies.majorproject.FragmentOne; + + +public class FragmentOne extends Fragment { + + public FragmentOne() { + // Required empty public constructor + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_fragment_one, container, false); + } +} diff --git a/app/src/main/java/com/example/androidtechies/majorproject/FragmentThree.java b/app/src/main/java/com/example/androidtechies/majorproject/FragmentThree.java new file mode 100644 index 0000000..94635fd --- /dev/null +++ b/app/src/main/java/com/example/androidtechies/majorproject/FragmentThree.java @@ -0,0 +1,34 @@ +package com.example.androidtechies.majorproject; + +/** + * Created by jaspreet on 8/4/18. + */ + + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.example.androidtechies.majorproject.FragmentOne; + + +public class FragmentThree extends Fragment { + + public FragmentThree() { + // Required empty public constructor + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_fragment_three, container, false); + } +} diff --git a/app/src/main/java/com/example/androidtechies/majorproject/FragmentTwo.java b/app/src/main/java/com/example/androidtechies/majorproject/FragmentTwo.java new file mode 100644 index 0000000..8b3bc28 --- /dev/null +++ b/app/src/main/java/com/example/androidtechies/majorproject/FragmentTwo.java @@ -0,0 +1,33 @@ +package com.example.androidtechies.majorproject; + +/** + * Created by jaspreet on 8/4/18. + */ + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.example.androidtechies.majorproject.FragmentOne; + + +public class FragmentTwo extends Fragment { + + public FragmentTwo() { + // Required empty public constructor + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_fragment_two, container, false); + } +} diff --git a/app/src/main/res/layout/description.xml b/app/src/main/res/layout/description.xml index 281e5d6..0bb4a49 100644 --- a/app/src/main/res/layout/description.xml +++ b/app/src/main/res/layout/description.xml @@ -7,32 +7,53 @@ tools:context="com.example.androidtechies.majorproject.SplashScreen" android:orientation="vertical" android:background="#fcfcfc"> + + + + + + android:layout_height="110dip" /> + + + + + + + + diff --git a/app/src/main/res/layout/fragment_fragment_three.xml b/app/src/main/res/layout/fragment_fragment_three.xml new file mode 100644 index 0000000..4363bad --- /dev/null +++ b/app/src/main/res/layout/fragment_fragment_three.xml @@ -0,0 +1,16 @@ + + + + + + diff --git a/app/src/main/res/layout/fragment_fragment_two.xml b/app/src/main/res/layout/fragment_fragment_two.xml new file mode 100644 index 0000000..3d38a0d --- /dev/null +++ b/app/src/main/res/layout/fragment_fragment_two.xml @@ -0,0 +1,16 @@ + + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index fe20846..2669e0d 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -4,6 +4,9 @@ #512DA8 #607D8B #000000 + #FFFFFF + #FFFFFF + #000000 #212121 #757575 #FFFFFF diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000..0048a00 --- /dev/null +++ b/app/src/main/res/values/dimens.xml @@ -0,0 +1,9 @@ + + + 40dp + 16dp + 264dp + 16dp + 14sp + 72dp + \ 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 56a09bd..934f3f0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,6 +2,10 @@ DetailPage + Intro + Tech + Team + IntroDuction Technology used @@ -73,4 +77,7 @@ customers purchase together. It takes its name from the idea of customers throwing all their purchases into a shopping cart (a "market basket") during grocery shopping. + + Hello blank fragment + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 0eb88fe..05eef41 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -2,10 +2,15 @@ + +