V1.2

2026-05-21 17:15:25 +00:00 · 2016-09-30 09:44:14 +02:00
parent 13bbd70f9b
commit f9ea7fe2c8
44 changed files with 102 additions and 158 deletions
@@ -1,28 +1,37 @@
 apply plugin: 'com.android.application'

 android {
-    compileSdkVersion 23
+    signingConfigs {
+        release {
+            storeFile file('/Users/Nicco/Google Drive/App Files/AndroidStudioProjects/keys/R6S.jks')
+            storePassword "Ek09iG2aB_XMlMe3kQ4mynrnPLi!PXkC"
+            keyAlias "r6s"
+            keyPassword "Ek09iG2aB_XMlMe3kQ4mynrnPLi!PXkC"
+        }
+    }
+    compileSdkVersion 24
    buildToolsVersion "24.0.1"
-
    defaultConfig {
        applicationId "io.nicco.r6s"
        minSdkVersion 19
-        targetSdkVersion 23
-        versionCode 3
-        versionName "1.2"
+        targetSdkVersion 24
+        versionCode 8
+        versionName '1.2'
    }
    buildTypes {
        release {
-            minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
        }
    }
+    productFlavors {
+    }
 }

 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile fileTree(include: ['*.jar'], dir: 'libs')
    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'com.android.support:design:23.4.0'
-    compile 'com.android.support:support-v4:23.4.0'
+    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile 'com.android.support:design:24.2.1'
+    compile 'com.android.support:support-v4:24.2.1'
 }
@@ -41,9 +41,7 @@ public class op_view extends Fragment {
        tmp.setPadding(16, 16, 16, 16);
        tmp.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
        tmp.setBackgroundResource(R.drawable.weapon_selector);
-        if (Build.VERSION.SDK_INT < 23) {
-            tmp.setTextAppearance(home.root(), android.R.style.TextAppearance_Medium);
-        } else {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
            tmp.setTextAppearance(android.R.style.TextAppearance_DeviceDefault_Medium);
        }
        tmp.setTextColor(0xffffffff);
@@ -59,7 +57,8 @@ public class op_view extends Fragment {
        //Get Operator Info
        Bundle b = this.getArguments();
        SQLiteDatabase db = home.mkdb();
-        Cursor c = db.rawQuery("SELECT * FROM operators WHERE id=" + b.getInt("id"), null);
+        int id = b.getInt("id");
+        Cursor c = db.rawQuery("SELECT * FROM operators WHERE id=" + id, null);
        c.moveToFirst();

        // Map Of Text Views
@@ -117,6 +116,16 @@ public class op_view extends Fragment {
            e.printStackTrace();
        }

+        try {
+            Drawable d = Drawable.createFromStream(home.root().getAssets().open("OPs/" + String.valueOf(id) + ".jpg"), null);
+            ImageView op_bg = (ImageView) v.findViewById(R.id.op_bg);
+            //Matrix m = (Matrix) new Matrix.ScaleToFit("START");
+            //op_bg.setImageMatrix(m);
+            op_bg.setImageDrawable(d);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
        db.close();

        return v;
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M9,2L7.17,4H4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2H9zm3,15c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z" />
-</vector>
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M22,16V4c0,-1.1 -0.9,-2 -2,-2H8c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2zm-11,-4l2.03,2.71L16,11l4,5H8l3,-4zM2,6v14c0,1.1 0.9,2 2,2h14v-2H4V6H2z" />
-</vector>
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M22.7,19l-9.1,-9.1c0.9,-2.3 0.4,-5 -1.5,-6.9 -2,-2 -5,-2.4 -7.4,-1.3L9,6 6,9 1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1,0.4 1.4,0l2.3,-2.3c0.5,-0.4 0.5,-1.1 0.1,-1.4z" />
-</vector>
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z" />
-</vector>
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z" />
-</vector>
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6zm16,-4H8c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2zm-8,12.5v-9l6,4.5 -6,4.5z" />
-</vector>
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-
-    <solid android:color="#FF000000"></solid>
-
-</shape>
@@ -1,9 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <gradient
-        android:angle="135"
-        android:centerColor="#4CAF50"
-        android:endColor="#2E7D32"
-        android:startColor="#81C784"
-        android:type="linear" />
-</shape>
@@ -1,46 +1,60 @@
 <LinearLayout 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">

-    <FrameLayout
+    <RelativeLayout
        android:layout_width="match_parent"
        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:background="@drawable/bg_w">
+        android:layout_weight="1">
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/op_bg"
+            android:scaleType="centerCrop"
+            android:adjustViewBounds="true"
+            android:foregroundGravity="top" />
+
+        <FrameLayout
+            android:id="@+id/op_view_bg"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">

            <TextView
                android:id="@+id/op_faction"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
+                android:layout_gravity="right|bottom"
                android:padding="32dp"
                android:textAlignment="textEnd"
                android:textAppearance="?android:attr/textAppearanceLarge"
-            android:layout_gravity="right|bottom"
                android:textColor="#ffffff" />

            <TextView
                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:layout_gravity="left|bottom"
                android:textColor="#ffffff" />

            <ImageView
+                android:id="@+id/op_img"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
-            android:id="@+id/op_img"
+                android:layout_gravity="center"
                android:layout_weight="1"
-            android:scaleType="fitCenter"
                android:contentDescription="@string/op_image"
                android:padding="32dp"
-            android:layout_gravity="center" />
+                android:scaleType="fitCenter" />
        </FrameLayout>
+    </RelativeLayout>

    <LinearLayout
        android:layout_width="match_parent"
@@ -60,8 +74,8 @@
                android:id="@+id/op_armor"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:textAppearance="@android:style/TextAppearance.Material.Large"
-                android:textAlignment="center" />
+                android:textAlignment="center"
+                android:textAppearance="@android:style/TextAppearance.Material.Large" />

            <TextView
                android:layout_width="match_parent"
@@ -72,18 +86,18 @@
        </LinearLayout>

        <LinearLayout
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:padding="16dp"
            android:layout_width="0dp"
-            android:layout_weight="1">
+            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:textAppearance="@android:style/TextAppearance.Material.Large"
                android:textAlignment="center"
+                android:textAppearance="@android:style/TextAppearance.Material.Large"
                android:textSize="18sp" />

            <TextView
@@ -105,8 +119,8 @@
                android:id="@+id/op_speed"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:textAppearance="@android:style/TextAppearance.Material.Large"
-                android:textAlignment="center" />
+                android:textAlignment="center"
+                android:textAppearance="@android:style/TextAppearance.Material.Large" />

            <TextView
                android:layout_width="match_parent"
@@ -119,12 +133,12 @@
    </LinearLayout>

    <TextView
+        android:id="@+id/op_ability"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:id="@+id/op_ability"
        android:padding="16dp"
-        android:textAlignment="center" />
+        android:textAlignment="center"
+        android:textAppearance="?android:attr/textAppearanceMedium" />

    <View
        android:layout_width="wrap_content"
@@ -132,38 +146,38 @@
        android:background="@drawable/line_gradient"></View>

    <LinearLayout
-        android:orientation="vertical"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
+        android:orientation="vertical"
        android:padding="16dp">

        <LinearLayout
-            android:orientation="horizontal"
+            android:id="@+id/op_p_w"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:id="@+id/op_p_w"></LinearLayout>
+            android:orientation="horizontal"></LinearLayout>

        <TextView
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:padding="0dp"
            android:text="@string/op_primary"
            android:textAlignment="center"
-            android:padding="0dp" />
+            android:textAppearance="?android:attr/textAppearanceSmall" />

        <LinearLayout
-            android:orientation="horizontal"
+            android:id="@+id/op_s_w"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:id="@+id/op_s_w" />
+            android:orientation="horizontal" />

        <TextView
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:padding="0dp"
            android:text="@string/op_secondary"
            android:textAlignment="center"
-            android:padding="0dp" />
+            android:textAppearance="?android:attr/textAppearanceSmall" />
    </LinearLayout>

    <LinearLayout
@@ -174,17 +188,17 @@
        android:padding="16dp">

        <LinearLayout
-            android:orientation="horizontal"
+            android:id="@+id/op_g"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:id="@+id/op_g" />
+            android:orientation="horizontal" />

        <TextView
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
            android:text="@string/op_gadget"
-            android:textAlignment="center" />
+            android:textAlignment="center"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
    </LinearLayout>

 </LinearLayout>
@@ -4,7 +4,6 @@
    <color name="colorPrimaryDark">#303F9F</color>
    <color name="colorAccent">#FF4081</color>
    <color name="main_bg">#222222</color>
-    <color name="main_line">#EEEEEE</color>
    <color name="r6s_bg">#0c0c0c</color>
    <color name="r6s_bg_light">#dce5e5e5</color>
 </resources>
@@ -5,5 +5,4 @@
    <!-- Default screen margins, per the Android Design guidelines. -->
    <dimen name="activity_horizontal_margin">16dp</dimen>
    <dimen name="activity_vertical_margin">16dp</dimen>
-    <dimen name="fab_margin">16dp</dimen>
 </resources>
@@ -1,8 +1 @@
-<resources>
-    <item name="ic_menu_camera" type="drawable">@android:drawable/ic_menu_camera</item>
-    <item name="ic_menu_gallery" type="drawable">@android:drawable/ic_menu_gallery</item>
-    <item name="ic_menu_slideshow" type="drawable">@android:drawable/ic_menu_slideshow</item>
-    <item name="ic_menu_manage" type="drawable">@android:drawable/ic_menu_manage</item>
-    <item name="ic_menu_share" type="drawable">@android:drawable/ic_menu_share</item>
-    <item name="ic_menu_send" type="drawable">@android:drawable/ic_menu_send</item>
-</resources>
+<resources></resources>
@@ -4,13 +4,9 @@
    <string name="navigation_drawer_open">Open navigation drawer</string>
    <string name="navigation_drawer_close">Close navigation drawer</string>

-    <string name="action_settings">Settings</string>
-
-    <string name="hello_blank_fragment">Hello blank fragment</string>
    <string name="maps_btn_down">DOWN</string>
    <string name="maps_btn_up">UP</string>
    <string name="maps_img_type">MAP</string>
-    <string name="weapon_dmg">Damage</string>
    <string name="weapon_dmg_n">Normal</string>
    <string name="weapon_dmg_s">Silenced</string>
    <string name="weapon_mag">Magazine</string>
@@ -22,8 +18,6 @@
    <string name="op_armor">Armor</string>
    <string name="op_type">Type</string>
    <string name="op_speed">Speed</string>
-    <string name="op_ability">Ability</string>
-    <string name="op_weapons">Weapons</string>
    <string name="op_image">Operator Image</string>
    <string name="op_gadget">Gadget</string>
    <string name="op_primary">Primary</string>