diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml new file mode 100644 index 0000000..260b6e4 --- /dev/null +++ b/.idea/assetWizardSettings.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index a9c62b8..ba32052 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 30aa626..681f41a 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,29 +1,116 @@ - - - - - - - - - - + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..15a15b2 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7ac24c7..f43d428 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,6 +3,9 @@ - + diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore index 796b96d..b46299f 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1 +1,2 @@ /build +/google-services.json \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 89d75dd..4782445 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,13 +23,13 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.android.support:appcompat-v7:28.0.0-alpha1' - implementation 'com.android.support:design:28.0.0-alpha1' - implementation 'com.android.support.constraint:constraint-layout:1.1.2' - implementation 'com.android.support:support-vector-drawable:28.0.0-alpha1' - implementation 'com.android.support:support-v4:28.0.0-alpha1' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:design:28.0.0' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'com.android.support:support-vector-drawable:28.0.0' + implementation 'com.android.support:support-v4:28.0.0' implementation 'com.github.alamkanak:android-week-view:1.2.6' - implementation 'com.android.support:cardview-v7:28.0.0-alpha1' + implementation 'com.android.support:cardview-v7:28.0.0' implementation 'com.squareup.picasso:picasso:2.5.2' implementation 'com.google.firebase:firebase-core:16.0.1' implementation 'com.google.firebase:firebase-auth:16.0.1' @@ -38,7 +38,8 @@ dependencies { testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + implementation 'com.android.support:design:28.0.0' } -apply plugin: 'com.google.gms.google-services' \ No newline at end of file +apply plugin: 'com.google.gms.google-services' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c714de5..318b9ed 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -4,6 +4,7 @@ + + android:name=".SplashscreenActivity" + android:configChanges="orientation|keyboardHidden|screenSize" + android:label="@string/app_name" + android:theme="@style/FullscreenTheme"> - - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/h_mal/alameera/FragmentHome.java b/app/src/main/java/com/example/h_mal/alameera/FragmentHome.java index 8b0ef96..3fcb758 100644 --- a/app/src/main/java/com/example/h_mal/alameera/FragmentHome.java +++ b/app/src/main/java/com/example/h_mal/alameera/FragmentHome.java @@ -31,7 +31,7 @@ public class FragmentHome extends Fragment{ items = new ArrayList<>(); items.add(new HomeScreenItems(R.drawable.hair,"Hair")); items.add(new HomeScreenItems(R.drawable.nails,"Nails")); - items.add(new HomeScreenItems(R.drawable.hamma,"Hammam Bath")); + items.add(new HomeScreenItems(R.drawable.massage,"Hammam Bath")); items.add(new HomeScreenItems(R.drawable.earring,"Earrings")); items.add(new HomeScreenItems(R.drawable.hairmist,"Hair Mist")); diff --git a/app/src/main/java/com/example/h_mal/alameera/FragmentOne/HomeScreenItemAdapter.java b/app/src/main/java/com/example/h_mal/alameera/FragmentOne/HomeScreenItemAdapter.java index cf5b864..3fb5b0a 100644 --- a/app/src/main/java/com/example/h_mal/alameera/FragmentOne/HomeScreenItemAdapter.java +++ b/app/src/main/java/com/example/h_mal/alameera/FragmentOne/HomeScreenItemAdapter.java @@ -11,6 +11,7 @@ import android.widget.ImageView; import android.widget.TextView; import com.example.h_mal.alameera.R; +import com.squareup.picasso.Picasso; import java.util.ArrayList; @@ -37,8 +38,8 @@ public class HomeScreenItemAdapter extends ArrayAdapter{ HomeScreenItems currentItem = getItem(position); ImageView homeScreenImageView = listItemView.findViewById(R.id.home_item_imageView); - homeScreenImageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - homeScreenImageView.setImageResource(currentItem.getImg()); + + Picasso.with(getContext()).load(currentItem.getImg()).placeholder(R.drawable.alogo2).into(homeScreenImageView); TextView homeScreenTextView = listItemView.findViewById(R.id.home_item_textView); homeScreenTextView.setText(currentItem.getTitle()); diff --git a/app/src/main/java/com/example/h_mal/alameera/FragmentTwo.java b/app/src/main/java/com/example/h_mal/alameera/FragmentTwo.java index 2bcf115..c690438 100644 --- a/app/src/main/java/com/example/h_mal/alameera/FragmentTwo.java +++ b/app/src/main/java/com/example/h_mal/alameera/FragmentTwo.java @@ -66,38 +66,4 @@ public class FragmentTwo extends Fragment { return rootView; } - -// private void openDialog(final Calendar time) { -// final EditText edittext = new EditText(getActivity()); -// AlertDialog dialog = new AlertDialog.Builder(getActivity()) -// .setTitle("Select Duration") -// .setView(edittext) -// .setPositiveButton("Add", new DialogInterface.OnClickListener() { -// @Override -// public void onClick(DialogInterface dialog, int which) { -// int duration = Integer.parseInt(edittext.getText().toString()); -// CreateCalenderEntry(time, duration); -// } -// }) -// .setNegativeButton("Cancel", null) -// .create(); -// dialog.show(); -// } -// -// private void CreateCalenderEntry(Calendar time, int duration){ -// Calendar endTime = Calendar.getInstance(); -// endTime.set(time.get(Calendar.YEAR), -// time.get(Calendar.MONTH), -// time.get(Calendar.DAY_OF_MONTH), -// (time.get(Calendar.HOUR_OF_DAY)+duration), -// time.get(Calendar.MINUTE)); -// WeekViewEvent event = new WeekViewEvent(1, "added event", time, endTime); -// events.add(event); -// mWeekView.notifyDatasetChanged(); -// } -// -// private String CalenderToString(Calendar item){ -// SimpleDateFormat sdf = new SimpleDateFormat("yyyy MMM dd HH:mm:ss"); -// return sdf.format(item.getTime()); -// } } diff --git a/app/src/main/java/com/example/h_mal/alameera/MainActivity.java b/app/src/main/java/com/example/h_mal/alameera/MainActivity.java index b5f3b8b..4359d0c 100644 --- a/app/src/main/java/com/example/h_mal/alameera/MainActivity.java +++ b/app/src/main/java/com/example/h_mal/alameera/MainActivity.java @@ -4,6 +4,7 @@ import android.content.Intent; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.design.widget.BottomNavigationView; + import android.support.design.widget.NavigationView; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; @@ -104,10 +105,14 @@ public class MainActivity extends AppCompatActivity { drawerLayout.addDrawerListener(toggle); toggle.syncState(); + + + NavigationView navigationView = (NavigationView) findViewById(R.id.drawer); navigationView.setNavigationItemSelectedListener(new NavigationView.OnNavigationItemSelectedListener() { @Override public boolean onNavigationItemSelected(@NonNull MenuItem item) { + switch (item.getItemId()) { case R.id.drawer_profile: Log.i("tag","drawer iem pressed"); diff --git a/app/src/main/java/com/example/h_mal/alameera/SplashscreenActivity.java b/app/src/main/java/com/example/h_mal/alameera/SplashscreenActivity.java new file mode 100644 index 0000000..c95ae78 --- /dev/null +++ b/app/src/main/java/com/example/h_mal/alameera/SplashscreenActivity.java @@ -0,0 +1,47 @@ +package com.example.h_mal.alameera; + +import android.annotation.SuppressLint; +import android.content.Intent; +import android.support.v7.app.ActionBar; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.os.Handler; +import android.view.MotionEvent; +import android.view.View; +import android.widget.Toast; + +/** + * An example full-screen activity that shows and hides the system UI (i.e. + * status bar and navigation/system bar) with user interaction. + */ +public class SplashscreenActivity extends AppCompatActivity { + + // Splash screen timer + private static int SPLASH_TIME_OUT = 2000; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_splashscreen); + + new Handler().postDelayed(new Runnable() { + + /* + * Showing splash screen with a timer. This will be useful when you + * want to show case your app logo / company + */ + + @Override + public void run() { + // This method will be executed once the timer is over + // Start your app main activity + Intent i = new Intent(SplashscreenActivity.this, MainActivity.class); + startActivity(i); + // close this activity + finish(); + + + } + }, SPLASH_TIME_OUT); + } +} diff --git a/app/src/main/res/drawable-hdpi/splashscreen.png b/app/src/main/res/drawable-hdpi/splashscreen.png new file mode 100644 index 0000000..d547947 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/splashscreen.png differ diff --git a/app/src/main/res/drawable-ldpi/splashscreen.png b/app/src/main/res/drawable-ldpi/splashscreen.png new file mode 100644 index 0000000..24d90f0 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/splashscreen.png differ diff --git a/app/src/main/res/drawable-mdpi/splashscreen.png b/app/src/main/res/drawable-mdpi/splashscreen.png new file mode 100644 index 0000000..da66de1 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/splashscreen.png differ diff --git a/app/src/main/res/drawable-xhdpi/splashscreen.png b/app/src/main/res/drawable-xhdpi/splashscreen.png new file mode 100644 index 0000000..120f4e2 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/splashscreen.png differ diff --git a/app/src/main/res/drawable-xxhdpi/splashscreen.png b/app/src/main/res/drawable-xxhdpi/splashscreen.png new file mode 100644 index 0000000..1716058 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/splashscreen.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/splashscreen.png b/app/src/main/res/drawable-xxxhdpi/splashscreen.png new file mode 100644 index 0000000..04eb4b2 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/splashscreen.png differ diff --git a/app/src/main/res/drawable/alogo.png b/app/src/main/res/drawable/alogo.png new file mode 100644 index 0000000..8f11005 Binary files /dev/null and b/app/src/main/res/drawable/alogo.png differ diff --git a/app/src/main/res/drawable/alogo2.png b/app/src/main/res/drawable/alogo2.png new file mode 100644 index 0000000..01745e8 Binary files /dev/null and b/app/src/main/res/drawable/alogo2.png differ diff --git a/app/src/main/res/drawable/massage.jpg b/app/src/main/res/drawable/massage.jpg new file mode 100644 index 0000000..aabc024 Binary files /dev/null and b/app/src/main/res/drawable/massage.jpg differ diff --git a/app/src/main/res/drawable/splashscreen.jpg b/app/src/main/res/drawable/splashscreen.jpg new file mode 100644 index 0000000..189e6d1 Binary files /dev/null and b/app/src/main/res/drawable/splashscreen.jpg differ diff --git a/app/src/main/res/layout/activity_main_2.xml b/app/src/main/res/layout/activity_main_2.xml index 01378e4..e5b3f8b 100644 --- a/app/src/main/res/layout/activity_main_2.xml +++ b/app/src/main/res/layout/activity_main_2.xml @@ -82,13 +82,16 @@ + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splashscreen.xml b/app/src/main/res/layout/activity_splashscreen.xml new file mode 100644 index 0000000..7344759 --- /dev/null +++ b/app/src/main/res/layout/activity_splashscreen.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/custom_appbar.xml b/app/src/main/res/layout/custom_appbar.xml index 35939fd..95c2037 100644 --- a/app/src/main/res/layout/custom_appbar.xml +++ b/app/src/main/res/layout/custom_appbar.xml @@ -47,9 +47,10 @@ + android:layout_centerHorizontal="true" + android:layout_marginBottom="-1dp" + android:padding="3dp" + app:srcCompat="@drawable/alogo2" /> + android:layout_height="wrap_content" + xmlns:tools="http://schemas.android.com/tools"> + android:layout_width="56dp" + android:layout_height="56dp" + android:scaleType="fitCenter" + android:src="@drawable/alogo2" /> + + + + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index fbb6fd2..89400db 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -3,4 +3,6 @@ #eda788 #f59266 #ff4081 + + #66000000 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 804305d..c43dc2d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -14,4 +14,8 @@ SocialActivty + + SplashscreenActivity + Dummy Button + DUMMY\nCONTENT diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index df53b53..e34c1e1 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -15,7 +15,7 @@ + + + diff --git a/build.gradle b/build.gradle index c8daecc..3183ca5 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.5.3' classpath 'com.google.gms:google-services:4.0.1' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 91e28af..baadb93 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Sep 20 21:03:48 AEST 2018 +#Sun Mar 01 13:23:09 UTC 2020 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-5.4.1-all.zip