diff --git a/app/build.gradle b/app/build.gradle index 27872f3..27deb78 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 27 defaultConfig { - applicationId "com.foodx.nsh" + applicationId "com.mangwalo.nsh" minSdkVersion 17 targetSdkVersion 27 multiDexEnabled true @@ -13,14 +13,13 @@ android { } buildTypes { release { - minifyEnabled false + minifyEnabled true + shrinkResources true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } buildToolsVersion '27.0.3' } - - dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'com.android.support:multidex:1.0.3' @@ -29,7 +28,6 @@ dependencies { implementation 'com.android.support:recyclerview-v7:27.1.1' implementation 'com.android.support:cardview-v7:27.1.1' implementation 'com.google.code.gson:gson:2.8.2' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'com.android.support:support-v4:27.1.1' testImplementation 'junit:junit:4.12' @@ -42,5 +40,6 @@ dependencies { implementation 'com.android.support:design:27.1.1' implementation 'com.firebaseui:firebase-ui-auth:4.1.0' implementation 'com.google.firebase:firebase-core:16.0.1' + compile 'com.github.wooplr:Spotlight:1.2.3' } apply plugin: 'com.google.gms.google-services' diff --git a/app/google-services.json b/app/google-services.json index 9bf1c5c..4f40881 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -1,27 +1,27 @@ { "project_info": { - "project_number": "910597300841", - "firebase_url": "https://fudo-3a55c.firebaseio.com", - "project_id": "fudo-3a55c", - "storage_bucket": "fudo-3a55c.appspot.com" + "project_number": "594029150216", + "firebase_url": "https://mangwalo-1beb5.firebaseio.com", + "project_id": "mangwalo-1beb5", + "storage_bucket": "mangwalo-1beb5.appspot.com" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:910597300841:android:2460fa31909bbdf0", + "mobilesdk_app_id": "1:594029150216:android:bfbf0bf943801d15", "android_client_info": { - "package_name": "com.foodx.nsh" + "package_name": "com.mangwalo.nsh" } }, "oauth_client": [ { - "client_id": "910597300841-2jgllviqg8r7t2ip8m6bk06la2inpp4f.apps.googleusercontent.com", + "client_id": "594029150216-ae0ko4g4ei26taodpdv03ggak48vts9i.apps.googleusercontent.com", "client_type": 3 } ], "api_key": [ { - "current_key": "AIzaSyDVX9sm495jmN1rN9uCKrzWEtb6kb9nv-g" + "current_key": "AIzaSyDZrvh1LeJW0PpXppKkeAUPRUGbn3AroPM" } ], "services": { diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index f1b4245..89b30ab 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -1,21 +1,178 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. +## Add project specific ProGuard rules here. +## You can control the set of applied configuration files using the +## proguardFiles setting in build.gradle. +## +## For more details, see +## http://developer.android.com/guide/developing/tools/proguard.html +# +## If your project uses WebView with JS, uncomment the following +## and specify the fully qualified class name to the JavaScript interface +## class: +##-keepclassmembers class fqcn.of.javascript.interface.for.webview { +## public *; +##} +# +## Uncomment this to preserve the line number information for +## debugging stack traces. +##-keepattributes SourceFile,LineNumberTable +# +## If you keep the line number information, uncomment this to +## hide the original source file name. +##-renamesourcefileattribute SourceFile +#-injars bin/classes +#-injars libs +#-outjars bin/classes-processed.jar +# +#-libraryjars /usr/local/android-sdk/platforms/android-9/android.jar +##-libraryjars /usr/local/android-sdk/add-ons/google_apis-7_r01/libs/maps.jar +## ... +# +## Save the obfuscation mapping to a file, so you can de-obfuscate any stack +## traces later on. +# +#-printmapping bin/classes-processed.map +# +## You can print out the seeds that are matching the keep options below. +# +##-printseeds bin/classes-processed.seeds +# +## Preverification is irrelevant for the dex compiler and the Dalvik VM. +# +#-dontpreverify +# +## Reduce the size of the output some more. +# +#-repackageclasses '' +#-allowaccessmodification +# +## Switch off some optimizations that trip older versions of the Dalvik VM. +# +#-optimizations !code/simplification/arithmetic +# +## Keep a fixed source file attribute and all line number tables to get line +## numbers in the stack traces. +## You can comment this out if you're not interested in stack traces. +# #-renamesourcefileattribute SourceFile +#-keepattributes SourceFile,LineNumberTable +# +## RemoteViews might need annotations. +# +#-keepattributes *Annotation* +# +## Preserve all fundamental application classes. +# +#-keep public class * extends android.app.Activity +#-keep public class * extends android.app.Application +#-keep public class * extends android.app.Service +#-keep public class * extends android.content.BroadcastReceiver +#-keep public class * extends android.content.ContentProvider +# +## Preserve all View implementations, their special context constructors, and +## their setters. +# +#-keep public class * extends android.view.View { +# public (android.content.Context); +# public (android.content.Context, android.util.AttributeSet); +# public (android.content.Context, android.util.AttributeSet, int); +# public void set*(...); +#} +# +## Preserve all classes that have special context constructors, and the +## constructors themselves. +# +#-keepclasseswithmembers class * { +# public (android.content.Context, android.util.AttributeSet); +#} +# +## Preserve all classes that have special context constructors, and the +## constructors themselves. +# +#-keepclasseswithmembers class * { +# public (android.content.Context, android.util.AttributeSet, int); +#} +# +## Preserve all possible onClick handlers. +# +#-keepclassmembers class * extends android.content.Context { +# public void *(android.view.View); +# public void *(android.view.MenuItem); +#} +# +## Preserve the special fields of all Parcelable implementations. +# +#-keepclassmembers class * implements android.os.Parcelable { +# static android.os.Parcelable$Creator CREATOR; +#} +# +## Preserve static fields of inner classes of R classes that might be accessed +## through introspection. +# +#-keepclassmembers class **.R$* { +# public static ; +#} +# +## Preserve annotated Javascript interface methods. +# +#-keepclassmembers class * { +# @android.webkit.JavascriptInterface ; +#} +# +## Preserve the required interface from the License Verification Library +## (but don't nag the developer if the library is not used at all). +# +#-keep public interface com.android.vending.licensing.ILicensingService +# +#-dontnote com.android.vending.licensing.ILicensingService +# +## The Android Compatibility library references some classes that may not be +## present in all versions of the API, but we know that's ok. +# +#-dontwarn android.support.** +# +## Preserve all native method names and the names of their classes. +# +#-keepclasseswithmembernames,includedescriptorclasses class * { +# native ; +#} +# +## Preserve the special static methods that are required in all enumeration +## classes. +# +#-keepclassmembers,allowoptimization enum * { +# public static **[] values(); +# public static ** valueOf(java.lang.String); +#} +# +## Explicitly preserve all serialization members. The Serializable interface +## is only a marker interface, so it wouldn't save them. +## You can comment this out if your application doesn't use serialization. +## If your code contains serializable classes that have to be backward +## compatible, please refer to the manual. +# +#-keepclassmembers class * implements java.io.Serializable { +# static final long serialVersionUID; +# static final java.io.ObjectStreamField[] serialPersistentFields; +# private void writeObject(java.io.ObjectOutputStream); +# private void readObject(java.io.ObjectInputStream); +# java.lang.Object writeReplace(); +# java.lang.Object readResolve(); +#} +# +## Your application may contain more items that need to be preserved; +## typically classes that are dynamically created using Class.forName: +# +## -keep public class mypackage.MyClass +## -keep public interface mypackage.MyInterface +## -keep public class * implements mypackage.MyInterface +# +## If you wish, you can let the optimization step remove Android logging calls. +# +##-assumenosideeffects class android.util.Log { +## public static boolean isLoggable(java.lang.String, int); +## public static int v(...); +## public static int i(...); +## public static int w(...); +## public static int d(...); +## public static int e(...); +##} \ No newline at end of file diff --git a/app/src/androidTest/java/com/foodx/nsh/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/mangwalo/nsh/ExampleInstrumentedTest.java similarity index 96% rename from app/src/androidTest/java/com/foodx/nsh/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/mangwalo/nsh/ExampleInstrumentedTest.java index 90ec173..dbef44f 100644 --- a/app/src/androidTest/java/com/foodx/nsh/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/mangwalo/nsh/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.foodx.nsh; +package com.mangwalo.nsh; import android.content.Context; import android.support.test.InstrumentationRegistry; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6e3a64f..9071639 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.mangwalo.nsh"> @@ -8,16 +8,18 @@ android:allowBackup="true" android:label="@string/app_name" android:supportsRtl="true" - android:theme="@style/AppTheme"> - - - - + android:theme="@style/AppTheme" + > + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/foodx/nsh/fragments/DetailsFragment.java b/app/src/main/java/com/foodx/nsh/fragments/DetailsFragment.java deleted file mode 100644 index 3783061..0000000 --- a/app/src/main/java/com/foodx/nsh/fragments/DetailsFragment.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.foodx.nsh.fragments; - - -import android.annotation.SuppressLint; -import android.app.Activity; -import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import com.foodx.nsh.R; - - -/** - * A simple {@link Fragment} subclass. - */ -public class DetailsFragment extends Fragment { - - Activity activity; - public DetailsFragment() { - // Required empty public constructor - } - @SuppressLint("ValidFragment") - public DetailsFragment(Activity activity) { - this.activity = activity; - // Required empty public constructor - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // Inflate the layout for this fragment - View view = inflater.inflate(R.layout.fragment_details, container, false); - return view; - } - -} diff --git a/app/src/main/java/com/foodx/nsh/activity/FirebaseLogin.java b/app/src/main/java/com/mangwalo/nsh/activity/FirebaseLogin.java similarity index 89% rename from app/src/main/java/com/foodx/nsh/activity/FirebaseLogin.java rename to app/src/main/java/com/mangwalo/nsh/activity/FirebaseLogin.java index 2cf5966..c32e52c 100644 --- a/app/src/main/java/com/foodx/nsh/activity/FirebaseLogin.java +++ b/app/src/main/java/com/mangwalo/nsh/activity/FirebaseLogin.java @@ -1,4 +1,4 @@ -package com.foodx.nsh.activity; +package com.mangwalo.nsh.activity; import android.content.Context; import android.content.Intent; @@ -7,7 +7,6 @@ import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.View; -import android.widget.Button; import android.widget.EditText; import android.widget.ImageView; import android.widget.ProgressBar; @@ -16,13 +15,12 @@ import com.firebase.ui.auth.AuthUI; import com.firebase.ui.auth.IdpResponse; -import com.foodx.nsh.R; +import com.mangwalo.nsh.R; import com.google.firebase.auth.FirebaseAuth; import com.google.firebase.auth.FirebaseUser; import com.squareup.picasso.Picasso; -import org.w3c.dom.Text; - +import java.net.MalformedURLException; import java.util.Arrays; import java.util.List; @@ -39,6 +37,7 @@ public class FirebaseLogin extends AppCompatActivity { EditText mobile; String number; ImageView login_display; + ProgressBar pb; private List providers; SharedPreferences sharedPreferences; // private SharedPref sharedPref; @@ -49,7 +48,8 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_login); // mobile = findViewById(R.id.mobile); // number = mobile.getText().toString(); - login_display = findViewById(R.id.image_food); + pb = findViewById(R.id.pb); + login_display = findViewById(R.id.image); Picasso.get().load("https://i.dlpng.com/static/png/151888_preview.png").into(login_display); loginBtn = findViewById(R.id.login); // progressBar = (ProgressBar) findViewById(R.id.login_progress); @@ -60,7 +60,7 @@ protected void onCreate(Bundle savedInstanceState) { String Login = sharedPreferences.getString("Login", "gsbs"); if (Login.equals("Complete")) { // Log.v("ABSSSSDD",sharedPreferences.getString("phone",null)); - startActivity(new Intent(this, MainActivity.class)); + startActivity(new Intent(this, Splash.class)); finish(); } } @@ -73,7 +73,8 @@ public void onLoginBtnClick(View v) { .setLogo(R.drawable.ic_launcher_background) .build(), RC_SIGN_IN); - loginBtn.setVisibility(View.GONE); +// loginBtn.setVisibility(View.GONE); + pb.setVisibility(View.VISIBLE); } @Override @@ -82,7 +83,8 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { if (requestCode == RC_SIGN_IN) { IdpResponse response = IdpResponse.fromResultIntent(data); - + pb.setVisibility(View.GONE); + finish(); if (resultCode == RESULT_OK) { // Successfully signed in FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser(); @@ -96,9 +98,10 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { } else { // Sign in failed, check response for error code - progressBar.setVisibility(View.GONE); - loginBtn.setVisibility(View.VISIBLE); +// progressBar.setVisibility(View.GONE); +// loginBtn.setVisibility(View.VISIBLE); Toast.makeText(this, "Login Failed. Try Again!!", Toast.LENGTH_SHORT).show(); + return; } } diff --git a/app/src/main/java/com/foodx/nsh/activity/MainActivity.java b/app/src/main/java/com/mangwalo/nsh/activity/MainActivity.java similarity index 91% rename from app/src/main/java/com/foodx/nsh/activity/MainActivity.java rename to app/src/main/java/com/mangwalo/nsh/activity/MainActivity.java index 16b098e..2f7432e 100644 --- a/app/src/main/java/com/foodx/nsh/activity/MainActivity.java +++ b/app/src/main/java/com/mangwalo/nsh/activity/MainActivity.java @@ -1,4 +1,4 @@ -package com.foodx.nsh.activity; +package com.mangwalo.nsh.activity; import android.annotation.SuppressLint; import android.content.Context; @@ -8,24 +8,31 @@ import android.graphics.Color; import android.os.Bundle; import android.os.Handler; +import android.os.Looper; import android.support.annotation.NonNull; import android.support.design.widget.BottomNavigationView; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; import android.support.v7.app.AppCompatActivity; import android.view.MenuItem; +import android.view.View; +import android.widget.TextView; import android.widget.Toast; -import com.foodx.nsh.fragments.DetailsFragment; -import com.foodx.nsh.R; -import com.foodx.nsh.fragments.CartFragment; -import com.foodx.nsh.fragments.HotelsFragment; -import com.foodx.nsh.fragments.SettingsFragment; +import com.mangwalo.nsh.R; +import com.mangwalo.nsh.fragments.CartFragment; +import com.mangwalo.nsh.fragments.DetailsFragment; +import com.mangwalo.nsh.fragments.HotelsFragment; +import com.mangwalo.nsh.fragments.SettingsFragment; +import com.wooplr.spotlight.SpotlightView; -public class MainActivity extends AppCompatActivity { +public class MainActivity extends AppCompatActivity { + private SpotlightView spotLight; private BottomNavigationView btmView; boolean doubleBackToExitPressedOnce = false; + + TextView play; // public static HashMap<,String> orderList; @SuppressLint("ResourceType") @Override diff --git a/app/src/main/java/com/foodx/nsh/activity/MenuActivity.java b/app/src/main/java/com/mangwalo/nsh/activity/MenuActivity.java similarity index 68% rename from app/src/main/java/com/foodx/nsh/activity/MenuActivity.java rename to app/src/main/java/com/mangwalo/nsh/activity/MenuActivity.java index 98aa819..679971d 100644 --- a/app/src/main/java/com/foodx/nsh/activity/MenuActivity.java +++ b/app/src/main/java/com/mangwalo/nsh/activity/MenuActivity.java @@ -1,12 +1,19 @@ -package com.foodx.nsh.activity; +package com.mangwalo.nsh.activity; +import android.content.Context; +import android.content.SharedPreferences; +import android.graphics.Color; +import android.graphics.Typeface; import android.os.Bundle; +import android.os.Handler; +import android.os.Looper; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearSnapHelper; import android.support.v7.widget.RecyclerView; import android.util.Log; import android.view.View; +import android.widget.ProgressBar; import android.widget.TextView; import com.android.volley.Request; @@ -15,10 +22,12 @@ import com.android.volley.VolleyError; import com.android.volley.toolbox.StringRequest; import com.android.volley.toolbox.Volley; -import com.foodx.nsh.R; -import com.foodx.nsh.adapter.MenuAdapter; -import com.foodx.nsh.model.Item; -import com.foodx.nsh.model.Menu; +import com.mangwalo.nsh.R; +import com.mangwalo.nsh.adapter.MenuAdapter; +import com.mangwalo.nsh.model.Item; +import com.mangwalo.nsh.model.Menu; +import com.wooplr.spotlight.SpotlightView; +import com.wooplr.spotlight.prefs.PreferencesManager; import org.json.JSONArray; import org.json.JSONException; @@ -35,14 +44,39 @@ public class MenuActivity extends AppCompatActivity { private RecyclerView recyclerView; private MenuAdapter menuAdapter; private List menuList; + ProgressBar pb; String id; String mere; JSONArray array; + SpotlightView spotLight; + TextView play,play2; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_menu); + play = findViewById(R.id.play); + SharedPreferences sharedPreferences2; + SharedPreferences.Editor editor3; + sharedPreferences2 = getSharedPreferences("time", Context.MODE_PRIVATE); + String check = sharedPreferences2.getString("menuf",null); + if (check != null) + {} + else + { + editor3 = sharedPreferences2.edit(); + editor3.putString("menuf","abc"); + editor3.apply(); + new Handler(Looper.getMainLooper()).postDelayed(new Runnable() { + @Override + public void run() { + showIntro(play, "fab_intro"); + } + }, 0); + + PreferencesManager mPreferencesManager = new PreferencesManager(this); + mPreferencesManager.resetAll(); + } onInit(); } @@ -50,6 +84,7 @@ protected void onCreate(Bundle savedInstanceState) { public void onInit() { hotelName = findViewById(R.id.hotel_name); recyclerView = findViewById(R.id.recyclerView); + pb = findViewById(R.id.load_menu); Bundle bundle = getIntent().getExtras(); hotelName.setText(bundle.getString("name")); @@ -92,9 +127,11 @@ public int findTargetSnapPosition(RecyclerView.LayoutManager layoutManager, int } }; snapHelper.attachToRecyclerView(recyclerView); - try { + try + { getData(); - } catch (JSONException e) { + } catch (JSONException e) + { e.printStackTrace(); } } @@ -133,6 +170,7 @@ public void onResponse(String jsonArray) { e.printStackTrace(); } menuAdapter.notifyDataSetChanged(); + pb.setVisibility(View.GONE); } }, new Response.ErrorListener() { @@ -152,4 +190,28 @@ public void onBackPressed(){ super.onBackPressed(); this.overridePendingTransition(R.anim.fadein,R.anim.fadeout); } + private void showIntro(View view, String usageId) { + spotLight = new SpotlightView.Builder(this) + .introAnimationDuration(400) + .enableRevealAnimation(true) + .performClick(true) + .fadeinTextDuration(400) + //.setTypeface(FontUtil.get(this, "RemachineScript_Personal_Use")) + .headingTvColor(Color.parseColor("#9e9d24")) + .headingTvSize(32) + .headingTvText("Swipe left-right & Scroll up-down") + .subHeadingTvColor(Color.parseColor("#cddc39")) + .subHeadingTvSize(16) + .subHeadingTvText("To see other categories & items") + .maskColor(Color.parseColor("#dc000000")) + .target(view) + .lineAnimDuration(400) + .lineAndArcColor(Color.parseColor("#ffffff")) + .dismissOnTouch(true) + .dismissOnBackPress(true) + .enableDismissAfterShown(true) + .usageId(usageId) //UNIQUE ID + .show(); + } + } diff --git a/app/src/main/java/com/foodx/nsh/activity/Splash.java b/app/src/main/java/com/mangwalo/nsh/activity/Splash.java similarity index 88% rename from app/src/main/java/com/foodx/nsh/activity/Splash.java rename to app/src/main/java/com/mangwalo/nsh/activity/Splash.java index 15514c2..05ca96c 100644 --- a/app/src/main/java/com/foodx/nsh/activity/Splash.java +++ b/app/src/main/java/com/mangwalo/nsh/activity/Splash.java @@ -1,11 +1,11 @@ -package com.foodx.nsh.activity; +package com.mangwalo.nsh.activity; import android.content.Intent; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.widget.ImageView; -import com.foodx.nsh.R; +import com.mangwalo.nsh.R; import com.squareup.picasso.Picasso; /** @@ -29,7 +29,7 @@ public void run() { } catch (Exception e) { e.printStackTrace(); } finally { - Intent intent = new Intent(Splash.this, FirebaseLogin.class); + Intent intent = new Intent(Splash.this, MainActivity.class); startActivity(intent); finish(); overridePendingTransition(0,0); diff --git a/app/src/main/java/com/foodx/nsh/adapter/CartAdapter.java b/app/src/main/java/com/mangwalo/nsh/adapter/CartAdapter.java similarity index 98% rename from app/src/main/java/com/foodx/nsh/adapter/CartAdapter.java rename to app/src/main/java/com/mangwalo/nsh/adapter/CartAdapter.java index 414830c..65bd3db 100644 --- a/app/src/main/java/com/foodx/nsh/adapter/CartAdapter.java +++ b/app/src/main/java/com/mangwalo/nsh/adapter/CartAdapter.java @@ -1,4 +1,4 @@ -package com.foodx.nsh.adapter; +package com.mangwalo.nsh.adapter; import android.app.Activity; import android.content.Context; @@ -9,13 +9,12 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; -import com.foodx.nsh.R; -import com.foodx.nsh.model.Cart; +import com.mangwalo.nsh.R; +import com.mangwalo.nsh.model.Cart; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; diff --git a/app/src/main/java/com/foodx/nsh/adapter/HotelAdapter.java b/app/src/main/java/com/mangwalo/nsh/adapter/HotelAdapter.java similarity index 96% rename from app/src/main/java/com/foodx/nsh/adapter/HotelAdapter.java rename to app/src/main/java/com/mangwalo/nsh/adapter/HotelAdapter.java index 1ce9d8f..78131a3 100644 --- a/app/src/main/java/com/foodx/nsh/adapter/HotelAdapter.java +++ b/app/src/main/java/com/mangwalo/nsh/adapter/HotelAdapter.java @@ -1,4 +1,4 @@ -package com.foodx.nsh.adapter; +package com.mangwalo.nsh.adapter; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -15,9 +15,9 @@ import android.widget.ImageView; import android.widget.TextView; -import com.foodx.nsh.R; -import com.foodx.nsh.activity.MenuActivity; -import com.foodx.nsh.model.Hotel; +import com.mangwalo.nsh.R; +import com.mangwalo.nsh.activity.MenuActivity; +import com.mangwalo.nsh.model.Hotel; import com.squareup.picasso.Picasso; import java.util.ArrayList; diff --git a/app/src/main/java/com/foodx/nsh/adapter/ItemAdapter.java b/app/src/main/java/com/mangwalo/nsh/adapter/ItemAdapter.java similarity index 98% rename from app/src/main/java/com/foodx/nsh/adapter/ItemAdapter.java rename to app/src/main/java/com/mangwalo/nsh/adapter/ItemAdapter.java index a1a9216..c6fb3c2 100644 --- a/app/src/main/java/com/foodx/nsh/adapter/ItemAdapter.java +++ b/app/src/main/java/com/mangwalo/nsh/adapter/ItemAdapter.java @@ -1,4 +1,4 @@ -package com.foodx.nsh.adapter; +package com.mangwalo.nsh.adapter; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -6,7 +6,6 @@ import android.animation.ObjectAnimator; import android.app.Activity; import android.content.Context; -import android.content.Intent; import android.content.SharedPreferences; import android.support.annotation.NonNull; import android.support.v7.widget.RecyclerView; @@ -19,11 +18,9 @@ import android.widget.TextView; import android.widget.Toast; -import com.foodx.nsh.R; -import com.foodx.nsh.activity.MenuActivity; -import com.foodx.nsh.model.Cart; -import com.foodx.nsh.model.Hotel; -import com.foodx.nsh.model.Item; +import com.mangwalo.nsh.R; +import com.mangwalo.nsh.model.Cart; +import com.mangwalo.nsh.model.Item; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.squareup.picasso.Picasso; diff --git a/app/src/main/java/com/foodx/nsh/adapter/MenuAdapter.java b/app/src/main/java/com/mangwalo/nsh/adapter/MenuAdapter.java similarity index 96% rename from app/src/main/java/com/foodx/nsh/adapter/MenuAdapter.java rename to app/src/main/java/com/mangwalo/nsh/adapter/MenuAdapter.java index 2763eba..c9eff1d 100644 --- a/app/src/main/java/com/foodx/nsh/adapter/MenuAdapter.java +++ b/app/src/main/java/com/mangwalo/nsh/adapter/MenuAdapter.java @@ -1,4 +1,4 @@ -package com.foodx.nsh.adapter; +package com.mangwalo.nsh.adapter; import android.animation.AnimatorSet; import android.animation.ObjectAnimator; @@ -15,9 +15,9 @@ import android.widget.ImageView; import android.widget.TextView; -import com.foodx.nsh.R; -import com.foodx.nsh.activity.MainActivity; -import com.foodx.nsh.model.Menu; +import com.mangwalo.nsh.R; +import com.mangwalo.nsh.activity.MainActivity; +import com.mangwalo.nsh.model.Menu; import com.squareup.picasso.Picasso; import java.util.List; diff --git a/app/src/main/java/com/foodx/nsh/adapter/OrderAdapter.java b/app/src/main/java/com/mangwalo/nsh/adapter/OrderAdapter.java similarity index 93% rename from app/src/main/java/com/foodx/nsh/adapter/OrderAdapter.java rename to app/src/main/java/com/mangwalo/nsh/adapter/OrderAdapter.java index 32d9dd7..3d80b94 100644 --- a/app/src/main/java/com/foodx/nsh/adapter/OrderAdapter.java +++ b/app/src/main/java/com/mangwalo/nsh/adapter/OrderAdapter.java @@ -1,4 +1,4 @@ -package com.foodx.nsh.adapter; +package com.mangwalo.nsh.adapter; import android.app.Activity; import android.support.annotation.NonNull; @@ -8,9 +8,8 @@ import android.view.View; import android.view.ViewGroup; -import com.foodx.nsh.R; -import com.foodx.nsh.model.Cart; -import com.foodx.nsh.model.OrderArray; +import com.mangwalo.nsh.R; +import com.mangwalo.nsh.model.OrderArray; import java.util.List; diff --git a/app/src/main/java/com/foodx/nsh/adapter/OrderItemAdapter.java b/app/src/main/java/com/mangwalo/nsh/adapter/OrderItemAdapter.java similarity index 94% rename from app/src/main/java/com/foodx/nsh/adapter/OrderItemAdapter.java rename to app/src/main/java/com/mangwalo/nsh/adapter/OrderItemAdapter.java index 5f3f69d..a0fe15b 100644 --- a/app/src/main/java/com/foodx/nsh/adapter/OrderItemAdapter.java +++ b/app/src/main/java/com/mangwalo/nsh/adapter/OrderItemAdapter.java @@ -1,4 +1,4 @@ -package com.foodx.nsh.adapter; +package com.mangwalo.nsh.adapter; import android.app.Activity; import android.support.annotation.NonNull; @@ -13,12 +13,8 @@ import com.android.volley.VolleyError; import com.android.volley.toolbox.StringRequest; import com.android.volley.toolbox.Volley; -import com.foodx.nsh.R; -import com.foodx.nsh.model.Cart; -import com.foodx.nsh.model.Hotel; -import com.foodx.nsh.model.OrderItem; - -import org.w3c.dom.Text; +import com.mangwalo.nsh.R; +import com.mangwalo.nsh.model.OrderItem; import java.util.List; diff --git a/app/src/main/java/com/foodx/nsh/dialog/OrderDialog.java b/app/src/main/java/com/mangwalo/nsh/dialog/OrderDialog.java similarity index 98% rename from app/src/main/java/com/foodx/nsh/dialog/OrderDialog.java rename to app/src/main/java/com/mangwalo/nsh/dialog/OrderDialog.java index 7feb0f7..fcd43a2 100644 --- a/app/src/main/java/com/foodx/nsh/dialog/OrderDialog.java +++ b/app/src/main/java/com/mangwalo/nsh/dialog/OrderDialog.java @@ -1,11 +1,10 @@ -package com.foodx.nsh.dialog; +package com.mangwalo.nsh.dialog; import android.app.Activity; import android.app.Dialog; import android.content.Context; import android.content.SharedPreferences; import android.os.Bundle; -import android.provider.Settings; import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.util.Log; @@ -23,16 +22,15 @@ import com.android.volley.VolleyError; import com.android.volley.toolbox.StringRequest; import com.android.volley.toolbox.Volley; -import com.foodx.nsh.R; -import com.foodx.nsh.adapter.CartAdapter; -import com.foodx.nsh.model.Cart; +import com.mangwalo.nsh.R; +import com.mangwalo.nsh.adapter.CartAdapter; +import com.mangwalo.nsh.model.Cart; import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import org.json.JSONArray; import org.json.JSONException; -import org.json.JSONObject; import java.io.UnsupportedEncodingException; import java.util.ArrayList; diff --git a/app/src/main/java/com/foodx/nsh/fragments/CartFragment.java b/app/src/main/java/com/mangwalo/nsh/fragments/CartFragment.java similarity index 83% rename from app/src/main/java/com/foodx/nsh/fragments/CartFragment.java rename to app/src/main/java/com/mangwalo/nsh/fragments/CartFragment.java index 675b675..f3d3b29 100644 --- a/app/src/main/java/com/foodx/nsh/fragments/CartFragment.java +++ b/app/src/main/java/com/mangwalo/nsh/fragments/CartFragment.java @@ -1,43 +1,36 @@ -package com.foodx.nsh.fragments; +package com.mangwalo.nsh.fragments; import android.annotation.SuppressLint; import android.app.Activity; import android.content.Context; import android.content.DialogInterface; import android.content.SharedPreferences; import android.graphics.Color; +import android.graphics.Typeface; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; +import android.os.Handler; +import android.os.Looper; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.util.Log; -import android.util.Pair; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; -import com.android.volley.AuthFailureError; -import com.android.volley.NetworkResponse; -import com.android.volley.Request; -import com.android.volley.RequestQueue; -import com.android.volley.Response; -import com.android.volley.VolleyError; -import com.android.volley.toolbox.HttpHeaderParser; -import com.android.volley.toolbox.StringRequest; import com.android.volley.toolbox.Volley; -import com.foodx.nsh.R; -import com.foodx.nsh.adapter.CartAdapter; -import com.foodx.nsh.dialog.OrderDialog; -import com.foodx.nsh.model.Cart; +import com.mangwalo.nsh.R; +import com.mangwalo.nsh.adapter.CartAdapter; +import com.mangwalo.nsh.dialog.OrderDialog; +import com.mangwalo.nsh.model.Cart; import com.google.gson.Gson; -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; +import com.wooplr.spotlight.SpotlightView; +import com.wooplr.spotlight.prefs.PreferencesManager; -import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -63,11 +56,12 @@ public class CartFragment extends Fragment { private HashMap hashMap1; Volley volley; String Key1 = ""; + SpotlightView spotLight; View view; private int up = 0; TextView foodx,nilText; String response; - + TextView play; public CartFragment() { } @@ -81,12 +75,33 @@ public CartFragment(Activity activity) { public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) { // orderSharedPreferences = getContext().getSharedPreferences("orderList",); + view = inflater.inflate(R.layout.fragment_cart, container, false); + play = view.findViewById(R.id.play); + SharedPreferences sharedPreferences2; + SharedPreferences.Editor editor3; + sharedPreferences2 = getContext().getSharedPreferences("time", Context.MODE_PRIVATE); + String check = sharedPreferences2.getString("cartf",null); + if (check != null) + {} + else + { + editor3 = sharedPreferences2.edit(); + editor3.putString("cartf","abc"); + editor3.apply(); + new Handler(Looper.getMainLooper()).postDelayed(new Runnable() { + @Override + public void run() { + showIntro(play, "fab_intro"); + } + }, 0); + PreferencesManager mPreferencesManager = new PreferencesManager(getActivity()); + mPreferencesManager.resetAll(); + } sharedPreferences = activity.getSharedPreferences("Myprefs", Context.MODE_PRIVATE); editor = sharedPreferences.edit(); gson = new Gson(); myOrders = new ArrayList<>(); - view = inflater.inflate(R.layout.fragment_cart, container, false); nilText = view.findViewById(R.id.nilText); foodx = view.findViewById(R.id.foodx); response = sharedPreferences.getString(key, "null"); @@ -291,6 +306,29 @@ public void onDismiss(DialogInterface dialogInterface) { return view; } + private void showIntro(View view, String usageId) { + spotLight = new SpotlightView.Builder(getActivity()) + .introAnimationDuration(400) + .enableRevealAnimation(true) + .performClick(true) + .fadeinTextDuration(400) + //.setTypeface(FontUtil.get(this, "RemachineScript_Personal_Use")) + .headingTvColor(Color.parseColor("#9e9d24")) + .headingTvSize(32) + .headingTvText("Cart") + .subHeadingTvColor(Color.parseColor("#cddc39")) + .subHeadingTvSize(16) + .subHeadingTvText("See your unplaced orders here!") + .maskColor(Color.parseColor("#dc000000")) + .target(view) + .lineAnimDuration(400) + .lineAndArcColor(Color.parseColor("#ffffff")) + .dismissOnTouch(true) + .dismissOnBackPress(true) + .enableDismissAfterShown(true) + .usageId(usageId) //UNIQUE ID + .show(); + } } diff --git a/app/src/main/java/com/mangwalo/nsh/fragments/DetailsFragment.java b/app/src/main/java/com/mangwalo/nsh/fragments/DetailsFragment.java new file mode 100644 index 0000000..cf95a4e --- /dev/null +++ b/app/src/main/java/com/mangwalo/nsh/fragments/DetailsFragment.java @@ -0,0 +1,93 @@ +package com.mangwalo.nsh.fragments; + + +import android.annotation.SuppressLint; +import android.app.Activity; +import android.content.Context; +import android.content.SharedPreferences; +import android.graphics.Color; +import android.graphics.Typeface; +import android.os.Bundle; +import android.os.Handler; +import android.os.Looper; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import com.mangwalo.nsh.R; +import com.wooplr.spotlight.SpotlightView; +import com.wooplr.spotlight.prefs.PreferencesManager; + + +/** + * A simple {@link Fragment} subclass. + */ +public class DetailsFragment extends Fragment { + + Activity activity; + public DetailsFragment() { + // Required empty public constructor + } + @SuppressLint("ValidFragment") + public DetailsFragment(Activity activity) { + this.activity = activity; + // Required empty public constructor + } + TextView play; + SpotlightView spotLight; +// View view; + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + + View view = inflater.inflate(R.layout.fragment_details, container, false); + play = view.findViewById(R.id.play);SharedPreferences sharedPreferences2; + SharedPreferences.Editor editor3; + sharedPreferences2 = getContext().getSharedPreferences("time", Context.MODE_PRIVATE); + String check = sharedPreferences2.getString("detailsf",null); + if (check != null) + {} + else + { + editor3 = sharedPreferences2.edit(); + editor3.putString("detailsf","abc"); + editor3.apply(); + new Handler(Looper.getMainLooper()).postDelayed(new Runnable() { + @Override + public void run() { + showIntro(play, "fab_intro"); + } + }, 0); + + PreferencesManager mPreferencesManager = new PreferencesManager(getActivity()); + mPreferencesManager.resetAll(); + } + return view; + } + private void showIntro(View view, String usageId) { + spotLight = new SpotlightView.Builder(getActivity()) + .introAnimationDuration(400) + .enableRevealAnimation(true) + .performClick(true) + .fadeinTextDuration(400) + //.setTypeface(FontUtil.get(this, "RemachineScript_Personal_Use")) + .headingTvColor(Color.parseColor("#9e9d24")) + .headingTvSize(32) + .headingTvText("Details") + .subHeadingTvColor(Color.parseColor("#cddc39")) + .subHeadingTvSize(16) + .subHeadingTvText("Read them carefully!") + .maskColor(Color.parseColor("#dc000000")) + .target(view) + .lineAnimDuration(400) + .lineAndArcColor(Color.parseColor("#ffffff")) + .dismissOnTouch(true) + .dismissOnBackPress(true) + .enableDismissAfterShown(true) + .usageId(usageId) //UNIQUE ID + .show(); + } +} diff --git a/app/src/main/java/com/foodx/nsh/fragments/HotelsFragment.java b/app/src/main/java/com/mangwalo/nsh/fragments/HotelsFragment.java similarity index 61% rename from app/src/main/java/com/foodx/nsh/fragments/HotelsFragment.java rename to app/src/main/java/com/mangwalo/nsh/fragments/HotelsFragment.java index 313c051..225ceeb 100644 --- a/app/src/main/java/com/foodx/nsh/fragments/HotelsFragment.java +++ b/app/src/main/java/com/mangwalo/nsh/fragments/HotelsFragment.java @@ -1,8 +1,14 @@ -package com.foodx.nsh.fragments; +package com.mangwalo.nsh.fragments; import android.app.Activity; +import android.content.Context; +import android.content.SharedPreferences; +import android.graphics.Color; +import android.graphics.Typeface; import android.os.Bundle; +import android.os.Handler; +import android.os.Looper; import android.support.v4.app.Fragment; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; @@ -18,9 +24,12 @@ import com.android.volley.VolleyError; import com.android.volley.toolbox.JsonArrayRequest; import com.android.volley.toolbox.Volley; -import com.foodx.nsh.R; -import com.foodx.nsh.adapter.HotelAdapter; -import com.foodx.nsh.model.Hotel; +import com.mangwalo.nsh.R; +import com.mangwalo.nsh.activity.MainActivity; +import com.mangwalo.nsh.adapter.HotelAdapter; +import com.mangwalo.nsh.model.Hotel; +import com.wooplr.spotlight.SpotlightView; +import com.wooplr.spotlight.prefs.PreferencesManager; import org.json.JSONArray; import org.json.JSONException; @@ -43,7 +52,8 @@ public class HotelsFragment extends Fragment { private Activity activity; private int up = 0; View view; - + TextView play; + private SpotlightView spotLight; public HotelsFragment() { } @@ -54,7 +64,31 @@ public HotelsFragment(Activity activity){ @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + view = inflater.inflate(R.layout.fragment_hotels, container, false); + + play = view.findViewById(R.id.play); + SharedPreferences sharedPreferences2; + SharedPreferences.Editor editor3; + sharedPreferences2 = getContext().getSharedPreferences("time", Context.MODE_PRIVATE); + String check = sharedPreferences2.getString("hotelsf",null); + if (check != null) + {} + else + { + editor3 = sharedPreferences2.edit(); + editor3.putString("hotelsf","abc"); + editor3.apply(); + new Handler(Looper.getMainLooper()).postDelayed(new Runnable() { + @Override + public void run() { + showIntro(play, "fab_intro"); + } + }, 0); + + PreferencesManager mPreferencesManager = new PreferencesManager(getActivity()); + mPreferencesManager.resetAll(); + } onInit(); return view; } @@ -85,7 +119,7 @@ public void onScrolled(RecyclerView recyclerView, int dx, int dy) { } public void getData() { final RequestQueue requestQueue = Volley.newRequestQueue(activity); - JsonArrayRequest request = new JsonArrayRequest(getString(R.string.base_url)+"/hotel", + JsonArrayRequest request = new JsonArrayRequest(getString(R.string.base_url)+"/hotel/Z2FuZXNo", new Response.Listener() { @Override public void onResponse(JSONArray jsonArray) { @@ -114,4 +148,27 @@ public void onErrorResponse(VolleyError volleyError) { requestQueue.add(request); } + private void showIntro(View view, String usageId) { + spotLight = new SpotlightView.Builder(getActivity()) + .introAnimationDuration(400) + .enableRevealAnimation(true) + .performClick(true) + .fadeinTextDuration(400) + //.setTypeface(FontUtil.get(this, "RemachineScript_Personal_Use")) + .headingTvColor(Color.parseColor("#9e9d24")) + .headingTvSize(32) + .headingTvText("Terms & Conditions") + .subHeadingTvColor(Color.parseColor("#cddc39")) + .subHeadingTvSize(16) + .subHeadingTvText("Minimum order Rs.250.Orders from\ndifferent hotels will be delivered\nby different delivery man.") + .maskColor(Color.parseColor("#dc000000")) + .target(view) + .lineAnimDuration(400) + .lineAndArcColor(Color.parseColor("#ffffff")) + .dismissOnTouch(true) + .dismissOnBackPress(true) + .enableDismissAfterShown(true) + .usageId(usageId) //UNIQUE ID + .show(); + } } diff --git a/app/src/main/java/com/foodx/nsh/fragments/SettingsFragment.java b/app/src/main/java/com/mangwalo/nsh/fragments/SettingsFragment.java similarity index 54% rename from app/src/main/java/com/foodx/nsh/fragments/SettingsFragment.java rename to app/src/main/java/com/mangwalo/nsh/fragments/SettingsFragment.java index 196313b..4ce7a5d 100644 --- a/app/src/main/java/com/foodx/nsh/fragments/SettingsFragment.java +++ b/app/src/main/java/com/mangwalo/nsh/fragments/SettingsFragment.java @@ -1,26 +1,32 @@ -package com.foodx.nsh.fragments; +package com.mangwalo.nsh.fragments; import android.annotation.SuppressLint; import android.app.Activity; import android.content.Context; import android.content.SharedPreferences; +import android.graphics.Color; +import android.graphics.Typeface; import android.os.Bundle; +import android.os.Handler; +import android.os.Looper; import android.support.v4.app.Fragment; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.TextView; -import com.foodx.nsh.R; -import com.foodx.nsh.adapter.OrderAdapter; -import com.foodx.nsh.model.OrderArray; -import com.foodx.nsh.model.OrderItem; +import com.mangwalo.nsh.R; +import com.mangwalo.nsh.adapter.OrderAdapter; +import com.mangwalo.nsh.model.OrderArray; +import com.mangwalo.nsh.model.OrderItem; +import com.wooplr.spotlight.SpotlightView; +import com.wooplr.spotlight.prefs.PreferencesManager; import org.json.JSONArray; import org.json.JSONException; -import org.json.JSONObject; import java.util.ArrayList; import java.util.List; @@ -32,10 +38,10 @@ public class SettingsFragment extends Fragment { private Activity activity; private RecyclerView recyclerView; - + private SpotlightView spotLight; + TextView play; public SettingsFragment() { } - @SuppressLint("ValidFragment") public SettingsFragment(Activity activity){ this.activity = activity; @@ -44,11 +50,29 @@ public SettingsFragment(Activity activity){ @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.fragment_settings, container, false); - recyclerView = view.findViewById(R.id.recyclerView); + play = view.findViewById(R.id.play);SharedPreferences sharedPreferences2; + SharedPreferences.Editor editor3; + sharedPreferences2 = getContext().getSharedPreferences("time", Context.MODE_PRIVATE); + String check = sharedPreferences2.getString("settingsf",null); + if (check != null) + {} + else + { + editor3 = sharedPreferences2.edit(); + editor3.putString("settingsf","abc"); + editor3.apply(); + new Handler(Looper.getMainLooper()).postDelayed(new Runnable() { + @Override + public void run() { + showIntro(play, "fab_intro"); + } + }, 0); + PreferencesManager mPreferencesManager = new PreferencesManager(getActivity()); + mPreferencesManager.resetAll(); + } SharedPreferences oldOrders = activity.getSharedPreferences("myOldOrders", Context.MODE_PRIVATE); SharedPreferences.Editor oldOrderEditor = oldOrders.edit(); String strJson = oldOrders.getString("oldOrders","[]"); @@ -81,5 +105,28 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, } return view; } + private void showIntro(View view, String usageId) { + spotLight = new SpotlightView.Builder(getActivity()) + .introAnimationDuration(400) + .enableRevealAnimation(true) + .performClick(true) + .fadeinTextDuration(400) + //.setTypeface(FontUtil.get(this, "RemachineScript_Personal_Use")) + .headingTvColor(Color.parseColor("#9e9d24")) + .headingTvSize(32) + .headingTvText("Order History") + .subHeadingTvColor(Color.parseColor("#cddc39")) + .subHeadingTvSize(16) + .subHeadingTvText("Check your orders status here!") + .maskColor(Color.parseColor("#dc000000")) + .target(view) + .lineAnimDuration(400) + .lineAndArcColor(Color.parseColor("#ffffff")) + .dismissOnTouch(true) + .dismissOnBackPress(true) + .enableDismissAfterShown(true) + .usageId(usageId) //UNIQUE ID + .show(); + } } diff --git a/app/src/main/java/com/foodx/nsh/model/Cart.java b/app/src/main/java/com/mangwalo/nsh/model/Cart.java similarity index 96% rename from app/src/main/java/com/foodx/nsh/model/Cart.java rename to app/src/main/java/com/mangwalo/nsh/model/Cart.java index 33026d1..da2425c 100644 --- a/app/src/main/java/com/foodx/nsh/model/Cart.java +++ b/app/src/main/java/com/mangwalo/nsh/model/Cart.java @@ -1,4 +1,4 @@ -package com.foodx.nsh.model; +package com.mangwalo.nsh.model; public class Cart { diff --git a/app/src/main/java/com/foodx/nsh/model/Hotel.java b/app/src/main/java/com/mangwalo/nsh/model/Hotel.java similarity index 97% rename from app/src/main/java/com/foodx/nsh/model/Hotel.java rename to app/src/main/java/com/mangwalo/nsh/model/Hotel.java index 34585a5..b1ef15d 100644 --- a/app/src/main/java/com/foodx/nsh/model/Hotel.java +++ b/app/src/main/java/com/mangwalo/nsh/model/Hotel.java @@ -1,4 +1,4 @@ -package com.foodx.nsh.model; +package com.mangwalo.nsh.model; /** * Created by ThisIsNSH on 1/5/2019. diff --git a/app/src/main/java/com/foodx/nsh/model/Item.java b/app/src/main/java/com/mangwalo/nsh/model/Item.java similarity index 95% rename from app/src/main/java/com/foodx/nsh/model/Item.java rename to app/src/main/java/com/mangwalo/nsh/model/Item.java index 5763df6..045c9aa 100644 --- a/app/src/main/java/com/foodx/nsh/model/Item.java +++ b/app/src/main/java/com/mangwalo/nsh/model/Item.java @@ -1,4 +1,4 @@ -package com.foodx.nsh.model; +package com.mangwalo.nsh.model; public class Item { diff --git a/app/src/main/java/com/foodx/nsh/model/Menu.java b/app/src/main/java/com/mangwalo/nsh/model/Menu.java similarity index 95% rename from app/src/main/java/com/foodx/nsh/model/Menu.java rename to app/src/main/java/com/mangwalo/nsh/model/Menu.java index 464181f..e0912a1 100644 --- a/app/src/main/java/com/foodx/nsh/model/Menu.java +++ b/app/src/main/java/com/mangwalo/nsh/model/Menu.java @@ -1,4 +1,4 @@ -package com.foodx.nsh.model; +package com.mangwalo.nsh.model; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/foodx/nsh/model/OrderArray.java b/app/src/main/java/com/mangwalo/nsh/model/OrderArray.java similarity index 92% rename from app/src/main/java/com/foodx/nsh/model/OrderArray.java rename to app/src/main/java/com/mangwalo/nsh/model/OrderArray.java index 87121c9..ad97c80 100644 --- a/app/src/main/java/com/foodx/nsh/model/OrderArray.java +++ b/app/src/main/java/com/mangwalo/nsh/model/OrderArray.java @@ -1,4 +1,4 @@ -package com.foodx.nsh.model; +package com.mangwalo.nsh.model; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/foodx/nsh/model/OrderItem.java b/app/src/main/java/com/mangwalo/nsh/model/OrderItem.java similarity index 96% rename from app/src/main/java/com/foodx/nsh/model/OrderItem.java rename to app/src/main/java/com/mangwalo/nsh/model/OrderItem.java index ad8ae96..5677cf1 100644 --- a/app/src/main/java/com/foodx/nsh/model/OrderItem.java +++ b/app/src/main/java/com/mangwalo/nsh/model/OrderItem.java @@ -1,4 +1,4 @@ -package com.foodx.nsh.model; +package com.mangwalo.nsh.model; public class OrderItem { diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 4f19c7e..256e5ce 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -1,44 +1,81 @@ - - - - - + + + + android:fontFamily="@font/psb" + android:textColor="@color/color2" + android:text="Khaana" + android:id="@+id/khana" + android:textSize="50sp"/> + + + + + + + - diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index e53652f..f17931c 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -10,6 +10,7 @@ android:layout_alignParentTop="true" android:layout_above="@+id/nav_bar" android:id="@+id/fragment_container"> + - + + + diff --git a/app/src/main/res/layout/adapter_cart.xml b/app/src/main/res/layout/adapter_cart.xml index 8ea2215..4dc1edd 100644 --- a/app/src/main/res/layout/adapter_cart.xml +++ b/app/src/main/res/layout/adapter_cart.xml @@ -27,7 +27,7 @@ android:paddingRight="16dp" android:layout_alignParentLeft="true" android:textSize="0sp" - android:layout_toLeftOf="@id/price" + android:visibility="gone" android:fontFamily="@font/psb" android:textColor="@color/black" android:id="@+id/hotelid" /> diff --git a/app/src/main/res/layout/fragment_cart.xml b/app/src/main/res/layout/fragment_cart.xml index 80ad9cc..3052469 100644 --- a/app/src/main/res/layout/fragment_cart.xml +++ b/app/src/main/res/layout/fragment_cart.xml @@ -68,4 +68,13 @@ android:layout_alignParentBottom="true" android:layout_margin="16dp" android:id="@+id/postorder"/> + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_details.xml b/app/src/main/res/layout/fragment_details.xml index 8726a40..17b3965 100644 --- a/app/src/main/res/layout/fragment_details.xml +++ b/app/src/main/res/layout/fragment_details.xml @@ -5,10 +5,26 @@ android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" tools:context=".fragments.DetailsFragment"> - + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_hotels.xml b/app/src/main/res/layout/fragment_hotels.xml index 5551be3..2d04bde 100644 --- a/app/src/main/res/layout/fragment_hotels.xml +++ b/app/src/main/res/layout/fragment_hotels.xml @@ -8,14 +8,20 @@ android:fitsSystemWindows="true" android:background="@color/white" android:layout_height="match_parent" - tools:context="com.foodx.nsh.activity.MainActivity"> - + tools:context="com.mangwalo.nsh.activity.MainActivity"> + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/logo.png b/app/src/main/res/mipmap-hdpi/logo.png new file mode 100644 index 0000000..29661c1 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/logo.png differ diff --git a/app/src/test/java/com/foodx/nsh/ExampleUnitTest.java b/app/src/test/java/com/mangwalo/nsh/ExampleUnitTest.java similarity index 93% rename from app/src/test/java/com/foodx/nsh/ExampleUnitTest.java rename to app/src/test/java/com/mangwalo/nsh/ExampleUnitTest.java index 5fa4449..038286a 100644 --- a/app/src/test/java/com/foodx/nsh/ExampleUnitTest.java +++ b/app/src/test/java/com/mangwalo/nsh/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.foodx.nsh; +package com.mangwalo.nsh; import org.junit.Test; diff --git a/build.gradle b/build.gradle index d1e5e0a..2d888e3 100644 --- a/build.gradle +++ b/build.gradle @@ -22,6 +22,7 @@ allprojects { jcenter() maven { url "https://maven.google.com" + maven { url "https://jitpack.io" } } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 758b03e..84ec0b8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip \ No newline at end of file