Skip to content

Commit

Permalink
thumbnails in sidebar
Browse files Browse the repository at this point in the history
  • Loading branch information
hayksaakian committed Mar 9, 2015
1 parent db22975 commit 724ad51
Show file tree
Hide file tree
Showing 28 changed files with 1,150 additions and 554 deletions.
Binary file modified .gradle/2.2.1/taskArtifacts/cache.properties.lock
Binary file not shown.
Binary file modified .gradle/2.2.1/taskArtifacts/fileHashes.bin
Binary file not shown.
Binary file modified .gradle/2.2.1/taskArtifacts/fileSnapshots.bin
Binary file not shown.
Binary file modified .gradle/2.2.1/taskArtifacts/outputFileStates.bin
Binary file not shown.
Binary file modified .gradle/2.2.1/taskArtifacts/taskArtifacts.bin
Binary file not shown.
4 changes: 2 additions & 2 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version='1.0' encoding='utf-8'?>
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="560"
android:versionName="5.60"
android:versionCode="570"
android:versionName="5.70"
package="gg.destiny.app">

<uses-sdk
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ buildscript {
apply plugin: 'android'

repositories {
maven { url "https://raw.github.com/tommyd3mdi/mvn/master" }
mavenCentral()
}

dependencies {
// compile group: 'com.squareup.okhttp' , name: 'okhttp' , version: '2.0.0', changing: true
compile 'com.squareup.okhttp:okhttp:2.0.0-REPACKAGED-OKIO'
compile 'com.squareup.okio:okio:1.0.0-REPACKAGED'
compile 'com.squareup.okhttp:okhttp:+'
compile 'com.squareup.okio:okio:1.1.0'
compile 'com.squareup.picasso:picasso:2.5.0'
compile('com.github.nkzawa:socket.io-client:0.3.0'){
exclude group: 'org.json'
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ public final class BuildConfig {
public static final String APPLICATION_ID = "gg.destiny.app";
public static final String BUILD_TYPE = "debug";
public static final String FLAVOR = "";
public static final int VERSION_CODE = 550;
public static final int VERSION_CODE = 560;
public static final String VERSION_NAME = "";
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/**
* Automatically generated file. DO NOT MODIFY
*/
package gg.destiny.app.test;

public final class BuildConfig {
public static final boolean DEBUG = Boolean.parseBoolean("true");
public static final String APPLICATION_ID = "gg.destiny.app.test";
public static final String BUILD_TYPE = "debug";
public static final String FLAVOR = "";
public static final int VERSION_CODE = -1;
public static final String VERSION_NAME = "";
}
15 changes: 11 additions & 4 deletions build/generated/source/r/debug/gg/destiny/app/R.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,28 @@ public static final class drawable {
public static final int header=0x7f020006;
public static final int ic_drawer=0x7f020007;
public static final int icon=0x7f020008;
public static final int plus=0x7f020009;
public static final int onebyone=0x7f020009;
public static final int plus=0x7f02000a;
}
public static final class id {
public static final int action_quality_picker=0x7f09000f;
public static final int action_search=0x7f09000e;
public static final int action_settings=0x7f090010;
public static final int action_quality_picker=0x7f090014;
public static final int action_search=0x7f090013;
public static final int action_settings=0x7f090015;
public static final int back_button=0x7f090005;
public static final int chat_container=0x7f090000;
public static final int drawer_layout=0x7f090006;
public static final int everything_else=0x7f090007;
public static final int image=0x7f09000f;
public static final int input=0x7f090002;
public static final int navigation=0x7f090003;
public static final int navigation_drawer=0x7f09000d;
public static final int page_load_time=0x7f090004;
public static final int pager=0x7f090008;
public static final int pager_title_strip=0x7f090009;
public static final int rustlers=0x7f090010;
public static final int subtitle=0x7f090012;
public static final int thumbnail=0x7f09000e;
public static final int title=0x7f090011;
public static final int video=0x7f09000b;
public static final int video_loading=0x7f09000c;
public static final int webview=0x7f090001;
Expand All @@ -51,6 +57,7 @@ public static final class layout {
public static final int fragment_screen_slide_page=0x7f030001;
public static final int main=0x7f030002;
public static final int simple_spinner_item=0x7f030003;
public static final int thumbnail=0x7f030004;
}
public static final class menu {
public static final int actionbar=0x7f080000;
Expand Down
Binary file modified build/intermediates/model_data.bin
Binary file not shown.
7 changes: 5 additions & 2 deletions overrustle-app.iml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
Expand All @@ -21,6 +22,7 @@
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
Expand Down Expand Up @@ -80,9 +82,10 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="android-support-v4" level="project" />
<orderEntry type="library" exported="" name="Java-WebSocket-1.3.0" level="project" />
<orderEntry type="library" exported="" name="okio-1.0.0-REPACKAGED" level="project" />
<orderEntry type="library" exported="" name="socket.io-client-0.3.0" level="project" />
<orderEntry type="library" exported="" name="okhttp-2.0.0-REPACKAGED-OKIO" level="project" />
<orderEntry type="library" exported="" name="picasso-2.5.0" level="project" />
<orderEntry type="library" exported="" name="okio-1.2.0" level="project" />
<orderEntry type="library" exported="" name="okhttp-2.2.0" level="project" />
<orderEntry type="library" exported="" name="engine.io-client-0.3.1" level="project" />
</component>
</module>
Expand Down
Binary file added res/drawable/onebyone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
68 changes: 68 additions & 0 deletions res/layout/thumbnail.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/thumbnail"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:background="?android:attr/activatedBackgroundIndicator"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:gravity="center_vertical|left"
>

<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="5dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:gravity="center_vertical"
android:maxWidth="48dp">
<ImageView android:id="@+id/image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>

<TextView
android:layout_alignRight="@+id/image"
android:id="@+id/rustlers"
android:layout_margin="2dp"
android:paddingLeft="3dp"
android:paddingRight="3dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#efefefef"
android:text="100" />

</RelativeLayout>
<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center_vertical"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
>

<TextView android:id="@+id/title"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

android:text="Destiny" />

<TextView android:id="@+id/subtitle"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceSearchResultSubtitle"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
Loading

0 comments on commit 724ad51

Please sign in to comment.