Latest Version (v1.4)

R6S/app/build.gradle

@@ -9,14 +9,15 @@ android {
             keyPassword "Ek09iG2aB_XMlMe3kQ4mynrnPLi!PXkC"
         }
     }
-    compileSdkVersion 24
+    compileSdkVersion 25
-    buildToolsVersion "24.0.1"
+    buildToolsVersion "25.0.0"
     defaultConfig {
         applicationId "io.nicco.r6s"
         minSdkVersion 19
-        targetSdkVersion 24
+        targetSdkVersion 25
-        versionCode 8
+        versionCode 13
-        versionName '1.2'
+        versionName '1.4'
+        signingConfig signingConfigs.release
     }
     buildTypes {
         release {

R6S/app/src/main/java/io/nicco/r6s/OpsListAdapter.java

@@ -1,5 +1,6 @@
 package io.nicco.r6s;
 
+import android.app.Activity;
 import android.app.Fragment;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -18,6 +19,8 @@ import java.util.List;
 
 public class OpsListAdapter extends RecyclerView.Adapter<OpsListAdapter.ViewHolder> {
 
+    private Activity root;
+
     public static class ViewHolder extends RecyclerView.ViewHolder {
 
         public TextView txt_n;
@@ -37,8 +40,9 @@ public class OpsListAdapter extends RecyclerView.Adapter<OpsListAdapter.ViewHold
 
     private List<OpsListItem> data;
 
-    public OpsListAdapter(List<OpsListItem> d) {
+    public OpsListAdapter(List<OpsListItem> d, Activity r) {
         data = d;
+        root = r;
     }
 
     @Override
@@ -55,7 +59,7 @@ public class OpsListAdapter extends RecyclerView.Adapter<OpsListAdapter.ViewHold
         viewHolder.txt_n.setText(data.get(position).n);
         viewHolder.txt_f.setText(data.get(position).f);
         try {
-            InputStream ims = home.root().getAssets().open(data.get(position).i);
+            InputStream ims = root.getAssets().open(data.get(position).i);
             viewHolder.txt_i.setImageDrawable(Drawable.createFromStream(ims, null));
         } catch (IOException e) {
             e.printStackTrace();
@@ -67,7 +71,7 @@ public class OpsListAdapter extends RecyclerView.Adapter<OpsListAdapter.ViewHold
                 b.putInt("id", data.get(position).id);
                 Fragment f = new op_view();
                 f.setArguments(b);
-                home.ChangeFragment(f);
+                home.ChangeFragment(f, root);
             }
         });
     }

R6S/app/src/main/java/io/nicco/r6s/WeaponsListAdapter.java

@@ -1,5 +1,6 @@
 package io.nicco.r6s;
 
+import android.app.Activity;
 import android.app.Fragment;
 import android.content.Context;
 import android.os.Bundle;
@@ -14,6 +15,8 @@ import java.util.List;
 
 public class WeaponsListAdapter extends RecyclerView.Adapter<WeaponsListAdapter.ViewHolder> {
 
+    private Activity root;
+
     public static class ViewHolder extends RecyclerView.ViewHolder {
 
         public TextView txt_l;
@@ -31,8 +34,9 @@ public class WeaponsListAdapter extends RecyclerView.Adapter<WeaponsListAdapter.
 
     private List<WeaponListItem> data;
 
-    public WeaponsListAdapter(List<WeaponListItem> d) {
+    public WeaponsListAdapter(List<WeaponListItem> d, Activity r) {
         data = d;
+        root = r;
     }
 
     @Override
@@ -54,7 +58,7 @@ public class WeaponsListAdapter extends RecyclerView.Adapter<WeaponsListAdapter.
                 b.putInt("id", data.get(position).id);
                 Fragment f = new weapon_view();
                 f.setArguments(b);
-                home.ChangeFragment(f);
+                home.ChangeFragment(f, root);
             }
         });
     }

R6S/app/src/main/java/io/nicco/r6s/home.java

@@ -27,7 +27,6 @@ public class home extends AppCompatActivity
 
     private DrawerLayout drawer;
     private Fragment curFrag = null;
-    private static Activity c;
     private static String DB_PATH;
     private static String DB_NAME;
     private final String DB_URL = "https://raw.githubusercontent.com/CupCakeArmy/static/master/R6S/R6S.sqlite";
@@ -39,8 +38,6 @@ public class home extends AppCompatActivity
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        c = this;
-
         drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
                 this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
@@ -50,7 +47,7 @@ public class home extends AppCompatActivity
         NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
         navigationView.setNavigationItemSelectedListener(this);
 
-        ChangeFragment(new ops_view());
+        ChangeFragment(new ops_view(), this);
         setTitle("Operators");
 
         // Save DB from assets to storage
@@ -129,22 +126,18 @@ public class home extends AppCompatActivity
         }
 
         setTitle(title);
-        c.getFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+        getFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
-        ChangeFragment(curFrag);
+        ChangeFragment(curFrag, this);
 
         drawer.closeDrawer(GravityCompat.START);
         return true;
     }
 
-    public static void ChangeFragment(Fragment f) {
+    public static void ChangeFragment(Fragment f, Activity a) {
-        c.getFragmentManager().beginTransaction().addToBackStack(null).replace(R.id.main_cont, f).commit();
+        a.getFragmentManager().beginTransaction().addToBackStack(null).replace(R.id.main_cont, f).commit();
     }
 
     public static SQLiteDatabase mkdb() {
         return SQLiteDatabase.openDatabase(DB_PATH + DB_NAME, null, 0);
     }
-
-    public static Activity root() {
-        return c;
-    }
 }

R6S/app/src/main/java/io/nicco/r6s/maps_view.java

@@ -1,8 +1,8 @@
 package io.nicco.r6s;
 
 
+import android.app.Activity;
 import android.app.Fragment;
-import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -11,33 +11,37 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
-import android.widget.ImageView;
 import android.widget.Spinner;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
+import static android.content.Context.MODE_PRIVATE;
+
 public class maps_view extends Fragment {
 
 
     public maps_view() {
     }
 
-    private Context root = null;
+    private Activity root;
     private Spinner maps_sel;
     private TextView cur_floor_txt;
     private Button btn_l;
     private Button btn_r;
-    private ImageView img;
+    private TouchImageView img;
 
     private final String path = "Maps";
     private int cur_floor = 0;
     private String cur_map;
     private String[] maps = null;
 
+    private final static String PREF_A = "maps_view_show_toast";
+
     private void setImg() {
         InputStream ims;
         try {
@@ -52,17 +56,16 @@ public class maps_view extends Fragment {
 
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-                             Bundle savedInstanceState) {
+        root = getActivity();
 
         View view = inflater.inflate(R.layout.fragment_maps_view, container, false);
 
-        root = getActivity();
         maps_sel = (Spinner) view.findViewById(R.id.maps_spinner);
         cur_floor_txt = (TextView) view.findViewById(R.id.maps_cur_floor);
         btn_l = (Button) view.findViewById(R.id.maps_btn_l);
         btn_r = (Button) view.findViewById(R.id.maps_btn_r);
-        img = (ImageView) view.findViewById(R.id.maps_img);
+        img = (TouchImageView) view.findViewById(R.id.maps_img);
 
         List<String> maps_sel_cont = new ArrayList<>();
 
@@ -113,6 +116,14 @@ public class maps_view extends Fragment {
             }
         });
 
+        img.resetZoom();
+
+        int showed_toast = Integer.parseInt(root.getPreferences(MODE_PRIVATE).getString(PREF_A, "0"));
+        if (showed_toast < 5) {
+            Toast.makeText(root, "Pinch the Map, You can ZOOM!", Toast.LENGTH_LONG).show();
+            root.getPreferences(MODE_PRIVATE).edit().putString(PREF_A, String.valueOf(++showed_toast)).apply();
+        }
+
         return view;
     }
 

R6S/app/src/main/java/io/nicco/r6s/op_view.java

@@ -1,6 +1,7 @@
 package io.nicco.r6s;
 
 
+import android.app.Activity;
 import android.app.Fragment;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
@@ -9,30 +10,34 @@ import android.graphics.BitmapFactory;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 
+import static android.content.Context.MODE_PRIVATE;
+
 public class op_view extends Fragment {
 
 
     public op_view() {
     }
 
+    private Activity root;
+    private final static String PREF_A = "op_view_show_toast";
+
     private LinearLayout mkItem(String s) {
-        LinearLayout frame = new LinearLayout(home.root());
+        LinearLayout frame = new LinearLayout(root);
-        TextView tmp = new TextView(home.root());
+        TextView tmp = new TextView(root);
 
         LinearLayout.LayoutParams fp = new LinearLayout.LayoutParams(0, LinearLayout.LayoutParams.WRAP_CONTENT, 1);
         fp.setMargins(8, 8, 8, 8);
@@ -59,6 +64,8 @@ public class op_view extends Fragment {
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        root = getActivity();
+
         final View v = inflater.inflate(R.layout.fragment_op_view, container, false);
 
         //Get Operator Info
@@ -98,7 +105,7 @@ public class op_view extends Fragment {
                     b.putInt("id", cur_id);
                     Fragment f = new weapon_view();
                     f.setArguments(b);
-                    home.ChangeFragment(f);
+                    home.ChangeFragment(f, root);
                 }
             });
             if (w.getString(w.getColumnIndex("class")).equals("Secondary")) {
@@ -117,7 +124,8 @@ public class op_view extends Fragment {
 
         //Setting Images
         try {
-            InputStream ims = home.root().getAssets().open("Operators/" + c.getString(c.getColumnIndex("type")) + "/" + c.getString(c.getColumnIndex("name")) + ".png");
+
+            InputStream ims = root.getAssets().open("Operators/" + c.getString(c.getColumnIndex("type")) + "/" + c.getString(c.getColumnIndex("name")) + ".png");
             ((ImageView) v.findViewById(R.id.op_img)).setImageDrawable(Drawable.createFromStream(ims, null));
         } catch (IOException e) {
             e.printStackTrace();
@@ -126,38 +134,37 @@ public class op_view extends Fragment {
         v.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
             @Override
             public void onGlobalLayout() {
-                Log.i("Trelelele", "ok");
                 try {
 
-                    //Drawable d = Drawable.createFromStream(home.root().getAssets().open("OPs/" + String.valueOf(id) + ".jpg"), null);
+                    //Drawable d = Drawable.createFromStream(c.getAssets().open("OPs/" + String.valueOf(id) + ".jpg"), null);
                     ImageView op_bg = (ImageView) v.findViewById(R.id.op_bg);
-                    RelativeLayout img_cont = (RelativeLayout) v.findViewById(R.id.img_cont);
+                    Bitmap bitmap = BitmapFactory.decodeStream(root.getAssets().open("OPs/" + String.valueOf(id) + ".jpg"));
-                    Bitmap bitmap = BitmapFactory.decodeStream(home.root().getAssets().open("OPs/" + String.valueOf(id) + ".jpg"));
 
                     int b_h = bitmap.getHeight();
                     int b_w = bitmap.getWidth();
-                    //float ratio = op_bg.getHeight() / op_bg.getWidth();
+                    int bg_h = op_bg.getHeight();
-                    Log.i("W & H: ", op_bg.getMeasuredHeight() + " - " + op_bg.getHeight());
+                    int bg_w = op_bg.getWidth();
-            /*
+                    float ratio = (float) bg_h / bg_w;
-            if (ratio > 1) {
+
-                // BG is portrait
+                    try {
-                if (b_h > b_w) {
+                        if (ratio > 1) {
-                    //img is portrait
+                            // BG is portrait
-                    bitmap = Bitmap.createBitmap(bitmap, 0, 0, b_h, (int) (b_h * ratio));
+                            if (b_h > b_w) {
-                } else {
+                                bitmap = Bitmap.createBitmap(bitmap, 0, 0, b_w, Math.min((int) (b_w * ratio), b_h));
-                    //img is landscape
+                            } else {
-                    bitmap = Bitmap.createBitmap(bitmap, 0, 0, (int) (b_w / ratio), b_w);
+                                bitmap = Bitmap.createBitmap(bitmap, 0, 0, Math.min((int) (b_w / ratio), b_h), b_w);
-                }
+                            }
-            } else {
+                        } else {
-                //BG is landscape
+                            // BG is landscape
-                if (b_h > b_w) {
+                            if (b_h > b_w) {
-                    //img is portrait
+                                bitmap = Bitmap.createBitmap(bitmap, 0, 0, b_w, (int) (b_w * ratio));
-                    bitmap = Bitmap.createBitmap(bitmap, 0, 0, (int) (b_w / ratio), b_w);
+                            } else {
-                } else {
+                                bitmap = Bitmap.createBitmap(bitmap, 0, 0, b_h, (int) (b_h * ratio));
-                    //img is landscape
+                            }
-                    bitmap = Bitmap.createBitmap(bitmap, 0, 0, b_h, (int) (b_h * ratio));
+                        }
-                }
+                    } finally {
-            }*/
+
+                    }
 
                     //Crop
                     op_bg.setImageBitmap(bitmap);
@@ -169,6 +176,12 @@ public class op_view extends Fragment {
 
         db.close();
 
+        int showed_toast = Integer.parseInt(root.getPreferences(MODE_PRIVATE).getString(PREF_A, "0"));
+        if (showed_toast < 5) {
+            Toast.makeText(root, "Scroll down to see more!", Toast.LENGTH_LONG).show();
+            root.getPreferences(MODE_PRIVATE).edit().putString(PREF_A, String.valueOf(++showed_toast)).apply();
+        }
+
         return v;
     }
 

R6S/app/src/main/java/io/nicco/r6s/ops_view.java

@@ -1,7 +1,9 @@
 package io.nicco.r6s;
 
 
+import android.app.Activity;
 import android.app.Fragment;
+import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
@@ -19,10 +21,14 @@ public class ops_view extends Fragment {
     public ops_view() {
     }
 
+    private Activity root;
+
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
+        root = getActivity();
+
         View v = inflater.inflate(R.layout.fragment_ops_view, container, false);
         RecyclerView op_a_list = (RecyclerView) v.findViewById(R.id.ops_list_a);
         RecyclerView op_d_list = (RecyclerView) v.findViewById(R.id.ops_list_d);
@@ -54,10 +60,10 @@ public class ops_view extends Fragment {
         }
         db.close();
 
-        op_a_list.setAdapter(new OpsListAdapter(data_a));
+        op_a_list.setAdapter(new OpsListAdapter(data_a, root));
-        op_a_list.setLayoutManager(new LinearLayoutManager(home.root()));
+        op_a_list.setLayoutManager(new LinearLayoutManager(root));
-        op_d_list.setAdapter(new OpsListAdapter(data_d));
+        op_d_list.setAdapter(new OpsListAdapter(data_d, root));
-        op_d_list.setLayoutManager(new LinearLayoutManager(home.root()));
+        op_d_list.setLayoutManager(new LinearLayoutManager(root));
 
         return v;
     }

R6S/app/src/main/java/io/nicco/r6s/weapon_view.java

@@ -62,7 +62,7 @@ public class weapon_view extends Fragment {
 
         //Setting Images
         try {
-            InputStream ims = home.root().getAssets().open("Weapons/" + String.valueOf(id) + ".png");
+            InputStream ims = getActivity().getAssets().open("Weapons/" + String.valueOf(id) + ".png");
             ((ImageView) v.findViewById(R.id.weapon_image)).setImageDrawable(Drawable.createFromStream(ims, null));
         } catch (IOException e) {
             e.printStackTrace();

R6S/app/src/main/java/io/nicco/r6s/weapons_view.java

@@ -1,6 +1,7 @@
 package io.nicco.r6s;
 
 
+import android.app.Activity;
 import android.app.Fragment;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
@@ -19,8 +20,12 @@ public class weapons_view extends Fragment {
     public weapons_view() {
     }
 
+    private Activity root;
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        root = getActivity();
+
         View v = inflater.inflate(R.layout.fragment_weapons_view, container, false);
         RecyclerView weapon_list = (RecyclerView) v.findViewById(R.id.weapons_list);
         List<WeaponListItem> data = new ArrayList<>();
@@ -40,8 +45,8 @@ public class weapons_view extends Fragment {
         }
         db.close();
 
-        weapon_list.setAdapter(new WeaponsListAdapter(data));
+        weapon_list.setAdapter(new WeaponsListAdapter(data, root));
-        weapon_list.setLayoutManager(new LinearLayoutManager(home.root()));
+        weapon_list.setLayoutManager(new LinearLayoutManager(root));
 
         return v;
     }

R6S/app/src/main/res/layout/fragment_maps_view.xml

@@ -5,15 +5,14 @@
     android:orientation="vertical"
     tools:context="io.nicco.r6s.maps_view">
 
-    <ImageView
+    <io.nicco.r6s.TouchImageView
         android:id="@+id/maps_img"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
         android:background="@color/r6s_bg"
         android:contentDescription="@string/maps_img_type"
         android:scaleType="centerCrop"
-        android:layout_weight="1" />
+        android:layout_weight="1"
-
+        android:layout_height="0dp" />
 
     <LinearLayout
         android:id="@+id/maps_menu_low"

R6S/app/src/main/res/layout/fragment_op_view.xml

@@ -1,205 +1,213 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:context="io.nicco.r6s.op_view">
 
-    <RelativeLayout
+    <ImageView
+        android:id="@+id/op_bg"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
+        android:layout_height="match_parent"
-        android:layout_weight="1"
+        android:adjustViewBounds="false"
-        android:id="@+id/img_cont">
+        android:foregroundGravity="top"
+        android:scaleType="centerCrop" />
 
-        <ImageView
+    <ScrollView
-            android:layout_width="match_parent"
+        android:layout_width="match_parent"
-            android:layout_height="match_parent"
+        android:layout_height="match_parent">
-            android:id="@+id/op_bg"
-            android:scaleType="centerCrop"
-            android:adjustViewBounds="false"
-            android:foregroundGravity="top" />
 
-        <FrameLayout
+        <LinearLayout
-            android:id="@+id/op_view_bg"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <View android:id="@+id/op_view_spacer"
+                android:layout_width="match_parent"
+                android:layout_height="300dp" />
+
+            <FrameLayout
+                android:id="@+id/op_view_bg"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="32dp">
+
+                <TextView
+                    android:id="@+id/op_faction"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="right|center"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    android:textColor="#ffffff" />
+
+                <TextView
+                    android:id="@+id/op_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="left|center"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    android:textColor="#ffffff" />
+
+                <ImageView
+                    android:id="@+id/op_img"
+                    android:layout_width="match_parent"
+                    android:layout_gravity="center"
+                    android:contentDescription="@string/op_image"
+                    android:scaleType="fitCenter"
+                    android:layout_height="80dp" />
+            </FrameLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:baselineAligned="false"
+                android:orientation="horizontal"
+                android:padding="16dp"
+                android:background="@android:color/background_light">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="vertical"
+                    android:padding="16dp">
+
+                    <TextView
+                        android:id="@+id/op_armor"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textAlignment="center"
+                        android:textAppearance="@android:style/TextAppearance.Material.Large" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/op_armor"
+                        android:textAlignment="center"
+                        android:textAppearance="?android:attr/textAppearanceSmall" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="vertical"
+                    android:padding="16dp">
+
+                    <TextView
+                        android:id="@+id/op_type"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textAlignment="center"
+                        android:textAppearance="@android:style/TextAppearance.Material.Large"
+                        android:textSize="18sp" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/op_type"
+                        android:textAlignment="center"
+                        android:textAppearance="?android:attr/textAppearanceSmall" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="vertical"
+                    android:padding="16dp">
+
+                    <TextView
+                        android:id="@+id/op_speed"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textAlignment="center"
+                        android:textAppearance="@android:style/TextAppearance.Material.Large" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/op_speed"
+                        android:textAlignment="center"
+                        android:textAppearance="?android:attr/textAppearanceSmall" />
+                </LinearLayout>
+
+            </LinearLayout>
 
             <TextView
-                android:id="@+id/op_faction"
+                android:id="@+id/op_ability"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="16dp"
+                android:textAlignment="center"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:background="@android:color/background_light" />
+
+            <View
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="1dp"
-                android:layout_gravity="right|bottom"
+                android:background="@android:color/background_light"></View>
-                android:padding="32dp"
-                android:textAlignment="textEnd"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:textColor="#ffffff" />
 
-            <TextView
+            <LinearLayout
-                android:id="@+id/op_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left|bottom"
-                android:padding="32dp"
-                android:textAlignment="textStart"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:textColor="#ffffff" />
-
-            <ImageView
-                android:id="@+id/op_img"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                android:layout_weight="1"
-                android:contentDescription="@string/op_image"
-                android:padding="32dp"
-                android:scaleType="fitCenter" />
-        </FrameLayout>
-    </RelativeLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:baselineAligned="false"
-        android:orientation="horizontal"
-        android:padding="32dp">
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:orientation="vertical"
-            android:padding="16dp">
-
-            <TextView
-                android:id="@+id/op_armor"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textAlignment="center"
+                android:orientation="vertical"
-                android:textAppearance="@android:style/TextAppearance.Material.Large" />
+                android:padding="16dp"
+                android:background="@android:color/background_light">
 
-            <TextView
+                <LinearLayout
+                    android:id="@+id/op_p_w"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"></LinearLayout>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="0dp"
+                    android:text="@string/op_primary"
+                    android:textAlignment="center"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
+
+                <LinearLayout
+                    android:id="@+id/op_s_w"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="0dp"
+                    android:text="@string/op_secondary"
+                    android:textAlignment="center"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
+            </LinearLayout>
+
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/op_armor"
+                android:baselineAligned="false"
-                android:textAlignment="center"
+                android:orientation="vertical"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
+                android:padding="16dp"
+                android:background="@android:color/background_light">
+
+                <LinearLayout
+                    android:id="@+id/op_g"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/op_gadget"
+                    android:textAlignment="center"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
+            </LinearLayout>
+
         </LinearLayout>
 
-        <LinearLayout
+    </ScrollView>
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:orientation="vertical"
-            android:padding="16dp">
 
-            <TextView
+</RelativeLayout>
-                android:id="@+id/op_type"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textAlignment="center"
-                android:textAppearance="@android:style/TextAppearance.Material.Large"
-                android:textSize="18sp" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/op_type"
-                android:textAlignment="center"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:orientation="vertical"
-            android:padding="16dp">
-
-            <TextView
-                android:id="@+id/op_speed"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textAlignment="center"
-                android:textAppearance="@android:style/TextAppearance.Material.Large" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/op_speed"
-                android:textAlignment="center"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/op_ability"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:textAlignment="center"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <View
-        android:layout_width="wrap_content"
-        android:layout_height="1dp"
-        android:background="@drawable/line_gradient"></View>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="16dp">
-
-        <LinearLayout
-            android:id="@+id/op_p_w"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"></LinearLayout>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="0dp"
-            android:text="@string/op_primary"
-            android:textAlignment="center"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
-
-        <LinearLayout
-            android:id="@+id/op_s_w"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="0dp"
-            android:text="@string/op_secondary"
-            android:textAlignment="center"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:baselineAligned="false"
-        android:orientation="vertical"
-        android:padding="16dp">
-
-        <LinearLayout
-            android:id="@+id/op_g"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/op_gadget"
-            android:textAlignment="center"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
-    </LinearLayout>
-
-</LinearLayout>

R6S/app/src/main/res/layout/fragment_ops_view.xml

@@ -11,9 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="#ffffffff"
-        android:layout_marginLeft="8dp"
+        android:layout_marginLeft="@dimen/default_spacing"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="@dimen/default_spacing"
-        android:layout_marginRight="8dp">
+        android:layout_marginRight="@dimen/default_spacing">
 
         <TextView
             android:layout_width="0dp"
@@ -45,9 +45,9 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:layout_marginRight="1dp"
-            android:layout_marginLeft="8dp"
+            android:layout_marginLeft="@dimen/default_spacing"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="@dimen/default_spacing"
-            android:layout_marginBottom="8dp" />
+            android:layout_marginBottom="@dimen/default_spacing" />
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/ops_list_d"
@@ -55,9 +55,9 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:layout_marginLeft="1dp"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="@dimen/default_spacing"
-            android:layout_marginRight="8dp"
+            android:layout_marginRight="@dimen/default_spacing"
-            android:layout_marginBottom="8dp" />
+            android:layout_marginBottom="@dimen/default_spacing" />
     </LinearLayout>
 
 </LinearLayout>

R6S/app/src/main/res/values/dimens.xml

@@ -5,4 +5,6 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
+
+    <dimen name="default_spacing">8dp</dimen>
 </resources>

R6S/app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">R6S</string>
+    <string name="app_name" translatable="false">R6S</string>
 
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>

R6S/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.2.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files