Skip to content

Commit be540a1

Browse files
author
Mahesh
committed
Added Zomato Retrofit Implementation
1 parent fd15159 commit be540a1

File tree

69 files changed

+756
-2983
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+756
-2983
lines changed

‎ActivityExamples/.idea/gradle.xml‎

Lines changed: 3 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ActivityExamples/.idea/misc.xml‎

Lines changed: 5 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ActivityExamples/.idea/vcs.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ActivityExamples/app/build.gradle‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@ repositories {
1616

1717

1818
android {
19-
compileSdkVersion 27
20-
buildToolsVersion '28.0.2'
19+
compileSdkVersion 28
2120
defaultConfig {
2221
applicationId "com.example.mahesha.activityexamples"
2322
minSdkVersion 18
24-
targetSdkVersion 27
23+
targetSdkVersion 28
2524
versionCode 2
2625
versionName "1.0"
2726
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -61,20 +60,27 @@ android {
6160

6261
dependencies {
6362
implementation fileTree(include: ['*.jar'], dir: 'libs')
64-
implementation 'com.android.support:appcompat-v7:27.1.1'
63+
implementation 'com.android.support:appcompat-v7:28.0.0'
6564
implementation 'com.google.android.gms:play-services-maps:9.2.1'
66-
implementation 'com.android.support:support-v4:27.1.1'
67-
implementation 'com.android.support:design:27.1.1'
65+
implementation 'com.android.support:support-v4:28.0.0'
66+
implementation 'com.android.support:design:28.0.0'
6867
implementation 'com.weiwangcn.betterspinner:library-material:1.1.0'
6968
implementation 'com.google.android.gms:play-services-auth:9.2.1'
70-
implementation 'com.android.support:cardview-v7:27.1.1'
71-
implementation 'com.android.support:recyclerview-v7:27.1.1'
69+
implementation 'com.android.support:cardview-v7:28.0.0'
70+
implementation 'com.android.support:recyclerview-v7:28.0.0'
7271
implementation 'com.mikhaellopez:circularimageview:3.0.2'
7372
implementation 'com.google.android.gms:play-services-appindexing:9.2.1'
7473
implementation 'com.google.android.gms:play-services-location:9.2.1'
7574
implementation 'com.jakewharton:butterknife:8.5.1'
76-
implementation 'com.google.code.gson:gson:2.7'
75+
implementation 'com.google.code.gson:gson:2.8.5'
7776

77+
implementation 'com.squareup.retrofit2:retrofit:2.5.0'
78+
implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
79+
80+
81+
testImplementation 'junit:junit:4.12'
82+
androidTestImplementation 'com.android.support.test:runner:1.0.2'
83+
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
7884
def power_mockito_version = "2.0.0-beta.5"
7985
testImplementation 'junit:junit:4.12'
8086
testImplementation 'org.json:json:20171018'

‎ActivityExamples/app/src/debug/res/anim/fade.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,4 @@
55
android:fromAlpha="0"
66
android:toAlpha="1"/>
77

8-
<alpha
9-
android:duration="2000"
10-
android:fromAlpha="1"
11-
android:startOffset="2000"
12-
android:toAlpha="0"/>
138
</set>

‎ActivityExamples/app/src/main/AndroidManifest.xml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
34
package="com.example.mahesha.activityexamples">
4-
55
<!--
66
The ACCESS_COARSE/FINE_LOCATION permissions are not required to use
77
Google Maps Android API v2, but you must specify either coarse or fine
@@ -35,16 +35,20 @@
3535
android:label="@string/app_name"
3636
android:largeHeap="true"
3737
android:supportsRtl="true"
38-
android:theme="@style/AppTheme">
39-
<activity
40-
android:name=".SplashOptimisedActivity"
41-
android:theme="@style/splashScreenTheme">
38+
android:theme="@style/AppTheme"
39+
tools:ignore="GoogleAppIndexingWarning">
40+
<activity android:name="com.example.mahesha.zomato.ZomatoActivity">
4241
<intent-filter>
4342
<action android:name="android.intent.action.MAIN" />
4443

4544
<category android:name="android.intent.category.LAUNCHER" />
4645
</intent-filter>
4746
</activity>
47+
<activity
48+
android:name=".SplashOptimisedActivity"
49+
android:theme="@style/splashScreenTheme">
50+
51+
</activity>
4852
<activity android:name=".MainActivity">
4953
<intent-filter>
5054
<action android:name="android.intent.action.MAIN" />
@@ -87,7 +91,6 @@
8791
android:theme="@style/AppTheme.NoActionBar" />
8892
<activity android:name="com.example.mahesha.widgets.SpinnerActivity" />
8993
<activity android:name="com.example.mahesha.widgets.CheckBoxActivity" />
90-
.
9194
<activity
9295
android:name="com.example.mahesha.googlelogin.ChooserActivity"
9396
android:label="@string/name_sign_in_activity"
@@ -338,7 +341,7 @@
338341
<activity
339342
android:name="com.example.mahesha.jsonHandeling.JsonActivity"
340343
android:label="@string/title_activity_json"
341-
android:theme="@style/AppTheme.NoActionBar"></activity>
344+
android:theme="@style/AppTheme.NoActionBar" />
342345
</application>
343346

344347
</manifest>

‎ActivityExamples/app/src/main/java/com/example/mahesha/activityexamples/LauncherActivity.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,12 @@
1010
import android.view.View;
1111

1212
import com.example.mahesha.utility.Session;
13-
import com.crashlytics.android.Crashlytics;
14-
import io.fabric.sdk.android.Fabric;
1513

1614
public class LauncherActivity extends AppCompatActivity {
1715
private Session session;
1816
@Override
1917
protected void onCreate(Bundle savedInstanceState) {
2018
super.onCreate(savedInstanceState);
21-
Fabric.with(this, new Crashlytics());
2219
setContentView(R.layout.activity_launcher);
2320
session = new Session(LauncherActivity.this);
2421
// Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);

‎ActivityExamples/app/src/main/java/com/example/mahesha/activityexamples/MainActivity.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import android.view.View;
1414
import android.widget.Button;
1515

16-
import com.crashlytics.android.Crashlytics;
1716
import com.example.mahesha.animations.AnimationsActivity;
1817
import com.example.mahesha.databasehandellers.DBHelper;
1918
import com.example.mahesha.fragmentexamples.TTFragmentActivity;
@@ -32,15 +31,12 @@
3231

3332
import java.util.Locale;
3433

35-
import io.fabric.sdk.android.Fabric;
36-
3734
public class MainActivity extends AppCompatActivity implements View.OnClickListener {
3835
Locale myLocale;
3936

4037
@Override
4138
protected void onCreate(Bundle savedInstanceState) {
4239
super.onCreate(savedInstanceState);
43-
Fabric.with(this, new Crashlytics());
4440
setContentView(R.layout.activity_main);
4541
DBHelper db = new DBHelper(this);
4642
// Toast.makeText(this, "On Create", Toast.LENGTH_SHORT).show();

‎ActivityExamples/app/src/main/java/com/example/mahesha/activityexamples/SplashOptimisedActivity.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,12 @@
55
import android.os.Handler;
66
import android.support.v7.app.AppCompatActivity;
77
import android.os.Bundle;
8-
import com.crashlytics.android.Crashlytics;
9-
import io.fabric.sdk.android.Fabric;
108

119
public class SplashOptimisedActivity extends AppCompatActivity {
1210

1311
@Override
1412
protected void onCreate(Bundle savedInstanceState) {
1513
super.onCreate(savedInstanceState);
16-
Fabric.with(this, new Crashlytics());
1714
// setContentView(R.layout.activity_splash_optimised);
1815
new Handler().postDelayed(new Runnable() {
1916

‎ActivityExamples/app/src/main/java/com/example/mahesha/notificatons/NotificaionActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import android.content.Context;
66
import android.content.Intent;
77
import android.os.Bundle;
8+
import android.support.v4.app.NotificationCompat;
89
import android.support.v4.app.TaskStackBuilder;
910
import android.support.v7.app.AppCompatActivity;
10-
import android.support.v7.app.NotificationCompat;
1111
import android.util.Log;
1212
import android.view.View;
1313

0 commit comments

Comments
 (0)