Merge pull request #130 from ItsCalebJones/dev-viewpagers

Dev - Change from TabLayout to ViewPager
ItsCalebJones · Sep 4, 2018 · 4b109d4 · 4b109d4
2 parents 7984887 + a31f396
commit 4b109d4
Show file tree

Hide file tree

Showing 23 changed files with 1,577 additions and 763 deletions.
diff --git a/mobile/build.gradle b/mobile/build.gradle
@@ -243,6 +243,7 @@ dependencies {
 
     implementation 'com.github.ItsCalebJones:GDPRDialog:54231db'
 
+    implementation 'com.android.support:support-v4:27.1.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
     implementation 'com.github.jrvansuita:MaterialAbout:0.2.1'
     implementation 'com.github.mukeshsolanki:MarkdownView-Android:1.0.4'

diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
@@ -229,15 +229,6 @@
             </intent-filter>
         </receiver>
 
-        <service
-            android:name=".content.notifications.NotificationReceiver"
-            android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE">
-            <intent-filter>
-                <action android:name="com.onesignal.NotificationExtender" />
-            </intent-filter>
-        </service>
-
         <activity
             android:name=".ui.changelog.ChangelogActivity"
             android:theme="@style/BaseAppTheme" />
@@ -265,11 +256,12 @@
             android:value="me.calebjones.spacelaunchnow.LAUNCH_UPDATE" />
 
         <activity
-            android:name=".ui.launches.AgencyLaunches"
-            android:exported="true" />
+            android:name=".ui.launches.launcher.LauncherLaunchActivity"
+            android:theme="@style/BaseAppTheme" />
         <activity
-            android:name=".ui.launches.LauncherLaunches"
-            android:exported="true" />
+            android:name=".ui.launches.agency.AgencyLaunchActivity"
+            android:theme="@style/BaseAppTheme" />
+
     </application>
 
 </manifest>
diff --git a/...ain/java/me/calebjones/spacelaunchnow/ui/launchdetail/fragments/AgencyDetailFragment.java b/...ain/java/me/calebjones/spacelaunchnow/ui/launchdetail/fragments/AgencyDetailFragment.java
@@ -14,7 +14,6 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -28,8 +27,7 @@
 import me.calebjones.spacelaunchnow.content.database.ListPreferences;
 import me.calebjones.spacelaunchnow.content.events.LaunchEvent;
 import me.calebjones.spacelaunchnow.data.models.main.Launch;
-import me.calebjones.spacelaunchnow.ui.launches.AgencyLaunches;
-import me.calebjones.spacelaunchnow.ui.supporter.SupporterActivity;
+import me.calebjones.spacelaunchnow.ui.launches.agency.AgencyLaunchActivity;
 import me.calebjones.spacelaunchnow.utils.GlideApp;
 import me.calebjones.spacelaunchnow.utils.Utils;
 import timber.log.Timber;
@@ -191,7 +189,7 @@ public void onLspWikiButtonOneClicked() {
 
     @OnClick(R.id.lsp_agency)
     public void onViewClicked() {
-        Intent intent = new Intent(context, AgencyLaunches.class);
+        Intent intent = new Intent(context, AgencyLaunchActivity.class);
         intent.putExtra("lspName", detailLaunch.getLsp().getName());
         startActivity(intent);
     }

diff --git a/...in/java/me/calebjones/spacelaunchnow/ui/launchdetail/fragments/MissionDetailFragment.java b/...in/java/me/calebjones/spacelaunchnow/ui/launchdetail/fragments/MissionDetailFragment.java
@@ -1,9 +1,9 @@
 package me.calebjones.spacelaunchnow.ui.launchdetail.fragments;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.AppCompatButton;
@@ -22,21 +22,13 @@
 import butterknife.ButterKnife;
 import me.calebjones.spacelaunchnow.R;
 import me.calebjones.spacelaunchnow.common.RetroFitFragment;
-import me.calebjones.spacelaunchnow.content.data.DataSaver;
 import me.calebjones.spacelaunchnow.content.events.LaunchEvent;
-import me.calebjones.spacelaunchnow.data.models.Constants;
-import me.calebjones.spacelaunchnow.data.models.Result;
 import me.calebjones.spacelaunchnow.data.models.main.Launch;
 import me.calebjones.spacelaunchnow.data.models.main.Launcher;
 import me.calebjones.spacelaunchnow.data.models.main.Mission;
-import me.calebjones.spacelaunchnow.data.networking.interfaces.SpaceLaunchNowService;
-import me.calebjones.spacelaunchnow.data.networking.responses.base.VehicleResponse;
-import me.calebjones.spacelaunchnow.ui.launches.LauncherLaunches;
+import me.calebjones.spacelaunchnow.ui.launches.launcher.LauncherLaunchActivity;
 import me.calebjones.spacelaunchnow.utils.analytics.Analytics;
 import me.calebjones.spacelaunchnow.utils.Utils;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
 import timber.log.Timber;
 
 public class MissionDetailFragment extends RetroFitFragment {
@@ -166,6 +158,7 @@ private void setUpViews(Launch launch) {
         }
     }
 
+    @SuppressLint("StringFormatMatches")
     private void configureLaunchVehicle(Launcher launchVehicle) {
         if (launchVehicle != null) {
             vehicleSpecView.setVisibility(View.VISIBLE);
@@ -214,7 +207,7 @@ private void configureLaunchVehicle(Launcher launchVehicle) {
                 }
                 launchesButton.setText(String.format(getString(R.string.view_rocket_launches), launchVehicle.getName()));
                 launchesButton.setOnClickListener(v -> {
-                    Intent launches = new Intent(context, LauncherLaunches.class);
+                    Intent launches = new Intent(context, LauncherLaunchActivity.class);
                     launches.putExtra("launcherId", launchVehicle.getId());
                     launches.putExtra("launcherName", launchVehicle.getName());
                     context.startActivity(launches);

diff --git a/mobile/src/main/java/me/calebjones/spacelaunchnow/ui/launcher/VehicleDetailAdapter.java b/mobile/src/main/java/me/calebjones/spacelaunchnow/ui/launcher/VehicleDetailAdapter.java
@@ -19,11 +19,10 @@
 import java.util.List;
 
 import io.realm.RealmList;
-import io.realm.RealmResults;
 import me.calebjones.spacelaunchnow.R;
 import me.calebjones.spacelaunchnow.data.models.main.Launcher;
 import me.calebjones.spacelaunchnow.ui.imageviewer.FullscreenImageActivity;
-import me.calebjones.spacelaunchnow.ui.launches.LauncherLaunches;
+import me.calebjones.spacelaunchnow.ui.launches.launcher.LauncherLaunchActivity;
 import me.calebjones.spacelaunchnow.utils.GlideApp;
 import me.calebjones.spacelaunchnow.utils.Utils;
 
@@ -247,7 +246,7 @@ public void onClick(View v) {
                     }
                     break;
                 case R.id.launcher_launches:
-                    Intent launches = new Intent(activity, LauncherLaunches.class);
+                    Intent launches = new Intent(activity, LauncherLaunchActivity.class);
                     launches.putExtra("launcherId", items.get(position).getId());
                     launches.putExtra("launcherName", items.get(position).getName());
                     activity.startActivity(launches);