Skip to content

A
AloqaIM-Android
Commit ac4c28bd authored by Tiago Cunha's avatar Tiago Cunha Committed by GitHub
Browse files
Options

Merge branch 'develop' into fix_login_screen_now_shown

parents 666bc18e f9935267
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 10 deletions
app/src/main/java/chat/rocket/android/fragment/chatroom/RoomFragment.java
View file @ ac4c28bd
......@@ -271,11 +271,11 @@ public class RoomFragment extends AbstractChatRoomFragment
String type = roomSubscription.getType();
if (RoomSubscription.TYPE_CHANNEL.equals(type)) {
activityToolbar.setNavigationIcon(R.drawable.ic_hashtag_white_24dp);
activityToolbar.setNavigationIcon(R.drawable.ic_hashtag_gray_24dp);
} else if (RoomSubscription.TYPE_PRIVATE.equals(type)) {
activityToolbar.setNavigationIcon(R.drawable.ic_lock_white_24dp);
activityToolbar.setNavigationIcon(R.drawable.ic_lock_gray_24dp);
} else if (RoomSubscription.TYPE_DIRECT_MESSAGE.equals(type)) {
activityToolbar.setNavigationIcon(R.drawable.ic_at_white_24dp);
activityToolbar.setNavigationIcon(R.drawable.ic_at_gray_24dp);
} else {
activityToolbar.setNavigationIcon(null);
}
......
app/src/main/res/drawable-hdpi/ic_hashtag_gray_24dp.xml 0 → 100644
View file @ ac4c28bd
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:viewportHeight="1792.0"
android:viewportWidth="1792.0"
android:width="24dp">
<path
android:fillColor="#30000000"
android:pathData="M991,1024l64,-256h-254l-64,256h254zM1759,520l-56,224q-7,24 -31,24h-327l-64,256h311q15,0 25,12 10,14 6,28l-56,224q-5,24 -31,24h-327l-81,328q-7,24 -31,24h-224q-16,0 -26,-12 -9,-12 -6,-28l78,-312h-254l-81,328q-7,24 -31,24h-225q-15,0 -25,-12 -9,-12 -6,-28l78,-312h-311q-15,0 -25,-12 -9,-12 -6,-28l56,-224q7,-24 31,-24h327l64,-256h-311q-15,0 -25,-12 -10,-14 -6,-28l56,-224q5,-24 31,-24h327l81,-328q7,-24 32,-24h224q15,0 25,12 9,12 6,28l-78,312h254l81,-328q7,-24 32,-24h224q15,0 25,12 9,12 6,28l-78,312h311q15,0 25,12 9,12 6,28z"/>
</vector>
app/src/main/res/drawable-hdpi/ic_lock_gray_24dp.xml 0 → 100644
View file @ ac4c28bd
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:viewportHeight="1792.0"
android:viewportWidth="1792.0"
android:width="24dp">
<path
android:fillColor="#30000000"
android:pathData="M640,768h512v-192q0,-106 -75,-181t-181,-75 -181,75 -75,181v192zM1472,864v576q0,40 -28,68t-68,28h-960q-40,0 -68,-28t-28,-68v-576q0,-40 28,-68t68,-28h32v-192q0,-184 132,-316t316,-132 316,132 132,316v192h32q40,0 68,28t28,68z"/>
</vector>
app/src/main/res/drawable/ic_at_gray_24dp.xml 0 → 100644
View file @ ac4c28bd
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:viewportHeight="1792.0"
android:viewportWidth="1792.0"
android:width="24dp">
<path
android:fillColor="#30000000"
android:pathData="M1100,775q0,-108 -53.5,-169t-147.5,-61q-63,0 -124,30.5t-110,84.5 -79.5,137 -30.5,180q0,112 53.5,173t150.5,61q96,0 176,-66.5t122.5,-166 42.5,-203.5zM1664,896q0,111 -37,197t-98.5,135 -131.5,74.5 -145,27.5q-6,0 -15.5,0.5t-16.5,0.5q-95,0 -142,-53 -28,-33 -33,-83 -52,66 -131.5,110t-173.5,44q-161,0 -249.5,-95.5t-88.5,-269.5q0,-157 66,-290t179,-210.5 246,-77.5q87,0 155,35.5t106,99.5l2,-19 11,-56q1,-6 5.5,-12t9.5,-6h118q5,0 13,11 5,5 3,16l-120,614q-5,24 -5,48 0,39 12.5,52t44.5,13q28,-1 57,-5.5t73,-24 77,-50 57,-89.5 24,-137q0,-292 -174,-466t-466,-174q-130,0 -248.5,51t-204,136.5 -136.5,204 -51,248.5 51,248.5 136.5,204 204,136.5 248.5,51q228,0 405,-144 11,-9 24,-8t21,12l41,49q8,12 7,24 -2,13 -12,22 -102,83 -227.5,128t-258.5,45q-156,0 -298,-61t-245,-164 -164,-245 -61,-298 61,-298 164,-245 245,-164 298,-61q344,0 556,212t212,556z"/>
</vector>
app/src/main/res/layout/activity_main.xml
View file @ ac4c28bd
......@@ -19,9 +19,15 @@
android:id="@+id/activity_main_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
android:background="@color/white"
android:titleTextColor="@color/titleTextColor"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
app:title="@string/app_name" />
<View android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_below="@+id/button_menu"
android:background="@color/borderColor"/>
</android.support.design.widget.AppBarLayout>
<FrameLayout
......@@ -32,4 +38,4 @@
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</android.support.design.widget.CoordinatorLayout>
</android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file
</android.support.v4.widget.SlidingPaneLayout>
app/src/main/res/layout/list_item_message_newday.xml
View file @ ac4c28bd
......@@ -20,7 +20,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:textColor="@color/newday_color"
android:textColor="@color/newday_text_color"
android:textSize="8sp"
android:textStyle="bold"
tools:text="2016/01/23" />
......
app/src/main/res/values/colors.xml
View file @ ac4c28bd
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#00426B</color>
<color name="colorPrimaryDark">#FF001E31</color>
<color name="colorPrimary">#044b76</color>
<color name="colorPrimaryDark">#FF04436a</color>
<color name="colorAccent">#FF2D91FA</color>
<color name="colorAccentLight">#FF6CB1FA</color>
<color name="colorAccentDark">#FF287DD7</color>
<color name="colorAccent_a40">#662D91FA</color>
<color name="textColorLink">#008ce3</color>
<color name="titleTextColor">#444444</color>
<color name="borderColor">#eaeaea</color>
<color name="white">#FFFEFEFF</color>
</resources>
app/src/main/res/values/message_styles.xml
View file @ ac4c28bd
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="newday_color">#FF7F7F7F</color>
<color name="newday_color">#e0e0e0</color>
<color name="newday_text_color">#444444</color>
</resources>
\ No newline at end of file
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

Technounit-GROUP 2023