Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change logo icon and color theme #289

Open
wants to merge 5 commits into
base: development
Choose a base branch
from
Open

change logo icon and color theme #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cdbe95e
[add] update logo res
chigichan24 May 7, 2019
a9caf5c
[fix] Fix color theme
chigichan24 May 7, 2019
9556fd0
[update] Update minSdkVersion from 19 to 21
chigichan24 May 7, 2019
f2d073f
[update] Update text color on beigue button
chigichan24 May 7, 2019
9728359
[update] Update tool bar logo
chigichan24 May 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def appVersionName = "${versionMajor}.${versionMinor}.${versionPatch}"

def appCompileSdkVersion = 28
def appPackageName = "com.cyder.android.syncpod"
def appMinSdkVersion = 19
def appMinSdkVersion = 21
def appTargetSdkVersion = 28

android {
Expand Down
Binary file modified app/src/main/ic_launcher-web.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 0 additions & 7 deletions app/src/main/kotlin/com/cyder/android/syncpod/BaseApplication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package com.cyder.android.syncpod

import android.app.Application
import android.content.Context
import androidx.multidex.MultiDex
import com.cyder.android.syncpod.di.AppComponent
import com.cyder.android.syncpod.di.AppModule
import com.cyder.android.syncpod.di.DaggerAppComponent
Expand All @@ -24,9 +22,4 @@ class BaseApplication : Application() {
component.inject(this)

}

override fun attachBaseContext(base: Context?) {
super.attachBaseContext(base)
MultiDex.install(this)
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

これ、なんで要らなくなったんだっけ。

}
Binary file modified app/src/main/res/drawable-hdpi/toolbar_logo.png
100755 → 100644
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-mdpi/toolbar_logo.png
100755 → 100644
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 10 additions & 32 deletions app/src/main/res/drawable-v24/ic_launcher_foreground.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportHeight="108"
android:viewportWidth="108">
<path
android:fillType="evenOdd"
android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
android:strokeColor="#00000000"
android:strokeWidth="1">
<aapt:attr name="android:fillColor">
<gradient
android:endX="78.5885"
android:endY="90.9159"
android:startX="48.7653"
android:startY="61.0927"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
android:strokeColor="#00000000"
android:strokeWidth="1" />
android:width="108dp"
android:height="108dp"
android:viewportWidth="158.86363"
android:viewportHeight="158.86363">
<group android:translateX="44.48182"
android:translateY="46.28682">
<path
android:pathData="M61.54,8.65c0.49,-0.49 1.14,-0.82 1.63,-1.31A11.58,11.58 0,0 1,66.11 6a0.93,0.93 0,0 0,0.65 -1.15,0.94 0.94,0 0,0 -0.65,-0.65 13.53,13.53 0,0 0,-9.8 -0.33A22.37,22.37 0,0 0,27.74 6.68a22.77,22.77 0,0 0,-6.69 16A10.35,10.35 0,0 1,17 31a10.55,10.55 0,0 1,-13.06 -0.33l-0.16,-0.16A2.33,2.33 0,0 0,0 32.32,35 35,0 1,0 61.54,8.65ZM16.16,53.54s6.53,-29.22 18,-18C45.38,46.85 16.16,53.54 16.16,53.54ZM49.3,14a2.57,2.57 0,0 1,-2 1,3.38 3.38,0 0,1 -2.12,-0.82 3.15,3.15 0,0 1,-0.82 -2.12v-0.49a0.62,0.62 0,0 1,0.16 -0.49c0,-0.16 0.16,-0.33 0.33,-0.49s0.16,-0.33 0.33,-0.49a3.06,3.06 0,0 1,4.24 0,3.15 3.15,0 0,1 0.82,2.12A2.57,2.57 0,0 1,49.3 14Z"
android:fillColor="#FFFFFF"/>
</group>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

あれ、これv24ついてないのと全く一緒だけどなんでいるんだっけ？

</vector>
Binary file modified app/src/main/res/drawable-xhdpi/toolbar_logo.png
100755 → 100644
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxhdpi/toolbar_logo.png
100755 → 100644
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxxhdpi/toolbar_logo.png
100755 → 100644
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
170 changes: 0 additions & 170 deletions app/src/main/res/drawable/ic_launcher_background.xml
View file
Open in desktop

This file was deleted.

12 changes: 12 additions & 0 deletions app/src/main/res/drawable/ic_launcher_foreground.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="158.86363"
android:viewportHeight="158.86363">
<group android:translateX="44.48182"
android:translateY="46.28682">
<path
android:pathData="M61.54,8.65c0.49,-0.49 1.14,-0.82 1.63,-1.31A11.58,11.58 0,0 1,66.11 6a0.93,0.93 0,0 0,0.65 -1.15,0.94 0.94,0 0,0 -0.65,-0.65 13.53,13.53 0,0 0,-9.8 -0.33A22.37,22.37 0,0 0,27.74 6.68a22.77,22.77 0,0 0,-6.69 16A10.35,10.35 0,0 1,17 31a10.55,10.55 0,0 1,-13.06 -0.33l-0.16,-0.16A2.33,2.33 0,0 0,0 32.32,35 35,0 1,0 61.54,8.65ZM16.16,53.54s6.53,-29.22 18,-18C45.38,46.85 16.16,53.54 16.16,53.54ZM49.3,14a2.57,2.57 0,0 1,-2 1,3.38 3.38,0 0,1 -2.12,-0.82 3.15,3.15 0,0 1,-0.82 -2.12v-0.49a0.62,0.62 0,0 1,0.16 -0.49c0,-0.16 0.16,-0.33 0.33,-0.49s0.16,-0.33 0.33,-0.49a3.06,3.06 0,0 1,4.24 0,3.15 3.15,0 0,1 0.82,2.12A2.57,2.57 0,0 1,49.3 14Z"
android:fillColor="#FFFFFF"/>
</group>
</vector>
4 changes: 2 additions & 2 deletions app/src/main/res/layout/activity_contact.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@
android:layout_height="55dp"
android:layout_marginBottom="20dp"
android:layout_marginTop="20dp"
android:background="@color/appGreen"
android:background="@color/appBeige"
android:onClick="@{(v) -> viewModel.onSubmit()}"
android:text="@string/send_button"
android:textColor="@color/appWhite"
android:textColor="@color/on_beige_text"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

これ、スネークとキャメルが混じってるのウケるな。
このタイミングで全部スネークにしちゃうのが良さそう？

android:textSize="18sp" />
</LinearLayout>
</ScrollView>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/activity_create_room.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@
android:layout_height="55dp"
android:layout_marginBottom="20dp"
android:layout_marginTop="20dp"
android:background="@color/appGreen"
android:background="@color/appBeige"
android:onClick="@{(v) -> viewModel.onSubmit()}"
android:text="@string/create_room_button"
android:textColor="@color/appWhite"
android:textColor="@color/on_beige_text"
android:textSize="18sp" />
</LinearLayout>
</ScrollView>
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/res/layout/activity_room.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,13 @@
android:layout_width="match_parent"
android:layout_height="45dp"
android:background="@color/roomTab"
android:elevation="2dp" />
android:elevation="2dp"
app:tabIndicatorColor="@color/appOrange" />

<com.cyder.android.syncpod.view.components.WithoutKeyEventViewPager
android:id="@+id/view_pager"
android:layout_height="match_parent"
android:layout_width="match_parent"/>
android:layout_width="match_parent" />

</LinearLayout>

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_search_video.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
android:background="?attr/colorPrimary"
android:elevation="4dp"
android:minHeight="?attr/actionBarSize"
android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
android:theme="@style/SearchVideoTheme"
app:navigationIcon="@drawable/ic_arrow_back_black_24dp"
app:navigationOnClick="@{(v) -> viewModel.onBackButtonClicked()}">

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_sign_in.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
android:layout_height="55dp"
android:layout_marginBottom="20dp"
android:layout_marginTop="20dp"
android:background="@color/appBlue"
android:background="@color/colorPrimary"
android:onClick="@{(v) -> viewModel.onSignIn()}"
android:text="@string/send_button"
android:textColor="@color/appWhite"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/activity_sign_up.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@
android:layout_height="55dp"
android:layout_marginBottom="20dp"
android:layout_marginTop="20dp"
android:background="@color/appGreen"
android:background="@color/appBeige"
android:onClick="@{(v) -> viewModel.onSignUp()}"
android:text="@string/register_button"
android:textColor="@color/appWhite"
android:textColor="@color/on_beige_text"
android:textSize="18sp" />
</LinearLayout>
</ScrollView>
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/layout/activity_top.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
android:clickable="true"
android:foreground="?android:attr/selectableItemBackground"
android:onClick="@{(v) -> viewModel.onJoinRoom()}"
app:cardBackgroundColor="@color/appBlue">
app:cardBackgroundColor="@color/colorPrimary">

<LinearLayout
android:layout_width="match_parent"
Expand Down Expand Up @@ -100,7 +100,7 @@
android:clickable="true"
android:foreground="?android:attr/selectableItemBackground"
android:onClick="@{(v) -> viewModel.onCreateRoom()}"
app:cardBackgroundColor="@color/appGreen">
app:cardBackgroundColor="@color/appBeige">

<LinearLayout
android:layout_width="match_parent"
Expand All @@ -118,7 +118,7 @@
android:layout_marginTop="2dp"
android:text="@string/create_room"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/appWhite"
android:textColor="@color/on_beige_text"
android:textSize="26sp" />

<TextView
Expand All @@ -130,7 +130,7 @@
android:minLines="2"
android:text="@string/create_room_description"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/appWhite"
android:textColor="@color/on_beige_text"
android:textSize="14sp" />

</LinearLayout>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/activity_user_report.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@
android:layout_height="55dp"
android:layout_marginBottom="20dp"
android:layout_marginTop="20dp"
android:background="@color/appGreen"
android:background="@color/appBeige"
android:onClick="@{(v) -> viewModel.onSubmit()}"
android:text="@string/send_button"
android:textColor="@color/appWhite"
android:textColor="@color/on_beige_text"
android:textSize="18sp" />
</LinearLayout>
</ScrollView>
Expand Down
Loading