Set up dependency injection

README.md

@@ -1 +1,5 @@
-# giphy-browser
+# GIPHY Browser
+
+Notes:
+
+- Models don't have proper getters and setters to save time

app/build.gradle

@@ -1,4 +1,7 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'dagger.hilt.android.plugin'
 
 android {
  compileSdkVersion 29
@@ -11,10 +14,22 @@ android {
  versionCode 1
  versionName "1.0"
  }
+
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
 }
 
 dependencies {
+ implementation "com.google.dagger:hilt-android:2.28-alpha"
+ kapt "com.google.dagger:hilt-android-compiler:2.28-alpha"
  implementation 'androidx.appcompat:appcompat:1.1.0'
  implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
  implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+ implementation 'androidx.recyclerview:recyclerview:1.1.0'
+ implementation 'androidx.paging:paging-runtime:2.1.2'
+ implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+ implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'
+ implementation 'com.facebook.fresco:fresco:2.2.0'
 }

app/src/main/AndroidManifest.xml

@@ -1,21 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http:https://schemas.android.com/apk/res/android"
+<manifest
+ xmlns:android="http:https://schemas.android.com/apk/res/android"
  package="com.tananaev.giphy">
 
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
  <application
- android:allowBackup="true"
+ android:usesCleartextTraffic="true"
+ android:allowBackup="false"
  android:icon="@mipmap/ic_launcher"
  android:label="@string/app_name"
  android:roundIcon="@mipmap/ic_launcher_round"
  android:supportsRtl="true"
- android:theme="@style/AppTheme">
+ android:theme="@style/AppTheme"
+ android:name=".MainApplication">
+
  <activity android:name=".MainActivity">
  <intent-filter>
  <action android:name="android.intent.action.MAIN" />
-
  <category android:name="android.intent.category.LAUNCHER" />
  </intent-filter>
  </activity>
+
  </application>
 
 </manifest>

app/src/main/java/com/tananaev/giphy/MainActivity.java

@@ -6,6 +6,9 @@
 
 import com.tananaev.giphy.ui.main.MainFragment;
 
+import dagger.hilt.android.AndroidEntryPoint;
+
+@AndroidEntryPoint
 public class MainActivity extends AppCompatActivity {
 
  @Override

app/src/main/java/com/tananaev/giphy/MainApplication.java

@@ -0,0 +1,14 @@
+package com.tananaev.giphy;
+
+import android.app.Application;
+
+import dagger.hilt.android.HiltAndroidApp;
+
+@HiltAndroidApp
+public class MainApplication extends Application {
+
+ @Override
+ public void onCreate() {
+ super.onCreate();
+ }
+}

app/src/main/java/com/tananaev/giphy/inject/NetworkModule.java

@@ -0,0 +1,24 @@
+package com.tananaev.giphy.inject;
+
+import com.tananaev.giphy.service.GiphyService;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+import dagger.hilt.InstallIn;
+import dagger.hilt.android.components.FragmentComponent;
+import retrofit2.Retrofit;
+
+@Module
+@InstallIn(FragmentComponent.class)
+public abstract class NetworkModule {
+
+ @Provides
+ public static GiphyService provideGiphyService() {
+ return new Retrofit.Builder()
+ .baseUrl("https://api.giphy.com")
+ .build()
+ .create(GiphyService.class);
+ }
+}

app/src/main/java/com/tananaev/giphy/model/Gif.java

@@ -0,0 +1,5 @@
+package com.tananaev.giphy.model;
+
+public class Gif {
+ public Images images;
+}

app/src/main/java/com/tananaev/giphy/model/Image.java

@@ -0,0 +1,7 @@
+package com.tananaev.giphy.model;
+
+public class Image {
+ public String width;
+ public String height;
+ public String url;
+}

app/src/main/java/com/tananaev/giphy/model/Images.java

@@ -0,0 +1,7 @@
+package com.tananaev.giphy.model;
+
+public class Images {
+ public Image preview_gif;
+ public Image downsized;
+ public Image original;
+}

app/src/main/java/com/tananaev/giphy/model/Pagination.java

@@ -0,0 +1,7 @@
+package com.tananaev.giphy.model;
+
+public class Pagination {
+ public int offset;
+ public int total_count;
+ public int count;
+}

app/src/main/java/com/tananaev/giphy/model/Response.java

@@ -0,0 +1,8 @@
+package com.tananaev.giphy.model;
+
+import java.util.List;
+
+public class Response {
+ public List<Gif> data;
+ public Pagination pagination;
+}

app/src/main/java/com/tananaev/giphy/repo/MainRepository.java

@@ -0,0 +1,15 @@
+package com.tananaev.giphy.repo;
+
+import com.tananaev.giphy.service.GiphyService;
+
+import javax.inject.Inject;
+
+public class MainRepository {
+
+ private GiphyService service;
+
+ @Inject
+ public MainRepository(GiphyService service) {
+ this.service = service;
+ }
+}

app/src/main/java/com/tananaev/giphy/service/AuthInterceptor.java

@@ -0,0 +1,29 @@
+package com.tananaev.giphy.service;
+
+import java.io.IOException;
+
+import okhttp3.HttpUrl;
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import okhttp3.Response;
+
+public class AuthInterceptor implements Interceptor {
+
+ private static final String API_KEY = "FdzU6ULmoB0YkKrII9Gzs0HX6fDS4YCo";
+
+ @Override
+ public Response intercept(Chain chain) throws IOException {
+
+ Request original = chain.request();
+ HttpUrl originalHttpUrl = original.url();
+
+ HttpUrl url = originalHttpUrl.newBuilder()
+ .addQueryParameter("api_key", API_KEY)
+ .build();
+
+ Request.Builder requestBuilder = original.newBuilder().url(url);
+
+ Request request = requestBuilder.build();
+ return chain.proceed(request);
+ }
+}

app/src/main/java/com/tananaev/giphy/service/GiphyService.java

@@ -0,0 +1,12 @@
+package com.tananaev.giphy.service;
+
+import com.tananaev.giphy.model.Response;
+
+import retrofit2.Call;
+import retrofit2.http.GET;
+import retrofit2.http.Query;
+
+public interface GiphyService {
+ @GET("/v1/gifs/trending")
+ Call<Response> trending(@Query("offset") int offset, @Query("limit") int limit);
+}

app/src/main/java/com/tananaev/giphy/ui/main/MainFragment.java

@@ -1,39 +1,59 @@
 package com.tananaev.giphy.ui.main;
 
-import androidx.lifecycle.ViewModelProviders;
-
 import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.lifecycle.ViewModelProviders;
+import androidx.paging.PagedListAdapter;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.tananaev.giphy.R;
 
+import javax.inject.Inject;
+
+import dagger.hilt.android.AndroidEntryPoint;
+
+@AndroidEntryPoint
 public class MainFragment extends Fragment {
 
- private MainViewModel mViewModel;
+ private static final int COLUMNS = 2;
+
+ private MainViewModel viewModel;
+ private PagedListAdapter adapter;
+
+ @Inject
+ MainViewModelFactory viewModelFactory;
 
  public static MainFragment newInstance() {
  return new MainFragment();
  }
 
  @Nullable
  @Override
- public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
- @Nullable Bundle savedInstanceState) {
+ public View onCreateView(
+ @NonNull LayoutInflater inflater,
+ @Nullable ViewGroup container,
+ @Nullable Bundle savedInstanceState) {
  return inflater.inflate(R.layout.main_fragment, container, false);
  }
 
+ @Override
+ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+ RecyclerView gridView = view.findViewById(R.id.grid);
+ gridView.setLayoutManager(new GridLayoutManager(getContext(), COLUMNS));
+
+ }
+
  @Override
  public void onActivityCreated(@Nullable Bundle savedInstanceState) {
  super.onActivityCreated(savedInstanceState);
- mViewModel = ViewModelProviders.of(this).get(MainViewModel.class);
- // TODO: Use the ViewModel
+ viewModel = new ViewModelProvider(this, viewModelFactory).get(MainViewModel.class);
  }
-
 }

app/src/main/java/com/tananaev/giphy/ui/main/MainViewModel.java

@@ -2,6 +2,16 @@
 
 import androidx.lifecycle.ViewModel;
 
+import com.tananaev.giphy.repo.MainRepository;
+
+import javax.inject.Inject;
+
 public class MainViewModel extends ViewModel {
- // TODO: Implement the ViewModel
+
+ private MainRepository repository;
+
+ @Inject
+ public MainViewModel(MainRepository repository) {
+ this.repository = repository;
+ }
 }

app/src/main/java/com/tananaev/giphy/ui/main/MainViewModelFactory.java

@@ -0,0 +1,25 @@
+package com.tananaev.giphy.ui.main;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModelProvider;
+
+import com.tananaev.giphy.repo.MainRepository;
+
+import javax.inject.Inject;
+
+public class MainViewModelFactory implements ViewModelProvider.Factory {
+
+ private MainRepository repository;
+
+ @Inject
+ public MainViewModelFactory(MainRepository repository) {
+ this.repository = repository;
+ }
+
+ @NonNull
+ @Override
+ public <T extends ViewModel> T create(@NonNull Class<T> modelClass) {
+ return (T) new MainViewModel(repository);
+ }
+}

app/src/main/res/layout/main_fragment.xml

@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http:https://schemas.android.com/apk/res/android"
- xmlns:app="http:https://schemas.android.com/apk/res-auto"
+<FrameLayout
+ xmlns:android="http:https://schemas.android.com/apk/res/android"
  xmlns:tools="http:https://schemas.android.com/tools"
  android:id="@+id/main"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
  tools:context=".ui.main.MainFragment">
 
- <TextView
- android:id="@+id/message"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="MainFragment"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/grid"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>

build.gradle

@@ -5,6 +5,7 @@ buildscript {
  }
  dependencies {
  classpath "com.android.tools.build:gradle:4.0.0"
+ classpath "com.google.dagger:hilt-android-gradle-plugin:2.28-alpha"
  }
 }