1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2024-11-22 04:12:08 +01:00

Release v0.2.6

This commit is contained in:
Gregor Santner 2017-05-03 23:48:22 +02:00
parent baff1a1d35
commit 1ff93b6959
No known key found for this signature in database
GPG key ID: 7E83A7834AECB009
23 changed files with 115 additions and 33 deletions

View file

@ -1,3 +1,11 @@
### v0.2.6 (2017-05-03)
- Fixed #156 #158 #159
- Added chinese traditional language
- Added NavSlider option: Statistics
- Changed shared-by-notice text
- Fix bottom bar hint text background color (Fix #157)
- Color improvements
### v0.2.5 (2017-04-10) ### v0.2.5 (2017-04-10)
- Introduce minimalistic Markdown Parser - Introduce minimalistic Markdown Parser
- Show LICENSE at first start - Show LICENSE at first start

View file

@ -5,16 +5,17 @@ android {
compileSdkVersion 24 compileSdkVersion 24
buildToolsVersion "24.0.3" buildToolsVersion "24.0.3"
def VERSION_CODE = 15
def VERSION_NAME = "0.2.5"
def APP_NAME = "dandelion*"
def APP_PACKAGE = "com.github.dfa.diaspora_android"
def APP_ICON = "@drawable/ic_launcher"
defaultConfig { defaultConfig {
minSdkVersion 17 minSdkVersion 17
targetSdkVersion 24 targetSdkVersion 24
versionCode 16
versionName "0.2.6"
applicationId "com.github.dfa.diaspora_android"
resValue 'string', 'app_name', "dandelion*"
manifestPlaceholders = [appIcon: "@drawable/ic_launcher"]
buildConfigField "boolean", "IS_TEST_BUILD", "false" buildConfigField "boolean", "IS_TEST_BUILD", "false"
buildConfigField "boolean", "IS_GPLAY_BUILD", "false" buildConfigField "boolean", "IS_GPLAY_BUILD", "false"
@ -29,29 +30,22 @@ android {
productFlavors { productFlavors {
flavorDefault { flavorDefault {
applicationId APP_PACKAGE
resValue 'string', 'app_name', APP_NAME
manifestPlaceholders = [appIcon: APP_ICON]
versionCode VERSION_CODE; versionName VERSION_NAME
} }
/*
flavorGplay {
buildConfigField "boolean", "IS_GPLAY_BUILD", "true"
}
*/
flavorTest { flavorTest {
applicationId APP_PACKAGE.replace("diaspora_android", "secondlion") applicationId "com.github.dfa.secondlion"
resValue 'string', 'app_name', "secondlion*" resValue 'string', 'app_name', "secondlion*"
manifestPlaceholders = [appIcon: APP_ICON + "_test"] manifestPlaceholders = [appIcon: "@drawable/ic_launcher_test"]
versionCode = Integer.parseInt(new Date().format('yyMMdd')) versionCode = Integer.parseInt(new Date().format('yyMMdd'))
versionName = new Date().format('yyMMdd') versionName = new Date().format('yyMMdd')
buildConfigField "boolean", "IS_TEST_BUILD", "true" buildConfigField "boolean", "IS_TEST_BUILD", "true"
} }
/* flavorGplay {
applicationId APP_PACKAGE
resValue 'string', 'app_name', APP_NAME
manifestPlaceholders = [appIcon: APP_ICON]
versionCode VERSION_CODE; versionName VERSION_NAME
buildConfigField "boolean", "IS_GPLAY_BUILD", "true"
}
*/
} }
lintOptions { lintOptions {
disable 'MissingTranslation' disable 'MissingTranslation'

View file

@ -467,11 +467,12 @@ public class AppSettings {
public int[] getPrimaryColorSettings() { public int[] getPrimaryColorSettings() {
return new int[]{ return new int[]{
getInt(prefApp, R.string.pref_key__primary_color_base, getColorRes(R.color.md_blue_500)), getInt(prefApp, R.string.pref_key__primary_color_base, getColorRes(R.color.md_blue_650)),
getInt(prefApp, R.string.pref_key__primary_color_shade, getColorRes(R.color.primary)) getInt(prefApp, R.string.pref_key__primary_color_shade, getColorRes(R.color.primary))
}; };
} }
@SuppressWarnings("ConstantConditions")
public int getPrimaryColor() { public int getPrimaryColor() {
return getInt(prefApp, R.string.pref_key__primary_color_shade, getColorRes( return getInt(prefApp, R.string.pref_key__primary_color_shade, getColorRes(
BuildConfig.IS_TEST_BUILD ? R.color.md_brown_800 : R.color.primary)); BuildConfig.IS_TEST_BUILD ? R.color.md_brown_800 : R.color.primary));
@ -484,7 +485,7 @@ public class AppSettings {
public int[] getAccentColorSettings() { public int[] getAccentColorSettings() {
return new int[]{ return new int[]{
getInt(prefApp, R.string.pref_key__accent_color_base, getColorRes(R.color.md_deep_orange_500)), getInt(prefApp, R.string.pref_key__accent_color_base, getColorRes(R.color.md_green_400)),
getInt(prefApp, R.string.pref_key__accent_color_shade, getColorRes(R.color.accent)) getInt(prefApp, R.string.pref_key__accent_color_shade, getColorRes(R.color.accent))
}; };
} }

View file

@ -1,5 +1,31 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com--> <!--Generated by crowdin.com-->
<resources> <resources>
<string name="about_activity__title_about_app">Om</string>
<string name="about_activity__title_about_license">Licens</string>
<string name="about_activity__title_debug_info">Fejlsøgning</string>
<string name="fragment_debug__section_app">Applikation</string>
<string name="fragment_debug__section_device">Enhed</string>
<string name="fragment_debug__section_pod">diaspora* Pod</string>
<string name="fragment_debug__section_log">Fejlsøgningslog</string>
<string name="fragment_debug__section_log_spam">Fejlsøgningslog (udvidet)</string>
<string name="fragment_debug__app_version">App version: %1$s</string>
<string name="fragment_debug__android_version">Android version: %1$s</string>
<string name="fragment_debug__device_name">Enhedsnavn: %1$s</string>
<string name="fragment_debug__app_codename">Kodenavn: %1$s</string>
<string name="fragment_debug__pod_profile_name">Pod-profilnavn: %1$s</string>
<string name="fragment_debug__pod_profile_url">Pod-domæne: %1$s</string>
<string name="fragment_debug__toast_log_copied">Fejlsøgningslog kopieret til udklipsbord</string>
<string name="fragment_about__about_text">dandelion* er dine hjælpe-applikationer til at finde rundt på det sociale netværk diaspora*. Den tilføjer funktionaliteter som værktøjslinker og understøttelse for proxy-servere som Tor til din sociale oplevelse.</string>
<string name="fragment_about__contribute">Bidrag med kode!</string>
<string name="fragment_about__contribute_text">dandelion* udvikles som fri software og følger ideerne bag diaspora*-projektet. Hvis du har lyst til at bidrage, så sæt i gang! For nuværende er vi et meget lille hold der står bag, og vi sætter stor pris på enhver form for hjælp!</string>
<string name="fragment_about__contribute_button">Hent kildekoden</string>
<string name="fragment_about__translate">Oversæt applikationen!</string>
<string name="fragment_about__translate_text">Findes applikationen ikke på dit sprog? Det kan du ændre! Hvorfor ikke hjælpe os med at oversætte den? Vi burer crowdin-platformen som gør dig i stand til at oversætte.</string>
<string name="fragment_about__translate_button">Lad mig oversætte</string>
<string name="fragment_about__feedback">Meld tilbage!</string>
<string name="fragment_about__feedback_text">dandelion* udvikles stadig, så hvis du har forslag eller anden form for tilbagemelding, så lad os det venligst vide via vores problem-tracker!</string>
<string name="fragment_about__feedback_button">Rapporter fejl</string>
<string name="fragment_about__spread_the_word">Spred ordet!</string>
<!-- License & help (large amount of text) --> <!-- License & help (large amount of text) -->
</resources> </resources>

View file

@ -4,6 +4,8 @@
<!-- Key Names (Untranslatable) --> <!-- Key Names (Untranslatable) -->
<!-- Themes --> <!-- Themes -->
<!-- Operability --> <!-- Operability -->
<string name="pref_title__topbar_stream_shortcut">Øverste værktøjslinje indlæser strøm</string>
<string name="pref_desc__topbar_stream_shortcut">Klik på tom plads i den øverste værktøjslinje for at åbne strømme</string>
<!-- Navigiation Slider --> <!-- Navigiation Slider -->
<!-- PodProfile --> <!-- PodProfile -->
<!-- More --> <!-- More -->
@ -11,6 +13,9 @@
<!-- Visuals --> <!-- Visuals -->
<!-- Navigiation Slider --> <!-- Navigiation Slider -->
<!-- Themes --> <!-- Themes -->
<string name="pref_title__primary_color">Primær farve</string>
<string name="pref_desc__primary_color">Værktøjslinjers farver</string>
<string name="pref_title__accent_color">Markeringsfarve</string>
<!-- Notifications dropdown --> <!-- Notifications dropdown -->
<!-- Font size --> <!-- Font size -->
<!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash --> <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->

View file

@ -3,10 +3,35 @@
<resources> <resources>
<!-- App - AppName specific --> <!-- App - AppName specific -->
<!-- Application --> <!-- Application -->
<string name="reload">Genindlæs</string>
<!-- Common Words --> <!-- Common Words -->
<string name="settings">Indstillinger</string>
<string name="notifications">Notifikationer</string>
<string name="conversations">Samtaler</string>
<string name="stream">Strøm</string>
<string name="profile">Profil</string>
<string name="aspects">Aspekter</string>
<string name="activities">Aktiviteter</string>
<string name="liked">Synes om</string>
<string name="commented">Kommenteret</string>
<string name="mentions">Omtalelser</string>
<string name="public_">Offentlig</string>
<string name="search">Søg</string>
<string name="contacts">Kontakter</string>
<string name="changelog">Ændringslog</string>
<string name="statistics">Statistik</string>
<!-- Notifications dropdown menu --> <!-- Notifications dropdown menu -->
<string name="notifications__all">Alle notifikationer</string>
<string name="notifications__also_commented">Kommenterede også</string>
<string name="notifications__comment_on_post">Kommenter på opslag</string>
<string name="notifications__liked">Syntes om</string>
<string name="notifications__mentioned">Nævnte</string>
<string name="notifications__reshared">Gendelte</string>
<!-- Pod Activity --> <!-- Pod Activity -->
<!-- Drawer, Menu, Toolbar, ContextMenu --> <!-- Drawer, Menu, Toolbar, ContextMenu -->
<string name="context_menu_share_image">Del billede</string>
<string name="context_menu_open_external_browser">Åben i ekstern browser&#8230;</string>
<string name="context_menu_copy_link">Kopier link-adresse til udklipsholder</string>
<!-- More from MainActivity --> <!-- More from MainActivity -->
<!-- Permissions --> <!-- Permissions -->
</resources> </resources>

View file

@ -19,6 +19,7 @@
<string name="search">Suchen</string> <string name="search">Suchen</string>
<string name="contacts">Kontakte</string> <string name="contacts">Kontakte</string>
<string name="changelog">Änderungen</string> <string name="changelog">Änderungen</string>
<string name="statistics">Statistik</string>
<!-- Notifications dropdown menu --> <!-- Notifications dropdown menu -->
<string name="notifications__all">Alle Benachrichtigungen</string> <string name="notifications__all">Alle Benachrichtigungen</string>
<string name="notifications__also_commented">Auch kommentiert</string> <string name="notifications__also_commented">Auch kommentiert</string>

View file

@ -19,6 +19,7 @@
<string name="search">Búsqueda</string> <string name="search">Búsqueda</string>
<string name="contacts">Contactos</string> <string name="contacts">Contactos</string>
<string name="changelog">Registro de cambios</string> <string name="changelog">Registro de cambios</string>
<string name="statistics">Estadísticas</string>
<!-- Notifications dropdown menu --> <!-- Notifications dropdown menu -->
<string name="notifications__all">Todas las notificaciones</string> <string name="notifications__all">Todas las notificaciones</string>
<string name="notifications__also_commented">También Comentado</string> <string name="notifications__also_commented">También Comentado</string>

View file

@ -19,6 +19,7 @@
<string name="search">Rechercher</string> <string name="search">Rechercher</string>
<string name="contacts">Contacts</string> <string name="contacts">Contacts</string>
<string name="changelog">Nouveautés</string> <string name="changelog">Nouveautés</string>
<string name="statistics">Statistiques</string>
<!-- Notifications dropdown menu --> <!-- Notifications dropdown menu -->
<string name="notifications__all">Toutes les notifications</string> <string name="notifications__all">Toutes les notifications</string>
<string name="notifications__also_commented">Aussi commenté</string> <string name="notifications__also_commented">Aussi commenté</string>

View file

@ -19,6 +19,7 @@
<string name="search">Buscar</string> <string name="search">Buscar</string>
<string name="contacts">Contactos</string> <string name="contacts">Contactos</string>
<string name="changelog">Cambios</string> <string name="changelog">Cambios</string>
<string name="statistics">Estatísticas</string>
<!-- Notifications dropdown menu --> <!-- Notifications dropdown menu -->
<string name="notifications__all">Todas as notificacións</string> <string name="notifications__all">Todas as notificacións</string>
<string name="notifications__also_commented">Tamén comentadas</string> <string name="notifications__also_commented">Tamén comentadas</string>

View file

@ -19,6 +19,7 @@
<string name="search">Keresés</string> <string name="search">Keresés</string>
<string name="contacts">Partnerek</string> <string name="contacts">Partnerek</string>
<string name="changelog">Újdonságok</string> <string name="changelog">Újdonságok</string>
<string name="statistics">Statisztika</string>
<!-- Notifications dropdown menu --> <!-- Notifications dropdown menu -->
<string name="notifications__all">Összes értesítés</string> <string name="notifications__all">Összes értesítés</string>
<string name="notifications__also_commented">Más hozzászólások</string> <string name="notifications__also_commented">Más hozzászólások</string>

View file

@ -19,6 +19,7 @@
<string name="search">Cerca</string> <string name="search">Cerca</string>
<string name="contacts">Contatti</string> <string name="contacts">Contatti</string>
<string name="changelog">Log delle modifiche</string> <string name="changelog">Log delle modifiche</string>
<string name="statistics">Statistiche</string>
<!-- Notifications dropdown menu --> <!-- Notifications dropdown menu -->
<string name="notifications__all">Tutte le notifiche</string> <string name="notifications__all">Tutte le notifiche</string>
<string name="notifications__also_commented">Inoltre ha commentato</string> <string name="notifications__also_commented">Inoltre ha commentato</string>

View file

@ -19,6 +19,7 @@
<string name="search">検索</string> <string name="search">検索</string>
<string name="contacts">連絡先</string> <string name="contacts">連絡先</string>
<string name="changelog">変更履歴</string> <string name="changelog">変更履歴</string>
<string name="statistics">統計情報</string>
<!-- Notifications dropdown menu --> <!-- Notifications dropdown menu -->
<string name="notifications__all">すべての通知</string> <string name="notifications__all">すべての通知</string>
<string name="notifications__also_commented">コメントもしました</string> <string name="notifications__also_commented">コメントもしました</string>

View file

@ -19,8 +19,11 @@
<string name="search">검색</string> <string name="search">검색</string>
<string name="contacts">연락처</string> <string name="contacts">연락처</string>
<string name="changelog">변경사항</string> <string name="changelog">변경사항</string>
<string name="statistics">상태</string>
<!-- Notifications dropdown menu --> <!-- Notifications dropdown menu -->
<string name="notifications__all">모든 알림</string> <string name="notifications__all">모든 알림</string>
<string name="notifications__also_commented">다른 코멘트</string>
<string name="notifications__comment_on_post">게시물에 댓글 달기</string>
<string name="notifications__liked">좋아하는</string> <string name="notifications__liked">좋아하는</string>
<string name="notifications__mentioned">멘션한</string> <string name="notifications__mentioned">멘션한</string>
<string name="notifications__reshared">재공유</string> <string name="notifications__reshared">재공유</string>

View file

@ -19,6 +19,7 @@
<string name="search">Zoeken</string> <string name="search">Zoeken</string>
<string name="contacts">Contacten</string> <string name="contacts">Contacten</string>
<string name="changelog">Aanpassingen</string> <string name="changelog">Aanpassingen</string>
<string name="statistics">Statistieken</string>
<!-- Notifications dropdown menu --> <!-- Notifications dropdown menu -->
<string name="notifications__all">Alle meldingen</string> <string name="notifications__all">Alle meldingen</string>
<string name="notifications__also_commented">Heeft ook gereageerd</string> <string name="notifications__also_commented">Heeft ook gereageerd</string>

View file

@ -17,7 +17,7 @@
<!-- Visuals --> <!-- Visuals -->
<!-- Navigiation Slider --> <!-- Navigiation Slider -->
<string name="pref_title__sub_nav_slider">Pasek nawigacji</string> <string name="pref_title__sub_nav_slider">Pasek nawigacji</string>
<string name="pref_desc__sub_nav_slider">Wybierz elementy widoczne w pasku nawigacji</string> <string name="pref_desc__sub_nav_slider">Wybierz elementy widoczne w panelu nawigacyjnym</string>
<string name="pref_cat__visibility_nav_items__user">Użytkownik</string> <string name="pref_cat__visibility_nav_items__user">Użytkownik</string>
<string name="pref_cat__visibility_nav_items__general">Ogólne</string> <string name="pref_cat__visibility_nav_items__general">Ogólne</string>
<string name="pref_cat__visibility_nav_items__admin">Administracja</string> <string name="pref_cat__visibility_nav_items__admin">Administracja</string>
@ -70,8 +70,8 @@
<string name="pref_title__manage_tags">Zarządzanie tagami</string> <string name="pref_title__manage_tags">Zarządzanie tagami</string>
<string name="pref_desc__manage_tags">Przestań śledzić wybrane tagi</string> <string name="pref_desc__manage_tags">Przestań śledzić wybrane tagi</string>
<string name="pref_title__change_account">Zmień konto</string> <string name="pref_title__change_account">Zmień konto</string>
<string name="pref_desc__change_account">Skasuj dane sesji lokalnej i przełącz się do innego poda diaspora*/konta</string> <string name="pref_desc__change_account">Skasuj dane lokalnej sesji i przełącz się na inne konto diaspory*</string>
<string name="pref_warning__change_account">Operacja spowoduje usunięcie wszystkich ciasteczek i danych sesji. Jesteś pewny, że chcesz zmienić konto?</string> <string name="pref_warning__change_account">Operacja spowoduje usunięcie wszystkich ciasteczek i danych sesji. Jesteś pewny, że chcesz przełączyć na inne konto?</string>
<string name="pref_title__clear_cache">Wyczyść pamięć podręczną</string> <string name="pref_title__clear_cache">Wyczyść pamięć podręczną</string>
<string name="pref_desc__clear_cache">Wyczyść pamięć podręczną WebView</string> <string name="pref_desc__clear_cache">Wyczyść pamięć podręczną WebView</string>
<string name="pref_desc__intellihide_toolbars">Automatycznie ukryj paski narzędzi na górze i na dole podczas przewijania</string> <string name="pref_desc__intellihide_toolbars">Automatycznie ukryj paski narzędzi na górze i na dole podczas przewijania</string>

View file

@ -19,6 +19,7 @@
<string name="search">Szukaj</string> <string name="search">Szukaj</string>
<string name="contacts">Kontakty</string> <string name="contacts">Kontakty</string>
<string name="changelog">Lista zmian</string> <string name="changelog">Lista zmian</string>
<string name="statistics">Statystyki</string>
<!-- Notifications dropdown menu --> <!-- Notifications dropdown menu -->
<string name="notifications__all">Wszystkie powiadomienia</string> <string name="notifications__all">Wszystkie powiadomienia</string>
<string name="notifications__also_commented">Także skomentował/a</string> <string name="notifications__also_commented">Także skomentował/a</string>

View file

@ -5,8 +5,13 @@
<string name="about_activity__title_about_license">Licença</string> <string name="about_activity__title_about_license">Licença</string>
<string name="about_activity__title_debug_info">Depurando</string> <string name="about_activity__title_debug_info">Depurando</string>
<string name="fragment_debug__section_app">Aplicação</string> <string name="fragment_debug__section_app">Aplicação</string>
<string name="fragment_debug__section_device">Dispositivo</string>
<string name="fragment_debug__section_pod">diaspora* Pod</string> <string name="fragment_debug__section_pod">diaspora* Pod</string>
<string name="fragment_debug__section_log">Histórico de Depuração</string>
<string name="fragment_debug__section_log_spam">Histórico de depuração (detalhado)</string>
<string name="fragment_debug__app_version">Versão do App: %1$s</string> <string name="fragment_debug__app_version">Versão do App: %1$s</string>
<string name="fragment_debug__android_version">Versão do Android: %1$s</string> <string name="fragment_debug__android_version">Versão do Android: %1$s</string>
<string name="fragment_debug__device_name">Nome do dispositivo: %1$s</string>
<string name="fragment_debug__pod_profile_url">Domínio do Pod: %1$s</string>
<!-- License & help (large amount of text) --> <!-- License & help (large amount of text) -->
</resources> </resources>

View file

@ -18,6 +18,8 @@
<string name="public_">Público</string> <string name="public_">Público</string>
<string name="search">Buscar</string> <string name="search">Buscar</string>
<string name="contacts">Contatos</string> <string name="contacts">Contatos</string>
<string name="changelog">Histórico de mudanças</string>
<string name="statistics">Estatísticas</string>
<!-- Notifications dropdown menu --> <!-- Notifications dropdown menu -->
<string name="notifications__all">Todas as notificações</string> <string name="notifications__all">Todas as notificações</string>
<string name="notifications__also_commented">Também comentado</string> <string name="notifications__also_commented">Também comentado</string>

View file

@ -19,6 +19,7 @@
<string name="search">Поиск</string> <string name="search">Поиск</string>
<string name="contacts">Контакты</string> <string name="contacts">Контакты</string>
<string name="changelog">История изменений</string> <string name="changelog">История изменений</string>
<string name="statistics">Статистика</string>
<!-- Notifications dropdown menu --> <!-- Notifications dropdown menu -->
<string name="notifications__all">Все уведомления</string> <string name="notifications__all">Все уведомления</string>
<string name="notifications__also_commented">Также прокомментировали</string> <string name="notifications__also_commented">Также прокомментировали</string>

View file

@ -18,6 +18,8 @@
<string name="public_">Offentlig</string> <string name="public_">Offentlig</string>
<string name="search">Söc</string> <string name="search">Söc</string>
<string name="contacts">Kontakter</string> <string name="contacts">Kontakter</string>
<string name="changelog">Ändringar</string>
<string name="statistics">Statistik</string>
<!-- Notifications dropdown menu --> <!-- Notifications dropdown menu -->
<string name="notifications__all">Alla Notiser</string> <string name="notifications__all">Alla Notiser</string>
<string name="notifications__also_commented">Kommenterade Även</string> <string name="notifications__also_commented">Kommenterade Även</string>

View file

@ -19,6 +19,7 @@
<string name="search">搜尋</string> <string name="search">搜尋</string>
<string name="contacts">聯絡人</string> <string name="contacts">聯絡人</string>
<string name="changelog">更新紀錄</string> <string name="changelog">更新紀錄</string>
<string name="statistics">統計資料</string>
<!-- Notifications dropdown menu --> <!-- Notifications dropdown menu -->
<string name="notifications__all">全部的通知</string> <string name="notifications__all">全部的通知</string>
<string name="notifications__also_commented">其他留言</string> <string name="notifications__also_commented">其他留言</string>

View file

@ -2,14 +2,14 @@
<resources xmlns:tools="http://schemas.android.com/tools" <resources xmlns:tools="http://schemas.android.com/tools"
tools:ignore="UnusedResources"> tools:ignore="UnusedResources">
<color name="colorPrimary">@color/md_blue_650</color> <color name="colorPrimary">@color/primary</color>
<color name="colorPrimaryDark">@color/md_blue_750</color> <color name="colorPrimaryDark">@color/primary_dark</color>
<color name="colorAccent">@color/md_deep_orange_650</color> <color name="colorAccent">@color/accent</color>
<!-- Colors from Palette --> <!-- Colors from Palette -->
<color name="primary">@color/md_blue_650</color> <color name="primary">@color/md_blue_750</color>
<color name="primary_dark">@color/md_blue_750</color> <color name="primary_dark">@color/md_blue_900</color>
<color name="accent">@color/md_deep_orange_650</color> <color name="accent">@color/accent_green</color>
<color name="primary_light">#BBDEFB</color> <color name="primary_light">#BBDEFB</color>
<color name="primary_text">#212121</color> <color name="primary_text">#212121</color>
<color name="secondary_text">#727272</color> <color name="secondary_text">#727272</color>
@ -29,7 +29,7 @@
<color name="accent_pink">#e91e63</color> <color name="accent_pink">#e91e63</color>
<color name="accent_purple">#9c27b0</color> <color name="accent_purple">#9c27b0</color>
<color name="accent_deep_purple">#673ab7</color> <color name="accent_deep_purple">#673ab7</color>
<color name="accent_indago">#3f51b5</color> <color name="accent_indigo">#3f51b5</color>
<color name="accent_blue">#2196f3</color> <color name="accent_blue">#2196f3</color>
<color name="accent_cyan">#00bcd4</color> <color name="accent_cyan">#00bcd4</color>
<color name="accent_teal">#009688</color> <color name="accent_teal">#009688</color>