Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
cd4a98b
test change
Aymalmahdi Dec 22, 2021
4009526
fahad change
fsm1919 Dec 29, 2021
143eaf9
homepage
Aymalmahdi Dec 29, 2021
e00e078
Merge remote-tracking branch 'upstream/omarrashed' into AbdullahAlmahdi
Aymalmahdi Dec 29, 2021
fe6d616
Merge branch 'master' into pr/5
omarrashed1 Dec 29, 2021
5fc03f1
edit
fsm1919 Dec 29, 2021
72f8905
edit 2
fsm1919 Dec 29, 2021
99d4f92
Merge branch 'master' into Fahad
fsm1919 Dec 29, 2021
8e8f80c
Merge branch 'pr/4' into AbdullahAlmahdi
Aymalmahdi Dec 29, 2021
3172e74
shops
oaao1 Dec 30, 2021
44c259c
Merge branch 'AbdullahAlmahdi' of https://github.com/Aymalmahdi/CityG…
Aymalmahdi Dec 30, 2021
23b53ed
mrage
Aymalmahdi Dec 30, 2021
4008c66
Merge branch 'pr/6' into AbdullahAlmahdi
Aymalmahdi Dec 30, 2021
f4fedc4
Merge branch 'pr/6' into omarrashed
omarrashed1 Dec 30, 2021
2d6eb8c
Merge branch 'pr/4' into omarrashed
omarrashed1 Dec 30, 2021
2cd2d5a
salman
salman-905 Dec 30, 2021
84811e8
Merge branch 'pr/7' into AbdullahAlmahdi
Aymalmahdi Dec 30, 2021
f3225ed
Merge branch 'pr/4' into omarrashed
omarrashed1 Jan 3, 2022
4ba5b40
CANGENEW
Aymalmahdi Jan 3, 2022
7457364
Merge branch 'pr/5' into omarrashed
omarrashed1 Jan 3, 2022
a72a3c3
Merge remote-tracking branch 'github-desktop-aymalmahdi/AbdullahAlmah…
omarrashed1 Jan 3, 2022
0d6920c
sjjs
omarrashed1 Jan 3, 2022
d8d5c61
changecolor
Aymalmahdi Jan 3, 2022
4669479
dd
omarrashed1 Jan 3, 2022
3e766f2
backbtn
omarrashed1 Jan 3, 2022
2a44dbf
changecolor
Aymalmahdi Jan 4, 2022
741346f
Merge remote-tracking branch 'upstream/omarrashed' into AbdullahAlmahdi
Aymalmahdi Jan 4, 2022
2e7394a
Merge remote-tracking branch 'github-desktop-aymalmahdi/AbdullahAlmah…
omarrashed1 Jan 4, 2022
fccc911
chanagetranslate
Aymalmahdi Jan 5, 2022
7a06218
ssw
omarrashed1 Jan 5, 2022
74ca11f
ch1
Aymalmahdi Jan 5, 2022
66b51bf
Merge branch 'pr/5' into omarrashed
omarrashed1 Jan 5, 2022
e16d889
Merge remote-tracking branch 'github-desktop-aymalmahdi/AbdullahAlmah…
omarrashed1 Jan 5, 2022
28a77bb
Merge remote-tracking branch 'github-desktop-aymalmahdi/AbdullahAlmah…
oaao1 Jan 6, 2022
53f5b2b
Merge remote-tracking branch 'github-desktop-aymalmahdi/master' into …
oaao1 Jan 6, 2022
b47be3b
Merge remote-tracking branch 'upstream/omarrashed' into omarShops
oaao1 Jan 6, 2022
659b47e
Merge remote-tracking branch 'github-desktop-aymalmahdi/AbdullahAlmah…
oaao1 Jan 6, 2022
6554169
Merge remote-tracking branch 'upstream/omarrashed' into AbdullahAlmahdi
Aymalmahdi Jan 6, 2022
0c39e10
ee
omarrashed1 Jan 6, 2022
440efbe
Merge remote-tracking branch 'upstream/omarrashed' into AbdullahAlmahdi
Aymalmahdi Jan 6, 2022
b0d1940
menu
omarrashed1 Jan 6, 2022
e58d9c1
onbording
Aymalmahdi Jan 6, 2022
104f9cc
Merge remote-tracking branch 'upstream/omarrashed' into AbdullahAlmahdi
Aymalmahdi Jan 6, 2022
59d579a
Merge remote-tracking branch 'github-desktop-aymalmahdi/AbdullahAlmah…
omarrashed1 Jan 6, 2022
069dde0
change om
oaao1 Jan 6, 2022
7be802c
Merge remote-tracking branch 'github-desktop-aymalmahdi/AbdullahAlmah…
oaao1 Jan 6, 2022
dc49e96
changesplash
oaao1 Jan 9, 2022
e23b9c8
changebo
Aymalmahdi Jan 9, 2022
704d5e5
Merge branch 'pr/6' into AbdullahAlmahdi
Aymalmahdi Jan 9, 2022
eaf01de
dds
omarrashed1 Jan 10, 2022
3c31803
finly
Aymalmahdi Jan 10, 2022
a34c555
Merge remote-tracking branch 'upstream/omarrashed' into AbdullahAlmahdi
Aymalmahdi Jan 10, 2022
c6d2c33
aaa
omarrashed1 Jan 10, 2022
c586894
Merge remote-tracking branch 'upstream/omarrashed' into AbdullahAlmahdi
Aymalmahdi Jan 10, 2022
d0852ef
Merge branch 'pr/5' into Fahad
fsm1919 Jan 10, 2022
2ebc789
Merge remote-tracking branch 'github-desktop-aymalmahdi/master' into …
fsm1919 Jan 10, 2022
b34b377
Merge remote-tracking branch 'github-desktop-aymalmahdi/AbdullahAlmah…
fsm1919 Jan 10, 2022
887e62a
change
Aymalmahdi Jan 11, 2022
54bf23e
Merge remote-tracking branch 'github-desktop-aymalmahdi/AbdullahAlmah…
fsm1919 Jan 11, 2022
7f87ffa
CONGRALISIONS
Aymalmahdi Jan 11, 2022
5e5ede2
DEE
Aymalmahdi Jan 12, 2022
315b784
update
omarrashed1 Jan 18, 2022
51bfc6c
kk
omarrashed1 Jan 18, 2022
825cfda
ddwe
omarrashed1 Jan 18, 2022
31cc431
update cards
omarrashed1 Jan 19, 2022
5dba6b3
Merge remote-tracking branch 'upstream/omarrashed' into Fahad
fsm1919 Jan 20, 2022
5cebe39
newres
fsm1919 Jan 23, 2022
58500bf
rr
fsm1919 Jan 23, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions app/.idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions app/.idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions app/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions app/.idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions app/.idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apply plugin: 'com.android.application'
apply plugin: 'com.google.gms.google-services'

//oi
android {
compileSdkVersion 30
buildToolsVersion "29.0.3"
Expand All @@ -12,7 +12,7 @@ android {
multiDexEnabled true
versionCode 1
versionName "1.0"
resConfig "en"


testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand All @@ -30,10 +30,12 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.mediarouter:mediarouter:1.2.5'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

implementation "androidx.cardview:cardview:1.0.0"
//Google Material Design Library
implementation 'com.google.android.material:material:1.3.0-alpha01'

Expand Down
8 changes: 8 additions & 0 deletions app/local.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
## This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Sun Dec 26 12:52:52 AST 2021
sdk.dir=C\:\\Users\\pc\\AppData\\Local\\Android\\Sdk
Binary file added app/my-release-key.keystore
Binary file not shown.
Binary file added app/release/app-release.aab
Binary file not shown.
Binary file added app/release/app-release.apk
Binary file not shown.
20 changes: 20 additions & 0 deletions app/release/output-metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"version": 3,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.developerdepository.scout",
"variantName": "release",
"elements": [
{
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 1,
"versionName": "1.0",
"outputFile": "app-release.apk"
}
],
"elementType": "File"
}
6 changes: 4 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.developerdepository.scout">
package="com.developerdepository.scout"
tools:ignore="ExtraText">

<!-- <supports-screens-->
<!-- android:anyDensity="true"-->
Expand Down Expand Up @@ -56,7 +57,8 @@
<activity android:name=".User.AllCategoriesActivity" />
<activity android:name=".Common.OnBoardingActivity" />
<activity android:name=".User.UserDashboardActivity" />
<activity android:name=".Common.SplashScreenActivity">
<activity android:name=".Common.SplashScreenActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
Binary file modified app/src/main/app_logo-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
package com.developerdepository.scout.Common.LoginSignup;

import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;

import android.app.AlertDialog;
import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.net.ConnectivityManager;
import android.net.Network;
import android.net.NetworkInfo;
import android.os.Build;
import android.os.Bundle;
import android.provider.Settings;
import android.view.View;
Expand All @@ -22,10 +17,12 @@
import android.widget.TextView;
import android.widget.Toast;

import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;

import com.developerdepository.scout.Databases.SessionManager;
import com.developerdepository.scout.LocationOwner.RetailerDashboardActivity;
import com.developerdepository.scout.R;
import com.developerdepository.scout.User.UserDashboardActivity;
import com.google.android.material.textfield.TextInputLayout;
import com.google.firebase.database.DataSnapshot;
import com.google.firebase.database.DatabaseError;
Expand Down Expand Up @@ -55,6 +52,7 @@ public class RetailerLoginActivity extends AppCompatActivity {
private Button loginBtn;
private TextView forgotPassword, createAccountBtn;


AlertDialog progressDialog;

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package com.developerdepository.scout.Common;

import android.content.Intent;
import android.graphics.Color;
import android.graphics.Typeface;
import android.os.Bundle;
import android.text.Html;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
Expand Down Expand Up @@ -43,9 +45,9 @@ protected void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.activity_on_boarding);

//StatusBar Color
getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
getWindow().setStatusBarColor(getResources().getColor(android.R.color.white));
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
setWindowFlag(this, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS, false);
getWindow().setStatusBarColor(Color.TRANSPARENT);

initViews();
setActionOnViews();
Expand Down Expand Up @@ -107,7 +109,7 @@ private void createDashLayout(int position) {
dash[i].setTextSize(35);
dash[i].setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
dash[i].setAlpha(0.40f);
dash[i].setTextColor(getResources().getColor(android.R.color.black));
dash[i].setTextColor(getResources().getColor(R.color.lightWhite));

dashLayout.addView(dash[i]);
}
Expand Down Expand Up @@ -175,4 +177,16 @@ public void onBackPressed() {
super.onBackPressed();
finishAffinity();
}

public static void setWindowFlag(OnBoardingActivity onBoardingActivity, final int bits, boolean on) {
Window window = onBoardingActivity.getWindow();
WindowManager.LayoutParams layoutParams = window.getAttributes();

if (on) {
layoutParams.flags |= bits;
} else {
layoutParams.flags &= ~bits;
}
window.setAttributes(layoutParams);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

public class CategoriesModel {
int background, image;
String title;
int title;

public CategoriesModel() {
}

public CategoriesModel(int background, int image, String title) {
public CategoriesModel(int background, int image, int title) {
this.background = background;
this.image = image;
this.title = title;
Expand All @@ -21,7 +21,7 @@ public int getImage() {
return image;
}

public String getTitle() {
public int getTitle() {
return title;
}
}
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
package com.developerdepository.scout.HelperClasses.DashboardHelperClasses;

import android.content.Intent;
import android.net.Uri;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.RatingBar;
import android.widget.TextView;

import androidx.appcompat.app.AppCompatActivity;
import androidx.annotation.NonNull;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.RecyclerView;

import com.developerdepository.scout.R;

import java.util.ArrayList;

public class FeaturedLocationsAdapter extends RecyclerView.Adapter<FeaturedLocationsAdapter.FeaturedViewHolder> {
public class FeaturedLocationsAdapter extends RecyclerView.Adapter<FeaturedLocationsAdapter.FeaturedViewHolder> {

ArrayList<FeaturedModel> featuredLocations;

Expand All @@ -37,8 +40,21 @@ public void onBindViewHolder(@NonNull FeaturedViewHolder holder, int position) {
holder.featuredLocationImg.setImageResource(featuredModel.getImage());
holder.featuredLocationTitle.setText(featuredModel.getTitle());
holder.featuredLocationDesc.setText(featuredModel.getDescription());
holder.ratingBar.setRating((float) featuredModel.getRatingBar());
holder.featuredLocationItem.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {

Uri uri = Uri.parse(featuredModel.getUrl());
v.getContext().startActivity(new Intent(Intent.ACTION_VIEW,uri));
}

});


}


@Override
public int getItemCount() {
return featuredLocations.size();
Expand All @@ -49,7 +65,7 @@ public static class FeaturedViewHolder extends RecyclerView.ViewHolder {
ConstraintLayout featuredLocationItem;
ImageView featuredLocationImg;
TextView featuredLocationTitle, featuredLocationDesc;

RatingBar ratingBar;
public FeaturedViewHolder(@NonNull View itemView) {
super(itemView);

Expand All @@ -58,6 +74,8 @@ public FeaturedViewHolder(@NonNull View itemView) {
featuredLocationImg = itemView.findViewById(R.id.featured_location_item_img);
featuredLocationTitle = itemView.findViewById(R.id.featured_location_item_title);
featuredLocationDesc = itemView.findViewById(R.id.featured_location_item_desc);
ratingBar = itemView.findViewById(R.id.featured_location_item_rating);
}
}

}
Loading