Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove all custom styles

This commit is contained in:
tom79 2019-11-07 18:57:05 +01:00
parent 1fc81c4574
commit eb4d3fb7cf
58 changed files with 119 additions and 607 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -124,5 +124,5 @@ dependencies {
implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
implementation 'com.github.smarteist:autoimageslider:1.3.2'
//debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-beta-2'
implementation 'com.jaredrummler:colorpicker:1.1.0'
implementation 'com.jaredrummler:cyanea:1.0.2'
}

5
app/src/main/assets/themes/cyanea_themes.json Normal file
View File

@ -0,0 +1,5 @@
[
{"theme_name":"Light","base_theme":"LIGHT","primary":"#FFFFFFFF","primary_dark":"#FF9baec8","primary_light":"#FFd9e1e8","accent":"#FF2b90d9","accent_dark":"#FF1b80c9","accent_light":"#FF772b90d9","background":"#FFFFFFFF","background_dark":"#FFFFFFFF","background_light":"#FFFFFFFF"},
{"theme_name":"Dark","base_theme":"DARK","primary":"#FF282c37","primary_dark":"#FF282c37","primary_light":"#FFd9e1e8","accent":"#FF2b90d9","accent_dark":"#FF1b80c9","accent_light":"#FF772b90d9","background":"#FF282c37","background_dark":"#FF282c37","background_light":"#FF282c37"},
{"theme_name":"Black","base_theme":"DARK","primary":"#FF000000","primary_dark":"#FF000000","primary_light":"#FF000000","accent":"#FF606984","accent_dark":"#FF606984","accent_light":"#FF606984","background":"#FFEBE5D9","background_dark":"#FFD4D4D4","background_light":"#FFEEE8DE"}
]

2
app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java
View File

@ -181,7 +181,7 @@ public class AccountReportActivity extends BaseActivity implements OnAdminAction
if (apiResponse.getError() != null) {
if (apiResponse.getError().getStatusCode() == 403) {
AlertDialog.Builder builderInner;
builderInner = new AlertDialog.Builder(AccountReportActivity.this, R.style.AdminDialog);
builderInner = new AlertDialog.Builder(AccountReportActivity.this, R.style.AppThemeDark);
builderInner.setTitle(R.string.reconnect_account);
builderInner.setMessage(R.string.reconnect_account_message);
builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {

3
app/src/main/java/app/fedilab/android/activities/BaseActivity.java
View File

@ -19,6 +19,7 @@ import android.view.View;
import android.widget.Toast;
import com.franmontiel.localechanger.LocaleChanger;
import com.jaredrummler.cyanea.app.CyaneaAppCompatActivity;
import com.vanniktech.emoji.EmojiManager;
import com.vanniktech.emoji.one.EmojiOneProvider;
@ -33,7 +34,7 @@ import es.dmoral.toasty.Toasty;
*/
@SuppressLint("Registered")
public class BaseActivity extends AppCompatActivity {
public class BaseActivity extends CyaneaAppCompatActivity {
public static final int READ_WRITE_STORAGE = 52;

7
app/src/main/java/app/fedilab/android/activities/MainApplication.java
View File

@ -26,6 +26,8 @@ import androidx.core.content.ContextCompat;
import com.evernote.android.job.JobManager;
import com.franmontiel.localechanger.LocaleChanger;
import com.jaredrummler.cyanea.Cyanea;
import com.jaredrummler.cyanea.CyaneaApp;
import net.gotev.uploadservice.UploadService;
@ -82,10 +84,13 @@ public class MainApplication extends MultiDexApplication {
ApplicationJob.cancelAllJob(BackupNotificationsSyncJob.BACKUP_NOTIFICATIONS_SYNC);
BackupNotificationsSyncJob.schedule(false);
Cyanea.init(this, super.getResources());
StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
StrictMode.setVmPolicy(builder.build());
try {
List<Locale> SUPPORTED_LOCALES = new ArrayList<>();

4
app/src/main/java/app/fedilab/android/activities/TootActivity.java
View File

@ -1731,9 +1731,9 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
case R.id.action_translate:
final CountryPicker picker = CountryPicker.newInstance(getString(R.string.which_language)); // dialog title
if (theme == Helper.THEME_LIGHT) {
picker.setStyle(R.style.AppTheme, R.style.AlertDialog);
picker.setStyle(R.style.AppTheme, R.style.Dialog);
} else {
picker.setStyle(R.style.AppThemeDark, R.style.AlertDialogDark);
picker.setStyle(R.style.AppThemeDark, R.style.DialogDark);
}
if (toot_content.getText().length() == 0 && toot_cw_content.getText().length() == 0)
return true;

31
app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
View File

@ -1180,11 +1180,11 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
AlertDialog.Builder builderInner;
int style;
if (theme == Helper.THEME_DARK) {
style = R.style.DialogDark;
style = R.style.Cyanea_AlertDialog_Theme_Dark;
} else if (theme == Helper.THEME_BLACK) {
style = R.style.DialogBlack;
style = R.style.Cyanea_AlertDialog_Theme_Dark;
} else {
style = R.style.Dialog;
style = R.style.Cyanea_AlertDialog_Theme_Light;
}
builderInner = new AlertDialog.Builder(context, style);
builderInner.setTitle(R.string.comment);
@ -2528,11 +2528,11 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
int style;
if (theme == Helper.THEME_DARK) {
style = R.style.DialogDark;
style = R.style.Cyanea_AlertDialog_Theme_Dark;
} else if (theme == Helper.THEME_BLACK) {
style = R.style.DialogBlack;
style = R.style.Cyanea_AlertDialog_Theme_Dark;
} else {
style = R.style.Dialog;
style = R.style.Cyanea_AlertDialog_Theme_Light;
}
AlertDialog.Builder dialog = new AlertDialog.Builder(context, style);
dialog.setTitle(R.string.toot_visibility_tilte);
@ -2950,13 +2950,12 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
});
int style;
if (theme == Helper.THEME_DARK) {
style = R.style.DialogDark;
style = R.style.Cyanea_AlertDialog_Theme_Dark;
} else if (theme == Helper.THEME_BLACK) {
style = R.style.DialogBlack;
style = R.style.Cyanea_AlertDialog_Theme_Dark;
} else {
style = R.style.Dialog;
style = R.style.Cyanea_AlertDialog_Theme_Light;
}
holder.status_remove.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -4013,11 +4012,11 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
int style;
if (theme == Helper.THEME_DARK) {
style = R.style.DialogDark;
style = R.style.Cyanea_AlertDialog_Theme_Dark;
} else if (theme == Helper.THEME_BLACK) {
style = R.style.DialogBlack;
style = R.style.Cyanea_AlertDialog_Theme_Dark;
} else {
style = R.style.Dialog;
style = R.style.Cyanea_AlertDialog_Theme_Light;
}
AlertDialog.Builder dialogBuilderBoost = new AlertDialog.Builder(context, style);
@ -4174,11 +4173,11 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
stepSpliToot = 1;
int style;
if (theme == Helper.THEME_DARK) {
style = R.style.DialogDark;
style = R.style.Cyanea_AlertDialog_Theme_Dark;
} else if (theme == Helper.THEME_BLACK) {
style = R.style.DialogBlack;
style = R.style.Cyanea_AlertDialog_Theme_Dark;
} else {
style = R.style.Dialog;
style = R.style.Cyanea_AlertDialog_Theme_Light;
}
AlertDialog.Builder builderInner = new AlertDialog.Builder(context, style);
builderInner.setTitle(R.string.message_preview);

2
app/src/main/java/app/fedilab/android/fragments/DisplayAdminReportsFragment.java
View File

@ -212,7 +212,7 @@ public class DisplayAdminReportsFragment extends Fragment implements OnAdminActi
//Admin right not granted through the API?
if (apiResponse.getError().getStatusCode() == 403) {
AlertDialog.Builder builderInner;
builderInner = new AlertDialog.Builder(context, R.style.AdminDialog);
builderInner = new AlertDialog.Builder(context, R.style.AppThemeDark);
builderInner.setTitle(R.string.reconnect_account);
builderInner.setMessage(R.string.reconnect_account_message);
builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {

25
app/src/main/java/app/fedilab/android/helper/ThemeHelper.java Normal file
View File

@ -0,0 +1,25 @@
package app.fedilab.android.helper;
import android.app.Activity;
import com.jaredrummler.cyanea.Cyanea;
import app.fedilab.android.R;
public class ThemeHelper {
public static void changeTheme(Activity activity){
Cyanea.Editor editor = Cyanea.getInstance().edit();
editor.accent(R.color.colorAccent);
editor.background(R.color.black);
editor.backgroundDarkResource(R.color.black);
editor.apply();
if( activity != null){
activity.recreate();
}
}
}

2
app/src/main/res/drawable/translation_border.xml
View File

@ -2,6 +2,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="1dp"
android:color="?attr/textColor" />
android:color="?attr/colorAccent" />
<corners android:radius="4dp" />
</shape>

6
app/src/main/res/layout-sw600dp/activity_show_account.xml
View File

@ -179,7 +179,6 @@
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
<TextView
android:textColor="?attr/color_in_account_header"
android:id="@+id/account_un"
android:maxLines="1"
android:layout_width="wrap_content"
@ -263,7 +262,6 @@
android:padding="10dp"
android:layout_marginTop="5dp"
android:gravity="center"
android:textColor="?attr/color_in_account_header"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@ -511,7 +509,7 @@
android:layout_weight="1"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="?attr/actionBarTextColor" />
/>
<ImageButton
android:background="?attr/selectableItemBackgroundBorderless"
@ -551,6 +549,8 @@
<com.google.android.material.tabs.TabLayout
android:id="@+id/account_tabLayout"
android:layout_width="match_parent"
android:background="?attr/colorPrimary"
app:tabSelectedTextColor="?colorAccent"
android:layout_height="wrap_content"
app:tabMode="fixed"
app:tabGravity="fill" />

2
app/src/main/res/layout/activity_admin.xml
View File

@ -32,8 +32,8 @@
android:id="@+id/admin_tablayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
app:tabSelectedTextColor="?colorAccent"
app:tabTextColor="?attr/textColor"
app:tabMode="fixed"
app:tabGravity="fill" />
</com.google.android.material.appbar.AppBarLayout>

4
app/src/main/res/layout/activity_custom_sharing.xml
View File

@ -32,7 +32,6 @@
<!-- Custom Sharing SETTINGS -->
<TextView
style="?attr/shapeBorder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
@ -43,7 +42,6 @@
<!-- Title -->
<TextView
style="?attr/shapeBorder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
@ -63,7 +61,6 @@
<!-- Description -->
<TextView
style="?attr/shapeBorder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
@ -80,7 +77,6 @@
<!-- Keywords -->
<TextView
style="?attr/shapeBorder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"

3
app/src/main/res/layout/activity_edit_profile.xml
View File

@ -33,7 +33,6 @@
<!-- Profile SETTINGS -->
<TextView
android:text="@string/settings_title_profile"
style="?attr/shapeBorder"
android:paddingBottom="10dp"
android:layout_width="match_parent"
android:layout_marginBottom="10dp"
@ -73,7 +72,6 @@
android:textSize="12sp"
android:textAllCaps="false"
android:text="@string/choose_picture"
style="?attr/borderlessColored"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
@ -123,7 +121,6 @@
android:gravity="center"
android:textAllCaps="false"
android:text="@string/choose_picture"
style="?attr/borderlessColored"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />

2
app/src/main/res/layout/activity_group.xml
View File

@ -38,7 +38,7 @@
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="?attr/popupOverlay" />
/>
</com.google.android.material.appbar.AppBarLayout>
<RelativeLayout

2
app/src/main/res/layout/activity_hashtag.xml
View File

@ -38,7 +38,7 @@
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="?attr/popupOverlay" />
/>
</com.google.android.material.appbar.AppBarLayout>
<RelativeLayout

2
app/src/main/res/layout/activity_instance_social.xml
View File

@ -89,8 +89,6 @@
android:layout_gravity="center"
android:textAllCaps="false"
android:text="@string/close"
android:textColor="@color/mastodonC4"
style="?attr/borderlessColored"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>

2
app/src/main/res/layout/activity_list.xml
View File

@ -40,7 +40,7 @@
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="?attr/popupOverlay" />
/>
</com.google.android.material.appbar.AppBarLayout>
<RelativeLayout

13
app/src/main/res/layout/activity_main.xml
View File

@ -40,7 +40,7 @@
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="?attr/popupOverlay">
>
<ImageView
android:id="@+id/iconbar"
@ -71,6 +71,7 @@
android:layout_width="0dp"
android:layout_weight="1"
app:tabGravity="fill"
android:background="?attr/colorPrimary"
app:tabMaxWidth="0dp"
app:tabIndicatorHeight="0dp"
android:layout_height="wrap_content"
@ -110,23 +111,21 @@
<!-- Framelayout to display Fragments -->
<androidx.viewpager.widget.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewpager"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="app.fedilab.android.activities.MainActivity"></androidx.viewpager.widget.ViewPager>
tools:context="app.fedilab.android.activities.MainActivity"/>
<!-- Framelayout to display Fragments -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout
android:visibility="gone"
android:id="@+id/main_app_container"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="app.fedilab.android.activities.MainActivity"></RelativeLayout>
tools:context="app.fedilab.android.activities.MainActivity"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/toot"

5
app/src/main/res/layout/activity_ower_charts.xml
View File

@ -5,7 +5,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
style="?attr/shapeBorder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
@ -23,7 +23,7 @@
android:layout_marginStart="10dp"
android:focusableInTouchMode="false"
android:id="@+id/settings_time_from"
style="?attr/borderlessColored"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
@ -36,7 +36,6 @@
<Button
android:layout_marginStart="10dp"
android:focusableInTouchMode="false"
style="?attr/borderlessColored"
android:id="@+id/settings_time_to"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />

2
app/src/main/res/layout/activity_ower_notifications.xml
View File

@ -23,7 +23,7 @@
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="?attr/popupOverlay" />
/>
</com.google.android.material.appbar.AppBarLayout>
<RelativeLayout

2
app/src/main/res/layout/activity_ower_status.xml
View File

@ -23,7 +23,7 @@
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="?attr/popupOverlay" />
/>
</com.google.android.material.appbar.AppBarLayout>
<RelativeLayout

2
app/src/main/res/layout/activity_playlists.xml
View File

@ -40,7 +40,7 @@
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="?attr/popupOverlay" />
/>
</com.google.android.material.appbar.AppBarLayout>
<RelativeLayout

5
app/src/main/res/layout/activity_privacy.xml
View File

@ -39,7 +39,6 @@
<!-- PRIVACY TITLE -->
<TextView
android:text="@string/privacy_API_title"
style="?attr/shapeBorder"
android:paddingBottom="10dp"
android:layout_marginBottom="10dp"
android:layout_width="match_parent"
@ -64,7 +63,6 @@
<!-- DATA PRIVACY TITLE -->
<TextView
android:text="@string/privacy_data_title"
style="?attr/shapeBorder"
android:paddingBottom="10dp"
android:layout_marginBottom="10dp"
android:layout_width="match_parent"
@ -89,7 +87,6 @@
<!-- APPS AUTHORIZATIONS TITLE -->
<TextView
android:text="@string/privacy_authorizations_title"
style="?attr/shapeBorder"
android:paddingBottom="10dp"
android:layout_marginBottom="10dp"
android:layout_width="match_parent"
@ -115,7 +112,6 @@
<!-- API AUTHORIZATIONS TITLE -->
<TextView
android:text="@string/privacy_API_authorizations_title"
style="?attr/shapeBorder"
android:paddingBottom="10dp"
android:layout_marginBottom="10dp"
android:layout_width="match_parent"
@ -140,7 +136,6 @@
<!-- TRANSLATION TITLE -->
<TextView
android:text="@string/privacy_API_yandex_title"
style="?attr/shapeBorder"
android:paddingBottom="10dp"
android:layout_marginBottom="10dp"
android:layout_width="match_parent"

2
app/src/main/res/layout/activity_search_result_tabs.xml
View File

@ -27,8 +27,8 @@
android:id="@+id/search_tabLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
app:tabSelectedTextColor="?colorAccent"
app:tabTextColor="?attr/textColor"
app:tabMode="fixed"
app:tabGravity="fill" />

2
app/src/main/res/layout/activity_settings.xml
View File

@ -12,9 +12,9 @@
<com.google.android.material.tabs.TabLayout
android:id="@+id/settings_tablayout"
android:layout_width="match_parent"
android:background="?attr/colorPrimary"
android:layout_height="wrap_content"
app:tabSelectedTextColor="?colorAccent"
app:tabTextColor="?attr/textColor"
app:tabMode="scrollable"
app:tabGravity="fill" />
<androidx.viewpager.widget.ViewPager

6
app/src/main/res/layout/activity_show_account.xml
View File

@ -181,7 +181,6 @@
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
<TextView
android:textColor="?attr/color_in_account_header"
android:id="@+id/account_un"
android:maxLines="1"
android:layout_width="wrap_content"
@ -268,7 +267,6 @@
android:padding="10dp"
android:layout_marginTop="5dp"
android:gravity="center"
android:textColor="?attr/color_in_account_header"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@ -516,7 +514,7 @@
android:layout_weight="1"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="?attr/actionBarTextColor" />
/>
<ImageButton
android:background="?attr/selectableItemBackgroundBorderless"
@ -557,8 +555,8 @@
android:id="@+id/account_tabLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
app:tabSelectedTextColor="?colorAccent"
app:tabTextColor="?attr/textColor"
app:tabMode="fixed"
app:tabGravity="fill" />
</com.google.android.material.appbar.AppBarLayout>

2
app/src/main/res/layout/activity_show_conversation.xml
View File

@ -24,7 +24,7 @@
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="?attr/popupOverlay" />
/>
</com.google.android.material.appbar.AppBarLayout>
<!-- Framelayout to display Fragments -->
<RelativeLayout

1
app/src/main/res/layout/activity_toot_info.xml
View File

@ -27,6 +27,7 @@
<com.google.android.material.tabs.TabLayout
android:id="@+id/tabLayout"
android:background="?attr/colorPrimary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:tabSelectedTextColor="?colorAccent"

2
app/src/main/res/layout/activity_who_to_follow.xml
View File

@ -39,7 +39,7 @@
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="?attr/popupOverlay" />
/>
</com.google.android.material.appbar.AppBarLayout>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

3
app/src/main/res/layout/conversation_action_bar.xml
View File

@ -29,7 +29,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
app:popupTheme="?attr/popupOverlay"
tools:ignore="UnusedAttribute">
<ImageView
@ -56,7 +56,6 @@
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:textColor="?attr/actionBarTextColor"
android:textSize="14sp"
android:id="@+id/toolbar_title" />

2
app/src/main/res/layout/drawer_notification.xml
View File

@ -141,7 +141,6 @@
android:maxLines="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?attr/borderless"
android:text="@string/load_attachment_spoiler" />
</LinearLayout>
@ -291,7 +290,6 @@
android:maxLines="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?attr/borderless"
android:text="@string/load_attachment" />
</LinearLayout>

1
app/src/main/res/layout/drawer_scheduled_toot.xml
View File

@ -88,7 +88,6 @@
android:layout_marginLeft="10dp"
android:focusableInTouchMode="false"
android:id="@+id/scheduled_toot_date"
style="?attr/borderlessColored"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />

6
app/src/main/res/layout/drawer_status.xml
View File

@ -68,7 +68,6 @@
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
style="?attr/cardStyle"
android:id="@+id/main_card_container"
app:layout_constraintStart_toEndOf="@id/reply_indicator_dot"
app:layout_constraintBottom_toBottomOf="parent"
@ -82,14 +81,12 @@
android:id="@+id/status_boosted_by_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?boostcolor"
android:padding="5dp"
android:visibility="gone"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/status_account_profile_boost_by"
style="?attr/shapeBorder"
android:layout_width="25dp"
android:layout_height="25dp"
android:contentDescription="@string/profile_picture"
@ -347,7 +344,6 @@
<Button
android:id="@+id/status_spoiler_button"
style="?attr/borderless"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/ic_remove_red_eye"
@ -375,7 +371,6 @@
<Button
android:id="@+id/status_show_more_content"
style="?attr/borderless"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="-10dp"
@ -432,7 +427,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:background="?attr/statusBackgroundColor"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:text="Translation"

5
app/src/main/res/layout/drawer_status_compact.xml
View File

@ -67,7 +67,6 @@
android:layout_marginEnd="2dp"
android:layout_marginBottom="4dp"
android:id="@+id/main_card_container"
style="?attr/cardStyleOver"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/reply_indicator_dot"
@ -123,7 +122,6 @@
android:id="@+id/status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="?attr/cardStyle"
app:layout_constraintTop_toBottomOf="@id/status_boosted_by_info">
<androidx.constraintlayout.widget.ConstraintLayout
@ -301,7 +299,6 @@
<Button
android:id="@+id/status_spoiler_button"
style="?attr/borderless"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/ic_remove_red_eye"
@ -340,7 +337,6 @@
<Button
android:id="@+id/status_show_more_content"
style="?attr/borderless"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/ic_more_toot_content"
@ -383,7 +379,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:background="?attr/statusBackgroundColor"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:text="Translation"

4
app/src/main/res/layout/drawer_status_console.xml
View File

@ -151,7 +151,6 @@
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginTop="25dp"
style="?attr/shapeBorder"
android:visibility="gone"
android:contentDescription="@string/profile_picture" />
</RelativeLayout>
@ -259,7 +258,6 @@
android:maxLines="1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="?attr/borderless"
android:text="@string/load_attachment_spoiler" />
</LinearLayout>
@ -289,7 +287,6 @@
android:maxLines="1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="?attr/borderless"
android:text="@string/display_toot_truncate" />
<androidx.constraintlayout.widget.ConstraintLayout
@ -321,7 +318,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:background="?attr/statusBackgroundColor"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:text="Translation"

4
app/src/main/res/layout/drawer_status_focused.xml
View File

@ -143,7 +143,6 @@
<ImageView
android:id="@+id/status_account_profile_boost_by"
style="?attr/shapeBorder"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_alignParentEnd="true"
@ -234,7 +233,6 @@
<Button
android:id="@+id/status_spoiler_button"
style="?attr/borderless"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/ic_remove_red_eye"
@ -262,7 +260,6 @@
<Button
android:id="@+id/status_show_more_content"
style="?attr/borderless"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/ic_more_toot_content"
@ -305,7 +302,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:background="?attr/statusBackgroundColor"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:text="Translation"

3
app/src/main/res/layout/filter_owner_notifications.xml
View File

@ -28,7 +28,6 @@
android:layout_height="wrap_content">
<LinearLayout
style="?attr/shapeBorder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
@ -45,7 +44,6 @@
android:layout_marginStart="10dp"
android:focusableInTouchMode="false"
android:id="@+id/settings_time_from"
style="?attr/borderlessColored"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
@ -58,7 +56,6 @@
<Button
android:layout_marginStart="10dp"
android:focusableInTouchMode="false"
style="?attr/borderlessColored"
android:id="@+id/settings_time_to"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />

3
app/src/main/res/layout/filter_owner_toots.xml
View File

@ -28,7 +28,6 @@
android:layout_height="wrap_content">
<LinearLayout
style="?attr/shapeBorder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
@ -46,7 +45,6 @@
android:layout_marginLeft="10dp"
android:focusableInTouchMode="false"
android:id="@+id/settings_time_from"
style="?attr/borderlessColored"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
@ -61,7 +59,6 @@
android:layout_marginStart="10dp"
android:layout_marginLeft="10dp"
android:focusableInTouchMode="false"
style="?attr/borderlessColored"
android:id="@+id/settings_time_to"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />

3
app/src/main/res/layout/fragment_settings_reveal.xml
View File

@ -1219,7 +1219,6 @@
</LinearLayout>
<LinearLayout
style="?attr/shapeBorder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
@ -1233,7 +1232,6 @@
<Button
android:id="@+id/settings_time_from"
style="?attr/borderlessColored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusableInTouchMode="false" />
@ -1245,7 +1243,6 @@
<Button
android:id="@+id/settings_time_to"
style="?attr/borderlessColored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusableInTouchMode="false" />

2
app/src/main/res/layout/item_file_lister.xml
View File

@ -3,7 +3,7 @@
android:id="@+id/layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/FileListerItemColor">
>
<LinearLayout
android:layout_width="match_parent"

2
app/src/main/res/layout/item_file_lister_light.xml
View File

@ -3,7 +3,7 @@
android:id="@+id/layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/FileListerItemColorLight">
>
<LinearLayout
android:layout_width="match_parent"

1
app/src/main/res/layout/media_action_bar.xml
View File

@ -29,7 +29,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
app:popupTheme="?attr/popupOverlay"
tools:ignore="UnusedAttribute">
<ImageView

2
app/src/main/res/layout/nav_header_main.xml
View File

@ -89,7 +89,6 @@
<TextView
android:gravity="center_vertical"
android:id="@+id/displayedName"
android:textColor="?attr/textColor"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
@ -109,7 +108,6 @@
<TextView
android:id="@+id/username"
android:textColor="?attr/textColor"
android:layout_width="wrap_content"
android:textSize="12sp"
android:maxLines="1"

2
app/src/main/res/layout/owner_status_action_bar.xml
View File

@ -29,7 +29,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
app:popupTheme="?attr/popupOverlay"
tools:ignore="UnusedAttribute">
<ImageView
@ -56,7 +55,6 @@
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:textColor="?attr/actionBarTextColor"
android:textSize="14sp"
android:id="@+id/toolbar_title" />

2
app/src/main/res/layout/picture_actionbar.xml
View File

@ -30,7 +30,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
app:popupTheme="?attr/popupOverlay"
tools:ignore="UnusedAttribute">
<ImageView
@ -47,7 +46,6 @@
android:layout_gravity="center_vertical"
android:id="@+id/toolbar_title"
android:maxLines="1"
android:textColor="?attr/actionBarTextColor"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="14sp" />

2
app/src/main/res/layout/showaccount_actionbar.xml
View File

@ -41,5 +41,5 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="?attr/actionBarTextColor" />
/>
</LinearLayout>

2
app/src/main/res/layout/simple_action_bar.xml
View File

@ -29,7 +29,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
app:popupTheme="?attr/popupOverlay"
tools:ignore="UnusedAttribute">
<ImageView
@ -56,7 +55,6 @@
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:textColor="?attr/actionBarTextColor"
android:textSize="14sp"
android:id="@+id/toolbar_title" />

2
app/src/main/res/layout/simple_bar.xml
View File

@ -29,7 +29,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
app:popupTheme="?attr/popupOverlay"
tools:ignore="UnusedAttribute">
<ImageView
@ -48,7 +47,6 @@
android:ellipsize="end"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:textColor="?attr/actionBarTextColor"
android:textSize="16sp"
android:maxLines="1"
android:id="@+id/toolbar_title" />

2
app/src/main/res/layout/simple_bar_add.xml
View File

@ -29,7 +29,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
app:popupTheme="?attr/popupOverlay"
tools:ignore="UnusedAttribute">
<LinearLayout
@ -54,7 +53,6 @@
android:ellipsize="end"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:textColor="?attr/actionBarTextColor"
android:textSize="16sp"
android:maxLines="1"
android:id="@+id/toolbar_title" />

2
app/src/main/res/layout/simple_bar_muted_instance.xml
View File

@ -29,7 +29,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
app:popupTheme="?attr/popupOverlay"
tools:ignore="UnusedAttribute">
<LinearLayout
@ -54,7 +53,6 @@
android:ellipsize="end"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:textColor="?attr/actionBarTextColor"
android:textSize="16sp"
android:maxLines="1"
android:id="@+id/toolbar_title" />

2
app/src/main/res/layout/tablayout_notifications.xml
View File

@ -25,6 +25,8 @@
android:id="@+id/tabLayout"
android:layout_width="match_parent"
app:tabGravity="fill"
android:background="?attr/colorPrimary"
app:tabSelectedTextColor="?colorAccent"
app:tabMaxWidth="0dp"
android:layout_height="wrap_content" />

2
app/src/main/res/layout/tablayout_settings.xml
View File

@ -24,6 +24,8 @@
<com.google.android.material.tabs.TabLayout
android:id="@+id/tabLayout"
android:layout_width="match_parent"
android:background="?attr/colorPrimary"
app:tabSelectedTextColor="?colorAccent"
app:tabGravity="fill"
app:tabMaxWidth="0dp"
android:layout_height="wrap_content" />

2
app/src/main/res/layout/tablayout_toots.xml
View File

@ -22,6 +22,8 @@
<com.google.android.material.tabs.TabLayout
android:id="@+id/tabLayout"
android:background="?attr/colorPrimary"
app:tabSelectedTextColor="?colorAccent"
android:layout_width="match_parent"
app:tabGravity="fill"
app:tabMaxWidth="0dp"

2
app/src/main/res/layout/toot_action_bar.xml
View File

@ -29,7 +29,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
app:popupTheme="?attr/popupOverlay"
tools:ignore="UnusedAttribute">
<ImageView
@ -67,7 +66,6 @@
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:textColor="?attr/actionBarTextColor"
android:textSize="14sp"
android:id="@+id/toolbar_title" />

1
app/src/main/res/layout/webview_actionbar.xml
View File

@ -34,7 +34,6 @@
android:layout_gravity="center_vertical"
android:id="@+id/webview_title"
android:maxLines="1"
android:textColor="?attr/actionBarTextColor"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="12sp"

3
app/src/main/res/values/colors.xml
View File

@ -174,4 +174,7 @@
<color name="dark_blockquote">#5E68A0</color>
<color name="cyanea_primary_reference">#0288D1</color>
<color name="cyanea_accent_reference">#FFA000</color>
</resources>

509
app/src/main/res/values/styles.xml
View File

@ -1,144 +1,35 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<attr format="reference" name="headerbg" />
<attr format="reference" name="shapeBorder" />
<attr format="reference" name="imgbd" />
<attr format="color" name="actionBarTextColor" />
<attr format="reference" name="cardStyle"/>
<attr format="reference" name="cardStyleOver"/>
<attr format="color" name="color_in_account_header" />
<attr format="reference" name="popupOverlay" />
<attr format="reference" name="appTheme" />
<attr format="reference" name="borderless" />
<attr format="reference" name="borderlessColored" />
<attr format="color" name="textColor" />
<attr format="color" name="cardBorder" />
<attr format="color" name="boostcolor" />
<attr format="color" name="iconcolor" />
<attr name="statusBackgroundColor" format="color" />
<!-- Light theme -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="android:textColor">@color/light_black</item>
<item name="colorPrimary">@color/white</item>
<item name="colorPrimaryDark">@color/mastodonC2</item>
<item name="colorAccent">@color/mastodonC4</item>
<item name="cardStyle">@style/CardViewStyle.Light</item>
<item name="cardStyleOver">@style/CardViewStyleOver.Light</item>
<item name="cardBorder">@color/cardBorderLight</item>
<item name="boostcolor">@color/mastodonC2</item>
<item name="textColor">@color/black</item>
<item name="iconcolor">@color/black</item>
<item name="android:buttonStyle">@style/ButtonColor</item>
<item name="headerbg">@style/Header.Light</item>
<item name="android:windowBackground">@color/white</item>
<item name="shapeBorder">@style/Shape.Light</item>
<item name="imgbd">@style/Image.Border.Light</item>
<item name="borderless">@style/borderLessLightStyle</item>
<item name="borderlessColored">@style/borderlessColoredStyle</item>
<item name="windowActionModeOverlay">true</item>
<item name="popupOverlay">@style/AppTheme.PopupOverlay</item>
<item name="android:spinnerStyle">@style/SpinnerStyle</item>
<item name="android:spinnerItemStyle">@style/SpinnerItemStyle</item>
<item name="android:popupMenuStyle">@style/PopupMenu</item>
<item name="android:itemBackground">@drawable/menu_selector</item>
<item name="android:actionModeStyle">@style/ActionMode</item>
<item name="android:dropDownListViewStyle">@style/DropDownListViewStyle</item>
<item name="actionBarTextColor">@color/black</item>
<item name="color_in_account_header">@color/black</item>
<item name="colorBackgroundFloating">@color/white</item>
<item name="android:colorBackground">@color/white</item>
<item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
<item name="backgroundColor">@color/white</item>
<item name="statusBackgroundColor">@color/white</item>
</style>
<style name="Widget.ActionButton.Overflow" parent="Base.Widget.AppCompat.ActionButton.Overflow">
<item name="android:contentDescription">@string/abc_action_menu_overflow_description</item>
</style>
<style name="LightActionBarTheme" parent="Base.Widget.AppCompat.ActionBar">
<item name="android:background">@color/white</item>
<item name="titleTextStyle">@style/TextLightActionBarTheme</item>
</style>
<style name="TextLightActionBarTheme" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">
<item name="android:textColor">@color/black</item>
<style name="AppTheme" parent="Theme.Cyanea.Dark.LightActionBar">
</style>
<style name="AppTheme_NoActionBar_Fedilab" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:textColor">@color/light_black</item>
<item name="android:scrollbarThumbVertical">@color/transparent</item>
<item name="colorPrimary">@color/white</item>
<item name="cardStyle">@style/CardViewStyle.Light</item>
<item name="cardStyleOver">@style/CardViewStyleOver.Light</item>
<item name="cardBorder">@color/cardBorderLight</item>
<item name="boostcolor">@color/mastodonC2</item>
<item name="textColor">@color/black</item>
<item name="iconcolor">@color/black</item>
<item name="colorPrimaryDark">@color/mastodonC2</item>
<item name="colorAccent">@color/mastodonC4</item>
<item name="android:buttonStyle">@style/ButtonColor</item>
<item name="headerbg">@style/Header.Light</item>
<item name="borderless">@style/borderLessLightStyle</item>
<item name="borderlessColored">@style/borderlessColoredStyle</item>
<item name="android:windowBackground">@color/white</item>
<item name="shapeBorder">@style/Shape.Light</item>
<item name="imgbd">@style/Image.Border.Light</item>
<item name="windowActionModeOverlay">true</item>
<item name="popupOverlay">@style/AppTheme.PopupOverlay</item>
<item name="windowActionBar">false</item>
<item name="android:spinnerStyle">@style/SpinnerStyle</item>
<item name="android:spinnerItemStyle">@style/SpinnerItemStyle</item>
<item name="android:itemBackground">@drawable/menu_selector</item>
<item name="android:popupMenuStyle">@style/PopupMenu</item>
<item name="android:actionModeStyle">@style/ActionMode</item>
<item name="android:dropDownListViewStyle">@style/DropDownListViewStyle</item>
<item name="actionBarTextColor">@color/black</item>
<item name="color_in_account_header">@color/black</item>
<item name="android:actionBarStyle">@style/LightActionBarTheme</item>
<item name="colorBackgroundFloating">@color/white</item>
<item name="android:colorBackground">@color/white</item>
<item name="backgroundColor">@color/white</item>
<item name="statusBackgroundColor">@color/white</item>
</style>
<style name="CardViewStyle.Light" parent="CardView">
<item name="cardBackgroundColor">@color/white</item>
</style>
<style name="CardViewStyleOver.Light" parent="CardView">
<item name="cardBackgroundColor">@color/mastodonC2</item>
</style>
<style name="borderLessLightStyle" parent="Base.Widget.AppCompat.Button.Borderless">
<item name="android:textColor">?attr/colorAccent</item>
</style>
<style name="borderlessColoredStyle" parent="Base.Widget.AppCompat.Button.Borderless.Colored">
<item name="android:textColor">?attr/colorAccent</item>
<style name="AppTheme_NoActionBar_Fedilab" parent="Theme.Cyanea.Light.NoActionBar">
</style>
<style name="TransparentLight" parent="Theme.AppCompat.Light">
<item name="colorPrimary">@color/white</item>
<item name="colorPrimaryDark">@color/mastodonC2</item>
<item name="colorAccent">@color/mastodonC4</item>
<style name="Dialog" parent="Cyanea.AlertDialog.Theme.Light">
</style>
<style name="DialogDark" parent="Cyanea.AlertDialog.Theme.Dark">
</style>
<style name="DialogBlack" parent="Cyanea.AlertDialog.Theme.Dark">
</style>
<style name="TransparentLight" parent="Theme.Cyanea.Light">
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowContentOverlay">@null</item>
</style>
<style name="TransparentDark" parent="Theme.AppCompat">
<item name="colorPrimary">@color/mastodonC1</item>
<item name="colorPrimaryDark">@color/mastodonC1</item>
<item name="colorAccent">@color/mastodonC4</item>
<style name="TransparentDark" parent="Theme.Cyanea.Dark">
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowContentOverlay">@null</item>
</style>
<style name="TransparentBlack" parent="Theme.AppCompat">
<item name="colorPrimary">@color/black</item>
<item name="colorPrimaryDark">@color/black</item>
<item name="colorAccent">@color/dark_icon</item>
<style name="TransparentBlack" parent="Theme.Cyanea.Dark">
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowContentOverlay">@null</item>
@ -146,388 +37,32 @@
<style name="DropDownListViewStyle" parent="Base.Widget.AppCompat.ListView.DropDown">
<item name="android:background">@color/mastodonC3__</item>
</style>
<style name="ActionMode" parent="Base.Widget.AppCompat.ActionMode">
<item name="android:background">@drawable/menu_selector</item>
</style>
<style name="ButtonColor" parent="Base.Widget.AppCompat.Button">
<item name="android:textColor">@color/white</item>
<item name="android:background">@drawable/button_selector</item>
</style>
<style name="PopupMenu" parent="@android:style/Widget.PopupMenu">
<item name="android:windowBackground">@color/mastodonC1</item>
</style>
<style name="Dialog" parent="Theme.AppCompat.Light.Dialog.Alert">
<item name="android:windowBackground">@color/mastodonC3__</item>
<item name="colorAccent">@color/mastodonC4</item>
<item name="android:headerBackground">@color/mastodonC3__</item>
<item name="colorControlNormal">@color/black</item>
</style>
<style name="SpinnerStyle" parent="Base.Widget.AppCompat.Spinner">
<item name="android:popupBackground">@color/mastodonC3__</item>
<item name="android:windowBackground">@color/mastodonC3__</item>
<item name="android:colorBackground">@color/mastodonC3__</item>
</style>
<style name="SpinnerItemStyle" parent="Base.Widget.AppCompat.TextView.SpinnerItem">
<item name="android:padding">10dp</item>
</style>
<style name="AlertDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
<item name="android:windowBackground">@color/mastodonC3__</item>
</style>
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light">
<item name="android:textColorPrimary">@color/black</item>
<item name="android:textColorSecondary">@color/black</item>
<item name="android:windowBackground">@color/mastodonC3__</item>
</style>
<style name="Image.Border.Light" parent="AppTheme">
<item name="android:background">@drawable/imageview_border</item>
</style>
<style name="Header.Light" parent="AppTheme">
<item name="android:background">@drawable/side_nav_bar</item>
</style>
<style name="Shape.Light" parent="AppTheme">
<item name="android:background">@drawable/shape_border_bottom_settings</item>
</style>
<!-- BLACK theme -->
<style name="AppThemeBlack" parent="Theme.AppCompat">
<item name="android:textColor">@color/dark_text</item>
<item name="colorPrimary">@color/black</item>
<item name="colorPrimaryDark">@color/black</item>
<item name="colorAccent">@color/dark_icon</item>
<item name="cardStyle">@style/CardViewStyle.Black</item>
<item name="cardStyleOver">@style/CardViewStyleOver.Black</item>
<item name="cardBorder">@color/cardBorderBlack</item>
<item name="boostcolor">@color/mastodonC1_</item>
<item name="textColor">@color/light_grey</item>
<item name="iconcolor">@color/light_grey</item>
<item name="android:buttonStyle">@style/BlackButtonColor</item>
<item name="headerbg">@style/Header.Black</item>
<item name="android:windowBackground">@color/black</item>
<item name="shapeBorder">@style/Shape.Black</item>
<item name="borderless">@style/borderLessLightStyle</item>
<item name="borderlessColored">@style/borderlessColoredStyle</item>
<item name="imgbd">@style/Image.Border.Black</item>
<item name="windowActionModeOverlay">true</item>
<item name="popupOverlay">@style/AppThemeBlack.PopupOverlay</item>
<item name="android:spinnerStyle">@style/BlackSpinnerStyle</item>
<item name="android:spinnerItemStyle">@style/BlackSpinnerItemStyle</item>
<item name="android:popupMenuStyle">@style/BlackPopupMenu</item>
<item name="android:itemBackground">@drawable/menu_selector_black</item>
<item name="android:actionModeStyle">@style/BlackActionMode</item>
<item name="android:dropDownListViewStyle">@style/BlackdropDownListViewStyle</item>
<item name="actionBarTextColor">@color/mastodonC3</item>
<item name="color_in_account_header">@color/mastodonC3</item>
<item name="colorBackgroundFloating">@color/black_3</item>
<item name="android:colorBackground">@color/black</item>
<item name="backgroundColor">@color/black</item>
<item name="statusBackgroundColor">@color/black</item>
<style name="AppThemeBlack" parent="Theme.Cyanea.Dark">
</style>
<style name="AppThemeBlack_NoActionBar" parent="Theme.AppCompat.NoActionBar">
<item name="android:textColor">@color/dark_text</item>
<item name="android:scrollbarThumbVertical">@color/transparent</item>
<item name="colorPrimary">@color/black</item>
<item name="colorPrimaryDark">@color/black</item>
<item name="colorAccent">@color/dark_icon</item>
<item name="cardStyle">@style/CardViewStyle.Black</item>
<item name="cardStyleOver">@style/CardViewStyleOver.Black</item>
<item name="cardBorder">@color/cardBorderBlack</item>
<item name="boostcolor">@color/mastodonC1_</item>
<item name="textColor">@color/light_grey</item>
<item name="iconcolor">@color/light_grey</item>
<item name="android:buttonStyle">@style/BlackButtonColor</item>
<item name="headerbg">@style/Header.Black</item>
<item name="android:windowBackground">@color/black</item>
<item name="borderless">@style/borderLessLightStyle</item>
<item name="borderlessColored">@style/borderlessColoredStyle</item>
<item name="shapeBorder">@style/Shape.Black</item>
<item name="imgbd">@style/Image.Border.Black</item>
<item name="windowActionModeOverlay">true</item>
<item name="popupOverlay">@style/AppThemeBlack.PopupOverlay</item>
<item name="windowActionBar">false</item>
<item name="android:spinnerStyle">@style/BlackSpinnerStyle</item>
<item name="android:spinnerItemStyle">@style/BlackSpinnerItemStyle</item>
<item name="android:popupMenuStyle">@style/BlackPopupMenu</item>
<item name="android:itemBackground">@drawable/menu_selector_black</item>
<item name="android:actionModeStyle">@style/BlackActionMode</item>
<item name="android:dropDownListViewStyle">@style/BlackdropDownListViewStyle</item>
<item name="actionBarTextColor">@color/mastodonC3</item>
<item name="color_in_account_header">@color/mastodonC3</item>
<item name="android:actionBarStyle">@style/BlackActionBarTheme</item>
<item name="colorBackgroundFloating">@color/black_3</item>
<item name="android:colorBackground">@color/black</item>
<item name="backgroundColor">@color/black</item>
<item name="statusBackgroundColor">@color/black</item>
</style>
<style name="AppThemeBlack_NoActionBar" parent="Theme.Cyanea.Dark.NoActionBar">
<style name="CardViewStyle.Black" parent="CardView">
<item name="cardBackgroundColor">@color/black</item>
</style>
<style name="CardViewStyleOver.Black" parent="CardView">
<item name="cardBackgroundColor">@color/mastodonC1_</item>
</style>
<style name="BlackActionBarTheme" parent="Base.Widget.AppCompat.ActionBar">
<item name="android:background">@color/black_3</item>
</style>
<style name="BlackdropDownListViewStyle" parent="Base.Widget.AppCompat.ListView.DropDown">
<item name="android:background">@color/black_3</item>
</style>
<style name="BlackActionMode" parent="Base.Widget.AppCompat.ActionMode">
<item name="android:background">@drawable/menu_selector_black</item>
</style>
<style name="BlackButtonColor" parent="Base.Widget.AppCompat.Button">
<item name="android:textColor">@color/white</item>
<item name="android:background">@drawable/button_selector_black</item>
</style>
<style name="DialogBlack" parent="Theme.AppCompat.Dialog.Alert">
<item name="android:windowBackground">@color/black_3</item>
<item name="colorAccent">@color/dark_icon</item>
<item name="android:headerBackground">@color/black_3</item>
<item name="colorControlNormal">@color/mastodonC2</item>
</style>
<style name="BlackPopupMenu" parent="@android:style/Widget.PopupMenu">
<item name="android:windowBackground">@color/black_3</item>
</style>
<style name="BlackSpinnerStyle" parent="Base.Widget.AppCompat.Spinner">
<item name="android:popupBackground">@color/black_3</item>
<item name="android:windowBackground">@color/black_3</item>
<item name="android:colorBackground">@color/black_3</item>
</style>
<style name="BlackSpinnerItemStyle" parent="Base.Widget.AppCompat.TextView.SpinnerItem">
<item name="android:padding">10dp</item>
</style>
<style name="AppThemeBlack.PopupOverlay" parent="ThemeOverlay.AppCompat.Dark">
<item name="android:windowBackground">@color/black_3</item>
</style>
<style name="Image.Border.Black" parent="AppThemeDark">
<item name="android:background">@drawable/imageview_border_black</item>
</style>
<style name="Header.Black" parent="AppThemeDark">
<item name="android:background">@drawable/side_nav_bar_black</item>
</style>
<style name="Shape.Black" parent="AppThemeDark">
<item name="android:background">@drawable/shape_border_bottom_settings_black</item>
</style>
<!-- Dark theme -->
<style name="AppThemeDark" parent="Theme.AppCompat">
<item name="android:textColor">@color/dark_text</item>
<item name="colorPrimary">@color/mastodonC1</item>
<item name="colorPrimaryDark">@color/mastodonC1</item>
<item name="colorAccent">@color/mastodonC4</item>
<item name="cardStyle">@style/CardViewStyle.Dark</item>
<item name="cardStyleOver">@style/CardViewStyleOver.Dark</item>
<item name="textColor">@color/light_grey</item>
<item name="iconcolor">@color/light_grey</item>
<item name="android:buttonStyle">@style/DarkButtonColor</item>
<item name="headerbg">@style/Header.Dark</item>
<item name="cardBorder">@color/cardBorderDark</item>
<item name="boostcolor">@color/mastodonC1___</item>
<item name="android:windowBackground">@color/mastodonC1</item>
<item name="borderless">@style/borderLessLightStyle</item>
<item name="borderlessColored">@style/borderlessColoredStyle</item>
<item name="shapeBorder">@style/Shape.Dark</item>
<item name="imgbd">@style/Image.Border.Dark</item>
<item name="windowActionModeOverlay">true</item>
<item name="popupOverlay">@style/AppThemeDark.PopupOverlay</item>
<item name="android:spinnerStyle">@style/DarkSpinnerStyle</item>
<item name="android:spinnerItemStyle">@style/DarkSpinnerItemStyle</item>
<item name="android:popupMenuStyle">@style/DarkPopupMenu</item>
<item name="android:itemBackground">@drawable/menu_selector_dark</item>
<item name="android:actionModeStyle">@style/DarkActionMode</item>
<item name="android:dropDownListViewStyle">@style/DarkdropDownListViewStyle</item>
<item name="actionBarTextColor">@color/mastodonC3</item>
<item name="color_in_account_header">@color/mastodonC3</item>
<item name="colorBackgroundFloating">@color/mastodonC1</item>
<item name="android:colorBackground">@color/mastodonC1</item>
<item name="backgroundColor">@color/mastodonC1</item>
<item name="statusBackgroundColor">@color/mastodonC1_</item>
<style name="AppThemeDark" parent="Theme.Cyanea.Dark">
</style>
<style name="AppThemeDark_NoActionBar" parent="Theme.AppCompat.NoActionBar">
<item name="android:textColor">@color/dark_text</item>
<item name="android:scrollbarThumbVertical">@color/transparent</item>
<item name="colorPrimary">@color/mastodonC1</item>
<item name="colorPrimaryDark">@color/mastodonC1</item>
<item name="colorAccent">@color/mastodonC4</item>
<item name="cardStyle">@style/CardViewStyle.Dark</item>
<item name="cardStyleOver">@style/CardViewStyleOver.Dark</item>
<item name="textColor">@color/light_grey</item>
<item name="iconcolor">@color/light_grey</item>
<item name="android:buttonStyle">@style/DarkButtonColor</item>
<item name="cardBorder">@color/cardBorderDark</item>
<item name="boostcolor">@color/mastodonC1___</item>
<item name="headerbg">@style/Header.Dark</item>
<item name="android:windowBackground">@color/mastodonC1</item>
<item name="borderless">@style/borderLessLightStyle</item>
<item name="borderlessColored">@style/borderlessColoredStyle</item>
<item name="shapeBorder">@style/Shape.Dark</item>
<item name="imgbd">@style/Image.Border.Dark</item>
<item name="windowActionModeOverlay">true</item>
<item name="popupOverlay">@style/AppThemeDark.PopupOverlay</item>
<item name="windowActionBar">false</item>
<item name="android:spinnerStyle">@style/DarkSpinnerStyle</item>
<item name="android:spinnerItemStyle">@style/DarkSpinnerItemStyle</item>
<item name="android:popupMenuStyle">@style/DarkPopupMenu</item>
<item name="android:itemBackground">@drawable/menu_selector_dark</item>
<item name="android:actionModeStyle">@style/DarkActionMode</item>
<item name="android:dropDownListViewStyle">@style/DarkdropDownListViewStyle</item>
<item name="actionBarTextColor">@color/mastodonC3</item>
<item name="color_in_account_header">@color/mastodonC3</item>
<item name="colorBackgroundFloating">@color/mastodonC1</item>
<item name="android:colorBackground">@color/mastodonC1</item>
<item name="backgroundColor">@color/mastodonC1</item>
<item name="statusBackgroundColor">@color/mastodonC1_</item>
<style name="AppThemeDark_NoActionBar" parent="Theme.Cyanea.Dark.NoActionBar">
</style>
<style name="CardViewStyle.Dark" parent="CardView">
<item name="cardBackgroundColor">@color/mastodonC1_</item>
</style>
<style name="CardViewStyleOver.Dark" parent="CardView">
<item name="cardBackgroundColor">@color/mastodonC1___</item>
</style>
<style name="DarkdropDownListViewStyle" parent="Base.Widget.AppCompat.ListView.DropDown">
<item name="android:background">@color/mastodonC1</item>
</style>
<style name="DarkActionMode" parent="Base.Widget.AppCompat.ActionMode">
<item name="android:background">@drawable/menu_selector_dark</item>
</style>
<style name="DarkButtonColor" parent="Base.Widget.AppCompat.Button">
<item name="android:textColor">@color/white</item>
<item name="android:background">@drawable/button_selector</item>
</style>
<style name="FileListerItemColor">
<item name="android:textColor">@color/dark_text</item>
<item name="android:tint">@color/mastodonC2</item>
</style>
<style name="FileListerItemColorLight">
<item name="android:textColor">@color/black</item>
<item name="android:tint">@color/mastodonC2</item>
</style>
<style name="DialogDark" parent="Theme.AppCompat.Dialog.Alert">
<item name="android:windowBackground">@color/mastodonC1</item>
<item name="colorAccent">@color/mastodonC4</item>
<item name="android:headerBackground">@color/mastodonC2</item>
<item name="colorControlNormal">@color/mastodonC2</item>
</style>
<style name="DarkPopupMenu" parent="@android:style/Widget.PopupMenu">
<item name="android:windowBackground">@color/mastodonC1</item>
</style>
<style name="DarkSpinnerStyle" parent="Base.Widget.AppCompat.Spinner">
<item name="android:popupBackground">@color/mastodonC1</item>
<item name="android:windowBackground">@color/mastodonC1</item>
<item name="android:colorBackground">@color/mastodonC1</item>
</style>
<style name="DarkSpinnerItemStyle" parent="Base.Widget.AppCompat.TextView.SpinnerItem">
<item name="android:padding">10dp</item>
</style>
<style name="AlertDialogDark" parent="Theme.AppCompat.Dialog.Alert">
<item name="android:windowBackground">@color/mastodonC1</item>
</style>
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="AppThemeDark.PopupOverlay" parent="ThemeOverlay.AppCompat.Dark">
<item name="android:windowBackground">@color/mastodonC1</item>
</style>
<style name="Image.Border.Dark" parent="AppThemeDark">
<item name="android:background">@drawable/imageview_border_dark</item>
</style>
<style name="Header.Dark" parent="AppThemeDark">
<item name="android:background">@drawable/side_nav_bar_dark</item>
</style>
<style name="Shape.Dark" parent="AppThemeDark">
<item name="android:background">@drawable/shape_border_bottom_settings_dark</item>
</style>
<!-- Light theme -->
<style name="AppAdminTheme" parent="Theme.AppCompat">
<item name="android:textColor">@color/dark_text</item>
<item name="colorPrimary">@color/mastodonC1</item>
<item name="colorPrimaryDark">@color/mastodonC1</item>
<item name="colorAccent">@color/mastodonC4</item>
<item name="cardBorder">@color/cardBorderLight</item>
<item name="textColor">@color/dark_text</item>
<item name="iconcolor">@color/dark_text</item>
<item name="android:buttonStyle">@style/ButtonColor</item>
<item name="headerbg">@style/Header.Light</item>
<item name="android:windowBackground">@color/mastodonC1__</item>
<item name="shapeBorder">@style/Shape.Light</item>
<item name="imgbd">@style/Image.Border.Light</item>
<item name="borderless">@style/borderLessLightStyle</item>
<item name="borderlessColored">@style/borderlessColoredStyle</item>
<item name="windowActionModeOverlay">true</item>
<item name="popupOverlay">@style/AppThemeDark.PopupOverlay</item>
<item name="android:spinnerStyle">@style/SpinnerStyle</item>
<item name="android:spinnerItemStyle">@style/SpinnerItemStyle</item>
<item name="android:popupMenuStyle">@style/DarkPopupMenu</item>
<item name="android:itemBackground">@drawable/menu_selector_dark</item>
<item name="android:actionModeStyle">@style/DarkActionMode</item>
<item name="android:dropDownListViewStyle">@style/DarkdropDownListViewStyle</item>
<item name="actionBarTextColor">@color/dark_text</item>
<item name="color_in_account_header">@color/black</item>
<item name="colorBackgroundFloating">@color/mastodonC1__</item>
<item name="android:colorBackground">@color/mastodonC1__</item>
<item name="android:actionOverflowButtonStyle">@style/Widget.Admin.ActionButton.Overflow
</item>
<style name="AppAdminTheme" parent="Theme.Cyanea.Dark">
</style>
<style name="Widget.Admin.ActionButton.Overflow" parent="Base.Widget.AppCompat.ActionButton.Overflow">
<item name="android:contentDescription">@string/abc_action_menu_overflow_description</item>
</style>
<style name="AdminAlertDialogDark" parent="Theme.AppCompat.Dialog.Alert">
<item name="android:windowBackground">@color/mastodonC1__</item>
</style>
<style name="AdminDialog" parent="Theme.AppCompat.Dialog.Alert">
<item name="android:windowBackground">@color/mastodonC1__</item>
<item name="colorAccent">@color/mastodonC4</item>
<item name="android:headerBackground">@color/mastodonC2</item>
<item name="colorControlNormal">@color/mastodonC2</item>
</style>
</resources>