Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
48c08f41
Commit
48c08f41
authored
Nov 07, 2016
by
Yusuke Iwaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
separate rocket.chat.android.view.* into rocket-chat-android-widget project!
parent
bc7938c0
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
76 additions
and
27 deletions
+76
-27
build.gradle
app/build.gradle
+1
-1
fragment_login.xml
app/src/main/res/layout/fragment_login.xml
+2
-2
fragment_wait_for_connection.xml
app/src/main/res/layout/fragment_wait_for_connection.xml
+1
-1
sidebar.xml
app/src/main/res/layout/sidebar.xml
+1
-1
build.gradle
rocket-chat-android-widgets/build.gradle
+35
-0
AndroidManifest.xml
rocket-chat-android-widgets/src/main/AndroidManifest.xml
+9
-0
fontawesome-webfont.ttf
...t-android-widgets/src/main/assets/fontawesome-webfont.ttf
+0
-0
fontello.ttf
rocket-chat-android-widgets/src/main/assets/fontello.ttf
+0
-0
AbstractCustomFontButton.java
.../chat/rocket/android/widget/AbstractCustomFontButton.java
+1
-1
AbstractCustomFontTextView.java
...hat/rocket/android/widget/AbstractCustomFontTextView.java
+1
-1
FontAwesomeButton.java
...in/java/chat/rocket/android/widget/FontAwesomeButton.java
+1
-1
FontAwesomeTextView.java
.../java/chat/rocket/android/widget/FontAwesomeTextView.java
+1
-1
FontelloTextView.java
...ain/java/chat/rocket/android/widget/FontelloTextView.java
+1
-1
TypefaceHelper.java
.../main/java/chat/rocket/android/widget/TypefaceHelper.java
+2
-2
WaitingView.java
...src/main/java/chat/rocket/android/widget/WaitingView.java
+16
-14
white_circle.xml
...at-android-widgets/src/main/res/drawable/white_circle.xml
+0
-0
strings.xml
rocket-chat-android-widgets/src/main/res/values/strings.xml
+3
-0
waiting_view_attrs.xml
...ndroid-widgets/src/main/res/values/waiting_view_attrs.xml
+0
-0
settings.gradle
settings.gradle
+1
-1
No files found.
app/build.gradle
View file @
48c08f41
...
...
@@ -41,7 +41,7 @@ repositories {
}
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:design:25.0.0'
compile
'jp.co.crowdworks:realm-java-helpers:0.0.7'
...
...
app/src/main/res/layout/fragment_login.xml
View file @
48c08f41
...
...
@@ -28,7 +28,7 @@
android:layout_height=
"wrap_content"
android:orientation=
"horizontal"
>
<chat.rocket.android.
view
.FontAwesomeButton
<chat.rocket.android.
widget
.FontAwesomeButton
android:id=
"@+id/btn_login_with_twitter"
android:layout_width=
"48dp"
android:layout_height=
"48dp"
...
...
@@ -37,7 +37,7 @@
android:layout_marginEnd=
"@dimen/margin_8"
android:enabled=
"false"
/>
<chat.rocket.android.
view
.FontAwesomeButton
<chat.rocket.android.
widget
.FontAwesomeButton
android:id=
"@+id/btn_login_with_github"
android:layout_width=
"48dp"
android:layout_height=
"48dp"
...
...
app/src/main/res/layout/fragment_wait_for_connection.xml
View file @
48c08f41
...
...
@@ -13,7 +13,7 @@
android:layout_gravity=
"center"
android:gravity=
"center"
>
<chat.rocket.android.
view
.WaitingView
<chat.rocket.android.
widget
.WaitingView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
/>
...
...
app/src/main/res/layout/sidebar.xml
View file @
48c08f41
...
...
@@ -58,7 +58,7 @@
</FrameLayout>
<chat.rocket.android.
view
.FontAwesomeTextView
<chat.rocket.android.
widget
.FontAwesomeTextView
android:id=
"@+id/img_user_action_toggle"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
rocket-chat-android-widgets/build.gradle
0 → 100644
View file @
48c08f41
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'
}
rocket-chat-android-widgets/src/main/AndroidManifest.xml
0 → 100644
View file @
48c08f41
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"chat.rocket.android.widget"
>
<application
android:label=
"@string/app_name"
>
</application>
</manifest>
app
/src/main/assets/fontawesome-webfont.ttf
→
rocket-chat-android-widgets
/src/main/assets/fontawesome-webfont.ttf
View file @
48c08f41
File moved
app
/src/main/assets/fontello.ttf
→
rocket-chat-android-widgets
/src/main/assets/fontello.ttf
View file @
48c08f41
File moved
app/src/main/java/chat/rocket/android/view
/AbstractCustomFontButton.java
→
rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget
/AbstractCustomFontButton.java
View file @
48c08f41
package
chat
.
rocket
.
android
.
view
;
package
chat
.
rocket
.
android
.
widget
;
import
android.content.Context
;
import
android.graphics.Typeface
;
...
...
app/src/main/java/chat/rocket/android/view
/AbstractCustomFontTextView.java
→
rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget
/AbstractCustomFontTextView.java
View file @
48c08f41
package
chat
.
rocket
.
android
.
view
;
package
chat
.
rocket
.
android
.
widget
;
import
android.content.Context
;
import
android.graphics.Typeface
;
...
...
app/src/main/java/chat/rocket/android/view
/FontAwesomeButton.java
→
rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget
/FontAwesomeButton.java
View file @
48c08f41
package
chat
.
rocket
.
android
.
view
;
package
chat
.
rocket
.
android
.
widget
;
import
android.content.Context
;
import
android.util.AttributeSet
;
...
...
app/src/main/java/chat/rocket/android/view
/FontAwesomeTextView.java
→
rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget
/FontAwesomeTextView.java
View file @
48c08f41
package
chat
.
rocket
.
android
.
view
;
package
chat
.
rocket
.
android
.
widget
;
import
android.content.Context
;
import
android.util.AttributeSet
;
...
...
app/src/main/java/chat/rocket/android/view
/FontelloTextView.java
→
rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget
/FontelloTextView.java
View file @
48c08f41
package
chat
.
rocket
.
android
.
view
;
package
chat
.
rocket
.
android
.
widget
;
import
android.content.Context
;
import
android.util.AttributeSet
;
...
...
app/src/main/java/chat/rocket/android/view
/TypefaceHelper.java
→
rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget
/TypefaceHelper.java
View file @
48c08f41
package
chat
.
rocket
.
android
.
view
;
package
chat
.
rocket
.
android
.
widget
;
import
android.content.Context
;
import
android.graphics.Typeface
;
...
...
@@ -8,7 +8,7 @@ import java.util.Hashtable;
/**
* 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
Hashtable
<
String
,
Typeface
>
CACHE
=
new
Hashtable
<
String
,
Typeface
>();
...
...
app/src/main/java/chat/rocket/android/view
/WaitingView.java
→
rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget
/WaitingView.java
View file @
48c08f41
package
chat
.
rocket
.
android
.
view
;
package
chat
.
rocket
.
android
.
widget
;
import
android.annotation.TargetApi
;
import
android.content.Context
;
import
android.content.res.TypedArray
;
import
android.os.Build
;
import
android.support.v7.widget.LinearLayoutCompat
;
import
android.util.AttributeSet
;
import
android.view.Gravity
;
import
android.view.View
;
import
android.widget.FrameLayout
;
import
android.widget.ImageView
;
import
android.widget.LinearLayout
;
import
chat.rocket.android.R
;
import
java.util.ArrayList
;
/**
...
...
@@ -72,7 +70,7 @@ public class WaitingView extends LinearLayout {
private
void
addDot
(
Context
context
,
int
size
)
{
FrameLayout
frameLayout
=
new
FrameLayout
(
context
);
frameLayout
.
setLayoutParams
(
new
LinearLayout
Compat
.
LayoutParams
(
size
*
3
/
2
,
size
*
3
/
2
));
frameLayout
.
setLayoutParams
(
new
LinearLayout
.
LayoutParams
(
size
*
3
/
2
,
size
*
3
/
2
));
ImageView
dot
=
new
ImageView
(
context
);
dot
.
setImageResource
(
R
.
drawable
.
white_circle
);
dot
.
setLayoutParams
(
new
FrameLayout
.
LayoutParams
(
size
,
size
,
Gravity
.
CENTER
));
...
...
@@ -96,16 +94,20 @@ public class WaitingView extends LinearLayout {
.
scaleY
(
1
)
.
setDuration
(
duration
)
.
setStartDelay
(
startDelay
)
.
withEndAction
(()
->
{
dot
.
animate
()
.
scaleX
(
0
)
.
scaleY
(
0
)
.
setDuration
(
duration
)
.
setStartDelay
(
0
)
.
withEndAction
(()
->
{
animateDot
(
dot
,
interval
,
duration
,
interval
);
})
.
start
();
.
withEndAction
(
new
Runnable
()
{
@Override
public
void
run
()
{
dot
.
animate
()
.
scaleX
(
0
)
.
scaleY
(
0
)
.
setDuration
(
duration
)
.
setStartDelay
(
0
)
.
withEndAction
(
new
Runnable
()
{
@Override
public
void
run
()
{
animateDot
(
dot
,
interval
,
duration
,
interval
);
}
})
.
start
();
}
})
.
start
();
}
...
...
app
/src/main/res/drawable/white_circle.xml
→
rocket-chat-android-widgets
/src/main/res/drawable/white_circle.xml
View file @
48c08f41
File moved
rocket-chat-android-widgets/src/main/res/values/strings.xml
0 → 100644
View file @
48c08f41
<resources>
<string
name=
"app_name"
>
rocket-chat-android-widgets
</string>
</resources>
app
/src/main/res/values/waiting_view_attrs.xml
→
rocket-chat-android-widgets
/src/main/res/values/waiting_view_attrs.xml
View file @
48c08f41
File moved
settings.gradle
View file @
48c08f41
include
':app'
include
':app'
,
':rocket-chat-android-widgets'
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment