V1.2

R6S/.idea/gradle.xml

@@ -12,12 +12,7 @@
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="myModules">
+        <option name="resolveModulePerSourceSet" value="false" />
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
       </GradleProjectSettings>
     </option>
   </component>

R6S/app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "io.nicco.r6s"
         minSdkVersion 19
         targetSdkVersion 23
-        versionCode 2
+        versionCode 3
-        versionName "1.1"
+        versionName "1.2"
     }
     buildTypes {
         release {

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

@@ -3,7 +3,9 @@ package io.nicco.r6s;
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.FragmentManager;
+import android.content.Intent;
 import android.database.sqlite.SQLiteDatabase;
+import android.net.Uri;
 import android.os.Bundle;
 import android.support.design.widget.NavigationView;
 import android.support.v4.view.GravityCompat;
@@ -13,8 +15,6 @@ import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
-import android.widget.TextView;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -53,30 +53,6 @@ public class home extends AppCompatActivity
         ChangeFragment(new ops_view());
         setTitle("Operators");
 
-        ((TextView) findViewById(R.id.home_op)).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                ChangeFragment(new ops_view());
-                setTitle("Operators");
-            }
-        });
-
-        ((TextView) findViewById(R.id.home_weapons)).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                ChangeFragment(new weapons_view());
-                setTitle("Operators");
-            }
-        });
-
-        ((TextView) findViewById(R.id.home_rand)).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                ChangeFragment(new random_view());
-                setTitle("Operators");
-            }
-        });
-
         // Save DB from assets to storage
         DB_PATH = getFilesDir().getAbsolutePath() + "/databases/";
         DB_NAME = "R6S.sqlite";
@@ -87,7 +63,7 @@ public class home extends AppCompatActivity
         try {
             File file = new File(DB_PATH + DB_NAME);
             if (file.exists())
-                return;
+                file.delete();
             new File(DB_PATH).mkdirs();
             myInput = getAssets().open(DB_NAME);
             myOutput = new FileOutputStream(DB_PATH + DB_NAME);
@@ -107,7 +83,7 @@ public class home extends AppCompatActivity
         if (drawer.isDrawerOpen(GravityCompat.START)) {
             drawer.closeDrawer(GravityCompat.START);
         } else {
-            if (getFragmentManager().getBackStackEntryCount() == 0) {
+            if (getFragmentManager().getBackStackEntryCount() == 1) {
                 this.finish();
             } else {
                 getFragmentManager().popBackStack();
@@ -124,7 +100,9 @@ public class home extends AppCompatActivity
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
-        if (id == R.id.action_settings) {
+        if (id == R.id.menu_btn_git) {
+            Intent open_git = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/CupCakeArmy/Android"));
+            startActivity(open_git);
             return true;
         }
         return super.onOptionsItemSelected(item);

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

@@ -4,12 +4,17 @@ package io.nicco.r6s;
 import android.app.Fragment;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
@@ -27,7 +32,8 @@ public class weapon_view extends Fragment {
         //Get Gun Info
         Bundle b = this.getArguments();
         SQLiteDatabase db = home.mkdb();
-        Cursor c = db.rawQuery("SELECT * FROM weapons WHERE id=" + b.getInt("id"), null);
+        int id = b.getInt("id");
+        Cursor c = db.rawQuery("SELECT * FROM weapons WHERE id=" + id, null);
         c.moveToFirst();
 
         // Map Of Text Views
@@ -55,6 +61,15 @@ public class weapon_view extends Fragment {
                 Arrays.toString(c.getString(c.getColumnIndex("op")).split(","))
         );
 
+        //Setting Images
+        try {
+            Log.i("ID: ", String.valueOf(id));
+            InputStream ims = home.root().getAssets().open("Weapons/" + String.valueOf(id) + ".png");
+            ((ImageView) v.findViewById(R.id.weapon_image)).setImageDrawable(Drawable.createFromStream(ims, null));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
         db.close();
 
         return v;

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

@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:background="@drawable/bg_w_b">
+        android:background="@drawable/bg_w">
 
         <TextView
             android:id="@+id/op_faction"
@@ -45,81 +45,75 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:baselineAligned="false"
+        android:orientation="horizontal"
+        android:padding="32dp">
 
         <LinearLayout
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
-            android:baselineAligned="false"
+            android:layout_weight="1"
-            android:orientation="horizontal"
+            android:orientation="vertical"
-            android:padding="32dp">
+            android:padding="16dp">
 
-            <LinearLayout
+            <TextView
-                android:layout_width="0dp"
+                android:id="@+id/op_armor"
-                android:layout_height="match_parent"
+                android:layout_width="match_parent"
-                android:layout_weight="1"
+                android:layout_height="wrap_content"
-                android:orientation="vertical"
+                android:textAppearance="@android:style/TextAppearance.Material.Large"
-                android:padding="16dp">
+                android:textAlignment="center" />
 
-                <TextView
+            <TextView
-                    android:id="@+id/op_armor"
+                android:layout_width="match_parent"
-                    android:layout_width="match_parent"
+                android:layout_height="wrap_content"
-                    android:layout_height="wrap_content"
+                android:text="@string/op_armor"
-                    android:textAlignment="center"
+                android:textAlignment="center"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+        </LinearLayout>
 
-                <TextView
+        <LinearLayout
-                    android:layout_width="match_parent"
+            android:layout_height="match_parent"
-                    android:layout_height="wrap_content"
+            android:orientation="vertical"
-                    android:text="@string/op_armor"
+            android:padding="16dp"
-                    android:textAlignment="center"
+            android:layout_width="0dp"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
+            android:layout_weight="1">
-            </LinearLayout>
 
-            <LinearLayout
+            <TextView
-                android:layout_width="0dp"
+                android:id="@+id/op_type"
-                android:layout_height="match_parent"
+                android:layout_width="match_parent"
-                android:layout_weight="1"
+                android:layout_height="wrap_content"
-                android:orientation="vertical"
+                android:textAppearance="@android:style/TextAppearance.Material.Large"
-                android:padding="16dp">
+                android:textAlignment="center"
+                android:textSize="18sp" />
 
-                <TextView
+            <TextView
-                    android:id="@+id/op_type"
+                android:layout_width="match_parent"
-                    android:layout_width="match_parent"
+                android:layout_height="wrap_content"
-                    android:layout_height="wrap_content"
+                android:text="@string/op_type"
-                    android:textAlignment="center"
+                android:textAlignment="center"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+        </LinearLayout>
 
-                <TextView
+        <LinearLayout
-                    android:layout_width="match_parent"
+            android:layout_width="0dp"
-                    android:layout_height="wrap_content"
+            android:layout_height="match_parent"
-                    android:text="@string/op_type"
+            android:layout_weight="1"
-                    android:textAlignment="center"
+            android:orientation="vertical"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
+            android:padding="16dp">
-            </LinearLayout>
 
-            <LinearLayout
+            <TextView
-                android:layout_width="0dp"
+                android:id="@+id/op_speed"
-                android:layout_height="match_parent"
+                android:layout_width="match_parent"
-                android:layout_weight="1"
+                android:layout_height="wrap_content"
-                android:orientation="vertical"
+                android:textAppearance="@android:style/TextAppearance.Material.Large"
-                android:padding="16dp">
+                android:textAlignment="center" />
-
-                <TextView
-                    android:id="@+id/op_speed"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textAlignment="center"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                <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>
 
+            <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>

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

@@ -10,9 +10,16 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:background="@drawable/bg_w"
+        android:background="@drawable/bg_w_c"
         android:gravity="bottom">
 
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:id="@+id/weapon_image"
+            android:padding="32dp" />
+
         <LinearLayout
             android:orientation="horizontal"
             android:layout_width="match_parent"
@@ -62,7 +69,7 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textAppearance="@android:style/TextAppearance.Material.Large"
                     android:id="@+id/weapon_dmg_n"
                     android:textAlignment="center" />
 
@@ -98,7 +105,7 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textAppearance="@android:style/TextAppearance.Material.Large"
                     android:id="@+id/weapon_dmg_s"
                     android:textAlignment="center" />
 
@@ -129,7 +136,7 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textAppearance="@android:style/TextAppearance.Material.Large"
                     android:id="@+id/weapon_rpm"
                     android:textAlignment="center" />
 
@@ -151,7 +158,7 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textAppearance="@android:style/TextAppearance.Material.Large"
                     android:id="@+id/weapon_mob"
                     android:textAlignment="center" />
 
@@ -173,7 +180,7 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textAppearance="@android:style/TextAppearance.Material.Large"
                     android:id="@+id/weapon_mag"
                     android:textAlignment="center" />
 

R6S/app/src/main/res/menu/home.xml

@@ -2,8 +2,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:id="@+id/action_settings"
+        android:id="@+id/menu_btn_git"
         android:orderInCategory="100"
-        android:title="@string/action_settings"
+        app:showAsAction="never"
-        app:showAsAction="never" />
+        android:title="@string/menu_git" />
 </menu>

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

@@ -6,5 +6,5 @@
     <color name="main_bg">#222222</color>
     <color name="main_line">#EEEEEE</color>
     <color name="r6s_bg">#0c0c0c</color>
-    <color name="r6s_bg_light">#e5e5e5</color>
+    <color name="r6s_bg_light">#dce5e5e5</color>
 </resources>

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

@@ -30,4 +30,5 @@
     <string name="op_secondary">Secondary</string>
     <string name="rand_gen_attacker">Attacker</string>
     <string name="rand_gen_defender">Defender</string>
+    <string name="menu_git">Github</string>
 </resources>

R6S/build.gradle

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

README.md

@@ -0,0 +1,39 @@
+# Android Apps
+######There is an APK folder with the versions of the apps
+
+## R6S
+
+### Companion & guide app for Ubisofts Rainbow 6 Siege
+
+#### Features:
+
+- Operator Stats
+- Weapon Stats
+- Map Layout with multiple floors
+- Random Loadout generator
+
+#### Bugs & Incorrect/Outdated information:
+
+Please report these to `nicco.borgioli@gmail.com` or make an Issue on this git
+
+#### Versions:
+
+##### 1.0
+
+- First Pubblish
+
+##### 1.1
+
+- Fixed Problem with displaying operators icons
+
+##### 1.2
+
+- Updated Operator stats and gadgets after the patches
+- UI improvements
+- Github link for easy of access
+
+#### Future Development:
+
+##### Just ideas, no garantees! (Any help is welcome)
+
+- Comparing Weapons and/or Operators