diff --git a/APK/R6S/V1.0.apk b/APK/R6S/V1.0.apk new file mode 100644 index 0000000..4a5d4bd Binary files /dev/null and b/APK/R6S/V1.0.apk differ diff --git a/APK/R6S/V1.1.apk b/APK/R6S/V1.1.apk new file mode 100644 index 0000000..d08c20b Binary files /dev/null and b/APK/R6S/V1.1.apk differ diff --git a/APK/R6S/V1.2.apk b/APK/R6S/V1.2.apk new file mode 100644 index 0000000..41274ad Binary files /dev/null and b/APK/R6S/V1.2.apk differ diff --git a/R6S/.idea/gradle.xml b/R6S/.idea/gradle.xml index cd2ead8..0e23f8e 100644 --- a/R6S/.idea/gradle.xml +++ b/R6S/.idea/gradle.xml @@ -12,12 +12,7 @@ - + diff --git a/R6S/app/build.gradle b/R6S/app/build.gradle index 9d92793..b694563 100644 --- a/R6S/app/build.gradle +++ b/R6S/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "io.nicco.r6s" minSdkVersion 19 targetSdkVersion 23 - versionCode 2 - versionName "1.1" + versionCode 3 + versionName "1.2" } buildTypes { release { diff --git a/R6S/app/src/main/assets/R6S.sqlite b/R6S/app/src/main/assets/R6S.sqlite index eda35ee..c3084be 100644 Binary files a/R6S/app/src/main/assets/R6S.sqlite and b/R6S/app/src/main/assets/R6S.sqlite differ diff --git a/R6S/app/src/main/assets/Weapons/0.png b/R6S/app/src/main/assets/Weapons/0.png new file mode 100644 index 0000000..f3becc8 Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/0.png differ diff --git a/R6S/app/src/main/assets/Weapons/1.png b/R6S/app/src/main/assets/Weapons/1.png new file mode 100644 index 0000000..052d247 Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/1.png differ diff --git a/R6S/app/src/main/assets/Weapons/10.png b/R6S/app/src/main/assets/Weapons/10.png new file mode 100644 index 0000000..c4198be Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/10.png differ diff --git a/R6S/app/src/main/assets/Weapons/11.png b/R6S/app/src/main/assets/Weapons/11.png new file mode 100644 index 0000000..08a9dd1 Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/11.png differ diff --git a/R6S/app/src/main/assets/Weapons/12.png b/R6S/app/src/main/assets/Weapons/12.png new file mode 100644 index 0000000..317d266 Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/12.png differ diff --git a/R6S/app/src/main/assets/Weapons/13.png b/R6S/app/src/main/assets/Weapons/13.png new file mode 100644 index 0000000..6c90d2a Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/13.png differ diff --git a/R6S/app/src/main/assets/Weapons/14.png b/R6S/app/src/main/assets/Weapons/14.png new file mode 100644 index 0000000..6183f70 Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/14.png differ diff --git a/R6S/app/src/main/assets/Weapons/15.png b/R6S/app/src/main/assets/Weapons/15.png new file mode 100644 index 0000000..52dea37 Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/15.png differ diff --git a/R6S/app/src/main/assets/Weapons/16.png b/R6S/app/src/main/assets/Weapons/16.png new file mode 100644 index 0000000..9209ab9 Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/16.png differ diff --git a/R6S/app/src/main/assets/Weapons/17.png b/R6S/app/src/main/assets/Weapons/17.png new file mode 100644 index 0000000..bececfa Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/17.png differ diff --git a/R6S/app/src/main/assets/Weapons/18.png b/R6S/app/src/main/assets/Weapons/18.png new file mode 100644 index 0000000..bea0e55 Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/18.png differ diff --git a/R6S/app/src/main/assets/Weapons/19.png b/R6S/app/src/main/assets/Weapons/19.png new file mode 100644 index 0000000..3f65d59 Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/19.png differ diff --git a/R6S/app/src/main/assets/Weapons/2.png b/R6S/app/src/main/assets/Weapons/2.png new file mode 100644 index 0000000..867af3c Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/2.png differ diff --git a/R6S/app/src/main/assets/Weapons/20.png b/R6S/app/src/main/assets/Weapons/20.png new file mode 100644 index 0000000..a226bf3 Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/20.png differ diff --git a/R6S/app/src/main/assets/Weapons/21.png b/R6S/app/src/main/assets/Weapons/21.png new file mode 100644 index 0000000..45c7b5b Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/21.png differ diff --git a/R6S/app/src/main/assets/Weapons/22.png b/R6S/app/src/main/assets/Weapons/22.png new file mode 100644 index 0000000..336224b Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/22.png differ diff --git a/R6S/app/src/main/assets/Weapons/23.png b/R6S/app/src/main/assets/Weapons/23.png new file mode 100644 index 0000000..80cdeff Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/23.png differ diff --git a/R6S/app/src/main/assets/Weapons/24.png b/R6S/app/src/main/assets/Weapons/24.png new file mode 100644 index 0000000..b06d8cf Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/24.png differ diff --git a/R6S/app/src/main/assets/Weapons/25.png b/R6S/app/src/main/assets/Weapons/25.png new file mode 100644 index 0000000..d32306c Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/25.png differ diff --git a/R6S/app/src/main/assets/Weapons/26.png b/R6S/app/src/main/assets/Weapons/26.png new file mode 100644 index 0000000..bc9be44 Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/26.png differ diff --git a/R6S/app/src/main/assets/Weapons/27.png b/R6S/app/src/main/assets/Weapons/27.png new file mode 100644 index 0000000..3d08987 Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/27.png differ diff --git a/R6S/app/src/main/assets/Weapons/28.png b/R6S/app/src/main/assets/Weapons/28.png new file mode 100644 index 0000000..21ff4cc Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/28.png differ diff --git a/R6S/app/src/main/assets/Weapons/29.png b/R6S/app/src/main/assets/Weapons/29.png new file mode 100644 index 0000000..05fc2d8 Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/29.png differ diff --git a/R6S/app/src/main/assets/Weapons/3.png b/R6S/app/src/main/assets/Weapons/3.png new file mode 100644 index 0000000..f14642a Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/3.png differ diff --git a/R6S/app/src/main/assets/Weapons/30.png b/R6S/app/src/main/assets/Weapons/30.png new file mode 100644 index 0000000..9f3ec47 Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/30.png differ diff --git a/R6S/app/src/main/assets/Weapons/31.png b/R6S/app/src/main/assets/Weapons/31.png new file mode 100644 index 0000000..1f6a82b Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/31.png differ diff --git a/R6S/app/src/main/assets/Weapons/32.png b/R6S/app/src/main/assets/Weapons/32.png new file mode 100644 index 0000000..9f3ec47 Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/32.png differ diff --git a/R6S/app/src/main/assets/Weapons/33.png b/R6S/app/src/main/assets/Weapons/33.png new file mode 100644 index 0000000..0ef5017 Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/33.png differ diff --git a/R6S/app/src/main/assets/Weapons/34.png b/R6S/app/src/main/assets/Weapons/34.png new file mode 100644 index 0000000..76e307a Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/34.png differ diff --git a/R6S/app/src/main/assets/Weapons/4.png b/R6S/app/src/main/assets/Weapons/4.png new file mode 100644 index 0000000..2f8071e Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/4.png differ diff --git a/R6S/app/src/main/assets/Weapons/5.png b/R6S/app/src/main/assets/Weapons/5.png new file mode 100644 index 0000000..d05dfe4 Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/5.png differ diff --git a/R6S/app/src/main/assets/Weapons/6.png b/R6S/app/src/main/assets/Weapons/6.png new file mode 100644 index 0000000..506e8f8 Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/6.png differ diff --git a/R6S/app/src/main/assets/Weapons/7.png b/R6S/app/src/main/assets/Weapons/7.png new file mode 100644 index 0000000..ee6b815 Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/7.png differ diff --git a/R6S/app/src/main/assets/Weapons/8.png b/R6S/app/src/main/assets/Weapons/8.png new file mode 100644 index 0000000..e2b51c8 Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/8.png differ diff --git a/R6S/app/src/main/assets/Weapons/9.png b/R6S/app/src/main/assets/Weapons/9.png new file mode 100644 index 0000000..c1f689b Binary files /dev/null and b/R6S/app/src/main/assets/Weapons/9.png differ diff --git a/R6S/app/src/main/java/io/nicco/r6s/home.java b/R6S/app/src/main/java/io/nicco/r6s/home.java index 01f5f6c..958a582 100644 --- a/R6S/app/src/main/java/io/nicco/r6s/home.java +++ b/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); diff --git a/R6S/app/src/main/java/io/nicco/r6s/weapon_view.java b/R6S/app/src/main/java/io/nicco/r6s/weapon_view.java index 9edc382..3b1245b 100644 --- a/R6S/app/src/main/java/io/nicco/r6s/weapon_view.java +++ b/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; diff --git a/R6S/app/src/main/res/bg_w_c.jpg b/R6S/app/src/main/res/bg_w_c.jpg new file mode 100644 index 0000000..5b9af44 Binary files /dev/null and b/R6S/app/src/main/res/bg_w_c.jpg differ diff --git a/R6S/app/src/main/res/drawable-xxhdpi/bg_w_c.jpg b/R6S/app/src/main/res/drawable-xxhdpi/bg_w_c.jpg new file mode 100644 index 0000000..47a09da Binary files /dev/null and b/R6S/app/src/main/res/drawable-xxhdpi/bg_w_c.jpg differ diff --git a/R6S/app/src/main/res/layout/fragment_op_view.xml b/R6S/app/src/main/res/layout/fragment_op_view.xml index 5925559..6975858 100644 --- a/R6S/app/src/main/res/layout/fragment_op_view.xml +++ b/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"> + android:baselineAligned="false" + android:orientation="horizontal" + android:padding="32dp"> + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:orientation="vertical" + android:padding="16dp"> - + - + + - - + - + - + + - - + - - - - - - + + diff --git a/R6S/app/src/main/res/layout/fragment_weapon_view.xml b/R6S/app/src/main/res/layout/fragment_weapon_view.xml index c0e88c0..806fc87 100644 --- a/R6S/app/src/main/res/layout/fragment_weapon_view.xml +++ b/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"> + + @@ -98,7 +105,7 @@ @@ -129,7 +136,7 @@ @@ -151,7 +158,7 @@ @@ -173,7 +180,7 @@ diff --git a/R6S/app/src/main/res/menu/home.xml b/R6S/app/src/main/res/menu/home.xml index a2411e3..401dbf3 100644 --- a/R6S/app/src/main/res/menu/home.xml +++ b/R6S/app/src/main/res/menu/home.xml @@ -2,8 +2,8 @@ + app:showAsAction="never" + android:title="@string/menu_git" /> diff --git a/R6S/app/src/main/res/values/colors.xml b/R6S/app/src/main/res/values/colors.xml index 10eefba..221fc64 100644 --- a/R6S/app/src/main/res/values/colors.xml +++ b/R6S/app/src/main/res/values/colors.xml @@ -6,5 +6,5 @@ #222222 #EEEEEE #0c0c0c - #e5e5e5 + #dce5e5e5 diff --git a/R6S/app/src/main/res/values/strings.xml b/R6S/app/src/main/res/values/strings.xml index f976d72..cfd0197 100644 --- a/R6S/app/src/main/res/values/strings.xml +++ b/R6S/app/src/main/res/values/strings.xml @@ -30,4 +30,5 @@ Secondary Attacker Defender + Github diff --git a/R6S/build.gradle b/R6S/build.gradle index 77ce66e..a3330d4 100644 --- a/R6S/build.gradle +++ b/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 diff --git a/R6S/projectFilesBackup/.idea/workspace.xml b/R6S/projectFilesBackup/.idea/workspace.xml new file mode 100644 index 0000000..771bdbd --- /dev/null +++ b/R6S/projectFilesBackup/.idea/workspace.xml @@ -0,0 +1,2292 @@ + + + + + + + + + + + + + + @style/AppTheme.NoActionBar + + + + + @style/AppTheme + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1471889691961 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..d780835 --- /dev/null +++ b/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