Commit 48c08f41 authored by Yusuke Iwaki's avatar Yusuke Iwaki

separate rocket.chat.android.view.* into rocket-chat-android-widget project!

parent bc7938c0
...@@ -41,7 +41,7 @@ repositories { ...@@ -41,7 +41,7 @@ repositories {
} }
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile project(':rocket-chat-android-widgets')
compile 'com.android.support:appcompat-v7:25.0.0' compile 'com.android.support:appcompat-v7:25.0.0'
compile 'com.android.support:design:25.0.0' compile 'com.android.support:design:25.0.0'
compile 'jp.co.crowdworks:realm-java-helpers:0.0.7' compile 'jp.co.crowdworks:realm-java-helpers:0.0.7'
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
> >
<chat.rocket.android.view.FontAwesomeButton <chat.rocket.android.widget.FontAwesomeButton
android:id="@+id/btn_login_with_twitter" android:id="@+id/btn_login_with_twitter"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
android:layout_marginEnd="@dimen/margin_8" android:layout_marginEnd="@dimen/margin_8"
android:enabled="false" android:enabled="false"
/> />
<chat.rocket.android.view.FontAwesomeButton <chat.rocket.android.widget.FontAwesomeButton
android:id="@+id/btn_login_with_github" android:id="@+id/btn_login_with_github"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
> >
<chat.rocket.android.view.WaitingView <chat.rocket.android.widget.WaitingView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
/> />
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</FrameLayout> </FrameLayout>
<chat.rocket.android.view.FontAwesomeTextView <chat.rocket.android.widget.FontAwesomeTextView
android:id="@+id/img_user_action_toggle" android:id="@+id/img_user_action_toggle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
......
apply plugin: 'com.android.library'
buildscript {
repositories {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:+'
}
}
android {
compileSdkVersion 25
buildToolsVersion "25.0.0"
defaultConfig {
minSdkVersion 16
targetSdkVersion 25
versionCode 1
versionName "1"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}
dependencies {
testCompile 'junit:junit:4.12'
compile 'com.android.support:support-annotations:+'
compile 'com.android.support:appcompat-v7:25.0.0'
compile 'com.android.support:design:25.0.0'
}
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="chat.rocket.android.widget">
<application
android:label="@string/app_name">
</application>
</manifest>
package chat.rocket.android.view; package chat.rocket.android.widget;
import android.content.Context; import android.content.Context;
import android.graphics.Typeface; import android.graphics.Typeface;
......
package chat.rocket.android.view; package chat.rocket.android.widget;
import android.content.Context; import android.content.Context;
import android.graphics.Typeface; import android.graphics.Typeface;
......
package chat.rocket.android.view; package chat.rocket.android.widget;
import android.content.Context; import android.content.Context;
import android.util.AttributeSet; import android.util.AttributeSet;
......
package chat.rocket.android.view; package chat.rocket.android.widget;
import android.content.Context; import android.content.Context;
import android.util.AttributeSet; import android.util.AttributeSet;
......
package chat.rocket.android.view; package chat.rocket.android.widget;
import android.content.Context; import android.content.Context;
import android.util.AttributeSet; import android.util.AttributeSet;
......
package chat.rocket.android.view; package chat.rocket.android.widget;
import android.content.Context; import android.content.Context;
import android.graphics.Typeface; import android.graphics.Typeface;
...@@ -8,7 +8,7 @@ import java.util.Hashtable; ...@@ -8,7 +8,7 @@ import java.util.Hashtable;
/** /**
* Helper for reading typeface. ref:https://code.google.com/p/android/issues/detail?id=9904#c7 * Helper for reading typeface. ref:https://code.google.com/p/android/issues/detail?id=9904#c7
*/ */
public class TypefaceHelper { class TypefaceHelper {
private static final String TAG = TypefaceHelper.class.getName(); private static final String TAG = TypefaceHelper.class.getName();
private static final Hashtable<String, Typeface> CACHE = new Hashtable<String, Typeface>(); private static final Hashtable<String, Typeface> CACHE = new Hashtable<String, Typeface>();
......
package chat.rocket.android.view; package chat.rocket.android.widget;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.os.Build; import android.os.Build;
import android.support.v7.widget.LinearLayoutCompat;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.Gravity; import android.view.Gravity;
import android.view.View; import android.view.View;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import chat.rocket.android.R;
import java.util.ArrayList; import java.util.ArrayList;
/** /**
...@@ -72,7 +70,7 @@ public class WaitingView extends LinearLayout { ...@@ -72,7 +70,7 @@ public class WaitingView extends LinearLayout {
private void addDot(Context context, int size) { private void addDot(Context context, int size) {
FrameLayout frameLayout = new FrameLayout(context); FrameLayout frameLayout = new FrameLayout(context);
frameLayout.setLayoutParams(new LinearLayoutCompat.LayoutParams(size * 3 / 2, size * 3 / 2)); frameLayout.setLayoutParams(new LinearLayout.LayoutParams(size * 3 / 2, size * 3 / 2));
ImageView dot = new ImageView(context); ImageView dot = new ImageView(context);
dot.setImageResource(R.drawable.white_circle); dot.setImageResource(R.drawable.white_circle);
dot.setLayoutParams(new FrameLayout.LayoutParams(size, size, Gravity.CENTER)); dot.setLayoutParams(new FrameLayout.LayoutParams(size, size, Gravity.CENTER));
...@@ -96,16 +94,20 @@ public class WaitingView extends LinearLayout { ...@@ -96,16 +94,20 @@ public class WaitingView extends LinearLayout {
.scaleY(1) .scaleY(1)
.setDuration(duration) .setDuration(duration)
.setStartDelay(startDelay) .setStartDelay(startDelay)
.withEndAction(() -> { .withEndAction(new Runnable() {
dot.animate() @Override public void run() {
.scaleX(0) dot.animate()
.scaleY(0) .scaleX(0)
.setDuration(duration) .scaleY(0)
.setStartDelay(0) .setDuration(duration)
.withEndAction(() -> { .setStartDelay(0)
animateDot(dot, interval, duration, interval); .withEndAction(new Runnable() {
}) @Override public void run() {
.start(); animateDot(dot, interval, duration, interval);
}
})
.start();
}
}) })
.start(); .start();
} }
......
<resources>
<string name="app_name">rocket-chat-android-widgets</string>
</resources>
include ':app' include ':app', ':rocket-chat-android-widgets'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment