diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 268d3c6..3ec3c9a 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index b6d6da5..150d2f8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -33,4 +33,5 @@ dependencies { implementation 'com.android.support:recyclerview-v7:27.1.1' implementation 'com.readystatesoftware.sqliteasset:sqliteassethelper:+' implementation 'com.github.mancj:MaterialSearchBar:0.7.6' + implementation 'com.codemybrainsout.onboarding:onboarder:1.0.4' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 08d8e34..2cb496d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -36,6 +36,9 @@ android:authorities="com.example.gerin.inventory" android:exported="false" /> + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/gerin/inventory/MainActivity.java b/app/src/main/java/com/example/gerin/inventory/MainActivity.java index 0a9caba..a55a4bf 100644 --- a/app/src/main/java/com/example/gerin/inventory/MainActivity.java +++ b/app/src/main/java/com/example/gerin/inventory/MainActivity.java @@ -1,6 +1,7 @@ package com.example.gerin.inventory; import android.content.Intent; +import android.content.SharedPreferences; import android.os.Handler; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; @@ -13,6 +14,7 @@ public class MainActivity extends AppCompatActivity { private static int SPLASH_TIME_OUT = 4000; + public static final String MY_PREFS_NAME = "MyPrefsFile"; @Override protected void onCreate(Bundle savedInstanceState) { @@ -23,6 +25,10 @@ protected void onCreate(Bundle savedInstanceState) { TextView name = (TextView) findViewById(R.id.splash_screen_name); + SharedPreferences.Editor editor = getSharedPreferences(MY_PREFS_NAME, MODE_PRIVATE).edit(); + editor.putBoolean("firstTime", false); + editor.apply(); + // create animations from resources Animation fromBottom = AnimationUtils.loadAnimation(this,R.anim.from_bottom); Animation fadeIn = AnimationUtils.loadAnimation(this,R.anim.fade_in); diff --git a/app/src/main/java/com/example/gerin/inventory/YourActivity.java b/app/src/main/java/com/example/gerin/inventory/YourActivity.java new file mode 100644 index 0000000..f5c7d0d --- /dev/null +++ b/app/src/main/java/com/example/gerin/inventory/YourActivity.java @@ -0,0 +1,87 @@ +package com.example.gerin.inventory; + +import android.content.Intent; +import android.graphics.Typeface; +import android.os.Build; +import android.os.Bundle; +import android.support.v4.content.ContextCompat; +import android.widget.Toast; + +import com.codemybrainsout.onboarder.AhoyOnboarderActivity; +import com.codemybrainsout.onboarder.AhoyOnboarderCard; + +import java.util.ArrayList; +import java.util.List; + +public class YourActivity extends AhoyOnboarderActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + AhoyOnboarderCard ahoyOnboarderCard1 = new AhoyOnboarderCard("Welcome to your", "Inventory", R.drawable.intro2); + AhoyOnboarderCard ahoyOnboarderCard2 = new AhoyOnboarderCard("ADD", "Keep track of your growing inventory by adding items and details you care about.", R.drawable.add_intro); + AhoyOnboarderCard ahoyOnboarderCard3 = new AhoyOnboarderCard("EDIT", "Always keep your inventory up to date by editing your items.", R.drawable.edit_intro); + AhoyOnboarderCard ahoyOnboarderCard4 = new AhoyOnboarderCard("SEARCH", "Find your items easily using the search bar.", R.drawable.search_intro); + AhoyOnboarderCard ahoyOnboarderCard5 = new AhoyOnboarderCard("SORT", "Organize you items to find them at a glance.", R.drawable.sort_intro); + AhoyOnboarderCard ahoyOnboarderCard6 = new AhoyOnboarderCard("VIEW", "Click on an item to see a more detailed description.", R.drawable.view_intro); + + + ahoyOnboarderCard1.setBackgroundColor(R.color.black_transparent); + ahoyOnboarderCard2.setBackgroundColor(R.color.black_transparent); + ahoyOnboarderCard3.setBackgroundColor(R.color.black_transparent); + ahoyOnboarderCard4.setBackgroundColor(R.color.black_transparent); + ahoyOnboarderCard5.setBackgroundColor(R.color.black_transparent); + ahoyOnboarderCard6.setBackgroundColor(R.color.black_transparent); + + List pages = new ArrayList<>(); + + pages.add(ahoyOnboarderCard1); + pages.add(ahoyOnboarderCard2); + pages.add(ahoyOnboarderCard3); + pages.add(ahoyOnboarderCard4); + pages.add(ahoyOnboarderCard5); + pages.add(ahoyOnboarderCard6); + + + for (AhoyOnboarderCard page : pages) { + page.setTitleColor(R.color.white); + page.setDescriptionColor(R.color.grey_200); + //page.setDescriptionTextSize(dpToPixels(8, this)); + + } + + ahoyOnboarderCard1.setTitleTextSize(dpToPixels(8, this)); + ahoyOnboarderCard1.setDescriptionTextSize(dpToPixels(8, this)); + ahoyOnboarderCard1.setDescriptionColor(R.color.white); + + ahoyOnboarderCard1.setIconLayoutParams(600, 600, 1, 1, 1, 1); + ahoyOnboarderCard2.setIconLayoutParams(1000, 800, 1, 1, 1, 1); + ahoyOnboarderCard3.setIconLayoutParams(1000, 500, 1, 1, 1, 100); + ahoyOnboarderCard4.setIconLayoutParams(1000, 500, 1, 1, 1, 100); + ahoyOnboarderCard5.setIconLayoutParams(1000, 500, 1, 1, 1, 100); + ahoyOnboarderCard6.setIconLayoutParams(600, 600, 1, 1, 1, 1); + + + setFinishButtonTitle("Let's Get Started"); + showNavigationControls(true); + setGradientBackground(); + + //set the button style you created + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { + setFinishButtonDrawableStyle(ContextCompat.getDrawable(this, R.drawable.rounded_button)); + } + +// Typeface face = Typeface.createFromAsset(getAssets(), "fonts/Roboto-Light.ttf"); +// setFont(face); + + setOnboardPages(pages); + } + + @Override + public void onFinishButtonPressed() { + Intent catalogIntent = new Intent(YourActivity.this, CatalogActivity.class); + startActivity(catalogIntent); + finish(); + } +} diff --git a/app/src/main/res/drawable/add_intro.png b/app/src/main/res/drawable/add_intro.png new file mode 100644 index 0000000..27f6ae0 Binary files /dev/null and b/app/src/main/res/drawable/add_intro.png differ diff --git a/app/src/main/res/drawable/drawable-hdpi/add_intro.png.png b/app/src/main/res/drawable/drawable-hdpi/add_intro.png.png new file mode 100644 index 0000000..3ac5dfa Binary files /dev/null and b/app/src/main/res/drawable/drawable-hdpi/add_intro.png.png differ diff --git a/app/src/main/res/drawable/drawable-hdpi/edit_intro.png.png b/app/src/main/res/drawable/drawable-hdpi/edit_intro.png.png new file mode 100644 index 0000000..6bb989b Binary files /dev/null and b/app/src/main/res/drawable/drawable-hdpi/edit_intro.png.png differ diff --git a/app/src/main/res/drawable/drawable-hdpi/search_intro.png.png b/app/src/main/res/drawable/drawable-hdpi/search_intro.png.png new file mode 100644 index 0000000..7b44cdb Binary files /dev/null and b/app/src/main/res/drawable/drawable-hdpi/search_intro.png.png differ diff --git a/app/src/main/res/drawable/drawable-xhdpi/add_intro.png.png b/app/src/main/res/drawable/drawable-xhdpi/add_intro.png.png new file mode 100644 index 0000000..c971986 Binary files /dev/null and b/app/src/main/res/drawable/drawable-xhdpi/add_intro.png.png differ diff --git a/app/src/main/res/drawable/drawable-xhdpi/edit_intro.png.png b/app/src/main/res/drawable/drawable-xhdpi/edit_intro.png.png new file mode 100644 index 0000000..0ff7f03 Binary files /dev/null and b/app/src/main/res/drawable/drawable-xhdpi/edit_intro.png.png differ diff --git a/app/src/main/res/drawable/drawable-xhdpi/search_intro.png.png b/app/src/main/res/drawable/drawable-xhdpi/search_intro.png.png new file mode 100644 index 0000000..5b3325d Binary files /dev/null and b/app/src/main/res/drawable/drawable-xhdpi/search_intro.png.png differ diff --git a/app/src/main/res/drawable/edit_intro.png b/app/src/main/res/drawable/edit_intro.png new file mode 100644 index 0000000..6bd38c5 Binary files /dev/null and b/app/src/main/res/drawable/edit_intro.png differ diff --git a/app/src/main/res/drawable/intro1.png b/app/src/main/res/drawable/intro1.png new file mode 100644 index 0000000..66c8c4a Binary files /dev/null and b/app/src/main/res/drawable/intro1.png differ diff --git a/app/src/main/res/drawable/intro2.png b/app/src/main/res/drawable/intro2.png new file mode 100644 index 0000000..69ca83e Binary files /dev/null and b/app/src/main/res/drawable/intro2.png differ diff --git a/app/src/main/res/drawable/search_intro.png b/app/src/main/res/drawable/search_intro.png new file mode 100644 index 0000000..19e57be Binary files /dev/null and b/app/src/main/res/drawable/search_intro.png differ diff --git a/app/src/main/res/drawable/sort_intro.png b/app/src/main/res/drawable/sort_intro.png new file mode 100644 index 0000000..39b1545 Binary files /dev/null and b/app/src/main/res/drawable/sort_intro.png differ diff --git a/app/src/main/res/drawable/view_intro.png b/app/src/main/res/drawable/view_intro.png new file mode 100644 index 0000000..1d0da15 Binary files /dev/null and b/app/src/main/res/drawable/view_intro.png differ diff --git a/app/src/main/res/layout/activity_editor.xml b/app/src/main/res/layout/activity_editor.xml index cfda12b..efbee3a 100644 --- a/app/src/main/res/layout/activity_editor.xml +++ b/app/src/main/res/layout/activity_editor.xml @@ -94,13 +94,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:weightSum="10"> - - + > + + + + + \ 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 13f1ac4..733de25 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -9,7 +9,7 @@ Name Quantity Save - Price + $ Price Description Describe the product $