Mastodon
/
SubwayTooter-Android-App
mirror of https://github.com/tateisu/SubwayTooter
1
0
Fork 0
Code Issues Releases Wiki Activity

フッタ色の変更。カラーピッカーのバグ対応

This commit is contained in:
tateisu 2017-05-08 19:56:50 +09:00
parent 23012bd4a2
commit e756bf1c87
13 changed files with 525 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@ -9,8 +9,8 @@ android {
applicationId "jp.juggler.subwaytooter"
minSdkVersion 21
targetSdkVersion 25
versionCode 41
versionName "0.4.1"
versionCode 42
versionName "0.4.2"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
@ -61,7 +61,7 @@ dependencies {
compile 'uk.co.chrisjenx:calligraphy:2.2.0'
compile 'com.github.woxthebox:draglistview:1.4.3'
compile 'com.github.omadahealth:swipy:1.2.3@aar'
compile 'com.jrummyapps:colorpicker:2.1.6'
compile 'com.jrummyapps:colorpicker:2.1.7'
// compile 'com.astuetz:pagerslidingtabstrip:1.0.1'
compile 'com.github.kenglxn.QRGen:android:2.2.0'
compile project(':exif')

197
app/src/main/java/jp/juggler/subwaytooter/ActAppSetting.java
View File

@ -1,23 +1,33 @@
package jp.juggler.subwaytooter;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.support.annotation.ColorInt;
import android.support.annotation.Nullable;
import android.support.v4.view.ViewCompat;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.ImageView;
import android.widget.Spinner;
import android.widget.Switch;
public class ActAppSetting extends AppCompatActivity implements CompoundButton.OnCheckedChangeListener, AdapterView.OnItemSelectedListener {
import com.jrummyapps.android.colorpicker.ColorPickerDialog;
import com.jrummyapps.android.colorpicker.ColorPickerDialogListener;
public class ActAppSetting extends AppCompatActivity
implements CompoundButton.OnCheckedChangeListener
, AdapterView.OnItemSelectedListener
, View.OnClickListener
, ColorPickerDialogListener
{
public static void open( Context context ){
context.startActivity( new Intent( context, ActAppSetting.class ) );
public static void open( ActMain activity ,int request_code ){
activity.startActivityForResult( new Intent( activity, ActAppSetting.class ),request_code );
}
SharedPreferences pref;
@ -41,7 +51,6 @@ public class ActAppSetting extends AppCompatActivity implements CompoundButton.O
Switch swShowFollowButtonInButtonBar;
Switch swDontRound;
Spinner spBackButtonAction;
Spinner spUITheme;
Spinner spResizeImage;
@ -56,6 +65,17 @@ public class ActAppSetting extends AppCompatActivity implements CompoundButton.O
static final int BACK_OPEN_COLUMN_LIST = 2;
static final int BACK_EXIT_APP = 3;
int footer_button_bg_color;
int footer_button_fg_color;
int footer_tab_bg_color;
int footer_tab_divider_color;
ImageView ivFooterToot;
ImageView ivFooterMenu;
View llFooterBG;
View vFooterDivider1;
View vFooterDivider2;
private void initUI(){
setContentView( R.layout.act_app_setting );
swDontConfirmBeforeCloseColumn = (Switch) findViewById( R.id.swDontConfirmBeforeCloseColumn );
@ -142,6 +162,20 @@ public class ActAppSetting extends AppCompatActivity implements CompoundButton.O
spRefreshAfterToot.setOnItemSelectedListener( this );
}
findViewById( R.id.btnFooterBackgroundEdit ).setOnClickListener( this );
findViewById( R.id.btnFooterBackgroundReset ).setOnClickListener( this );
findViewById( R.id.btnFooterForegroundColorEdit ).setOnClickListener( this );
findViewById( R.id.btnFooterForegroundColorReset ).setOnClickListener( this );
findViewById( R.id.btnTabBackgroundColorEdit ).setOnClickListener( this );
findViewById( R.id.btnTabBackgroundColorReset ).setOnClickListener( this );
findViewById( R.id.btnTabDividerColorEdit ).setOnClickListener( this );
findViewById( R.id.btnTabDividerColorReset ).setOnClickListener( this );
ivFooterToot = (ImageView) findViewById( R.id.ivFooterToot );
ivFooterMenu = (ImageView) findViewById( R.id.ivFooterMenu );
llFooterBG = findViewById( R.id.llFooterBG );
vFooterDivider1 = findViewById( R.id.vFooterDivider1 );
vFooterDivider2 = findViewById( R.id.vFooterDivider2 );
}
boolean load_busy;
@ -165,7 +199,15 @@ public class ActAppSetting extends AppCompatActivity implements CompoundButton.O
spUITheme.setSelection( pref.getInt( Pref.KEY_UI_THEME, 0 ) );
spResizeImage.setSelection( pref.getInt( Pref.KEY_RESIZE_IMAGE, 4 ) );
spRefreshAfterToot.setSelection( pref.getInt( Pref.KEY_REFRESH_AFTER_TOOT, 0 ) );
footer_button_bg_color = pref.getInt( Pref.KEY_FOOTER_BUTTON_BG_COLOR, 0 );
footer_button_fg_color = pref.getInt( Pref.KEY_FOOTER_BUTTON_FG_COLOR, 0 );
footer_tab_bg_color = pref.getInt( Pref.KEY_FOOTER_TAB_BG_COLOR, 0 );
footer_tab_divider_color = pref.getInt( Pref.KEY_FOOTER_TAB_DIVIDER_COLOR, 0 );
load_busy = false;
showFooterColor();
}
private void saveUIToData(){
@ -178,8 +220,7 @@ public class ActAppSetting extends AppCompatActivity implements CompoundButton.O
.putBoolean( Pref.KEY_EXIT_APP_WHEN_CLOSE_PROTECTED_COLUMN, swExitAppWhenCloseProtectedColumn.isChecked() )
.putBoolean( Pref.KEY_SHOW_FOLLOW_BUTTON_IN_BUTTON_BAR, swShowFollowButtonInButtonBar.isChecked() )
.putBoolean( Pref.KEY_DONT_ROUND, swDontRound.isChecked() )
.putBoolean( Pref.KEY_NOTIFICATION_SOUND, cbNotificationSound.isChecked() )
.putBoolean( Pref.KEY_NOTIFICATION_VIBRATION, cbNotificationVibration.isChecked() )
.putBoolean( Pref.KEY_NOTIFICATION_LED, cbNotificationLED.isChecked() )
@ -188,7 +229,14 @@ public class ActAppSetting extends AppCompatActivity implements CompoundButton.O
.putInt( Pref.KEY_UI_THEME, spUITheme.getSelectedItemPosition() )
.putInt( Pref.KEY_RESIZE_IMAGE, spResizeImage.getSelectedItemPosition() )
.putInt( Pref.KEY_REFRESH_AFTER_TOOT, spRefreshAfterToot.getSelectedItemPosition() )
.putInt( Pref.KEY_FOOTER_BUTTON_BG_COLOR, footer_button_bg_color )
.putInt( Pref.KEY_FOOTER_BUTTON_FG_COLOR, footer_button_fg_color )
.putInt( Pref.KEY_FOOTER_TAB_BG_COLOR, footer_tab_bg_color )
.putInt( Pref.KEY_FOOTER_TAB_DIVIDER_COLOR, footer_tab_divider_color )
.apply();
}
@Override public void onCheckedChanged( CompoundButton buttonView, boolean isChecked ){
@ -202,4 +250,139 @@ public class ActAppSetting extends AppCompatActivity implements CompoundButton.O
@Override public void onNothingSelected( AdapterView< ? > parent ){
}
static final int COLOR_DIALOG_ID_FOOTER_BUTTON_BG = 1;
static final int COLOR_DIALOG_ID_FOOTER_BUTTON_FG = 2;
static final int COLOR_DIALOG_ID_FOOTER_TAB_BG = 3;
static final int COLOR_DIALOG_ID_FOOTER_TAB_DIVIDER = 4;
@Override public void onClick( View v ){
switch( v.getId() ){
case R.id.btnFooterBackgroundEdit:
openColorPicker( COLOR_DIALOG_ID_FOOTER_BUTTON_BG, footer_button_bg_color );
break;
case R.id.btnFooterBackgroundReset:
footer_button_bg_color = 0;
saveUIToData();
showFooterColor();
break;
case R.id.btnFooterForegroundColorEdit:
openColorPicker( COLOR_DIALOG_ID_FOOTER_BUTTON_FG, footer_button_fg_color );
break;
case R.id.btnFooterForegroundColorReset:
footer_button_fg_color = 0;
saveUIToData();
showFooterColor();
break;
case R.id.btnTabBackgroundColorEdit:
openColorPicker( COLOR_DIALOG_ID_FOOTER_TAB_BG, footer_tab_bg_color );
break;
case R.id.btnTabBackgroundColorReset:
footer_tab_bg_color = 0;
saveUIToData();
showFooterColor();
break;
case R.id.btnTabDividerColorEdit:
openColorPicker( COLOR_DIALOG_ID_FOOTER_TAB_DIVIDER, footer_tab_divider_color );
break;
case R.id.btnTabDividerColorReset:
footer_tab_divider_color = 0;
saveUIToData();
showFooterColor();
break;
}
}
void openColorPicker( int id, int color ){
ColorPickerDialog.Builder builder = ColorPickerDialog.newBuilder()
.setDialogType( ColorPickerDialog.TYPE_CUSTOM )
.setAllowPresets( true )
.setShowAlphaSlider( false )
.setDialogId( id );
if( color != 0 ) builder.setColor( color );
builder.show( this );
}
@Override public void onColorSelected( int dialogId, @ColorInt int color ){
switch( dialogId ){
case COLOR_DIALOG_ID_FOOTER_BUTTON_BG:
footer_button_bg_color = 0xff000000 | color;
saveUIToData();
showFooterColor();
break;
case COLOR_DIALOG_ID_FOOTER_BUTTON_FG:
footer_button_fg_color = 0xff000000 | color;
saveUIToData();
showFooterColor();
break;
case COLOR_DIALOG_ID_FOOTER_TAB_BG:
footer_tab_bg_color = 0xff000000 | color;
saveUIToData();
showFooterColor();
break;
case COLOR_DIALOG_ID_FOOTER_TAB_DIVIDER:
footer_tab_divider_color = 0xff000000 | color;
saveUIToData();
showFooterColor();
break;
}
}
@Override public void onDialogDismissed( int dialogId ){
}
private void showFooterColor(){
int c = footer_button_bg_color;
if( c == 0 ){
ivFooterToot.setBackgroundResource( R.drawable.btn_bg_ddd );
ivFooterMenu.setBackgroundResource( R.drawable.btn_bg_ddd );
}else{
int fg = ( footer_button_fg_color != 0
? footer_button_fg_color
: Styler.getAttributeColor( this, R.attr.colorRippleEffect ) );
ViewCompat.setBackground( ivFooterToot, Styler.getAdaptiveRippleDrawable( c, fg ) );
ViewCompat.setBackground( ivFooterMenu, Styler.getAdaptiveRippleDrawable( c, fg ) );
}
c = footer_button_fg_color;
if( c == 0 ){
Styler.setIconDefaultColor( this, ivFooterToot, R.attr.ic_edit );
Styler.setIconDefaultColor( this, ivFooterMenu, R.attr.ic_hamburger );
}else{
Styler.setIconCustomColor( this, ivFooterToot, c, R.attr.ic_edit );
Styler.setIconCustomColor( this, ivFooterMenu, c, R.attr.ic_hamburger );
}
c = footer_tab_bg_color;
if( c == 0 ){
llFooterBG.setBackgroundColor( Styler.getAttributeColor( this, R.attr.colorColumnStripBackground ) );
}else{
llFooterBG.setBackgroundColor( c );
}
c = footer_tab_divider_color;
if( c == 0 ){
vFooterDivider1.setBackgroundColor( Styler.getAttributeColor( this, R.attr.colorImageButton ) );
vFooterDivider2.setBackgroundColor( Styler.getAttributeColor( this, R.attr.colorImageButton ) );
}else{
vFooterDivider1.setBackgroundColor( c );
vFooterDivider2.setBackgroundColor( c );
}
}
}

89
app/src/main/java/jp/juggler/subwaytooter/ActMain.java
View File

@ -27,6 +27,7 @@ import android.view.Menu;
import android.view.MenuItem;
import android.view.Window;
import android.widget.HorizontalScrollView;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
@ -247,6 +248,7 @@ public class ActMain extends AppCompatActivity
static final int REQUEST_CODE_NICKNAME = 4;
static final int REQUEST_CODE_POST = 5;
static final int REQUEST_COLUMN_COLOR = 6;
static final int REQUEST_APP_SETTING = 7;
@Override protected void onActivityResult( int requestCode, int resultCode, Intent data ){
log.d( "onActivityResult" );
@ -302,8 +304,14 @@ public class ActMain extends AppCompatActivity
}
updateColumnStrip();
}
}
}
if( requestCode == REQUEST_APP_SETTING ){
showFooterColor();
}
super.onActivityResult( requestCode, resultCode, data );
}
@ -426,9 +434,11 @@ public class ActMain extends AppCompatActivity
performAddTimeline( false, Column.TYPE_NOTIFICATIONS );
}else if( id == R.id.nav_app_setting ){
performAppSetting();
ActAppSetting.open( this, REQUEST_APP_SETTING );
}else if( id == R.id.nav_account_setting ){
performAccountSetting();
}else if( id == R.id.nav_column_list ){
openColumnList();
@ -483,6 +493,10 @@ public class ActMain extends AppCompatActivity
DrawerLayout drawer;
LinearLayout llColumnStrip;
HorizontalScrollView svColumnStrip;
ImageButton btnMenu;
ImageButton btnToot;
View vFooterDivider1;
View vFooterDivider2;
void initUI(){
setContentView( R.layout.act_main );
@ -503,17 +517,16 @@ public class ActMain extends AppCompatActivity
NavigationView navigationView = (NavigationView) findViewById( R.id.nav_view );
navigationView.setNavigationItemSelectedListener( this );
View v;
v = findViewById( R.id.btnToot );
v.setOnClickListener( this );
v = findViewById( R.id.btnMenu );
v.setOnClickListener( this );
btnMenu = (ImageButton) findViewById( R.id.btnMenu );
btnToot = (ImageButton) findViewById( R.id.btnToot );
vFooterDivider1 = findViewById( R.id.vFooterDivider1 );
vFooterDivider2 = findViewById( R.id.vFooterDivider2 );
llColumnStrip = (LinearLayout) findViewById( R.id.llColumnStrip );
svColumnStrip = (HorizontalScrollView) findViewById( R.id.svColumnStrip );
btnToot.setOnClickListener( this );
btnMenu.setOnClickListener( this );
svColumnStrip.setHorizontalFadingEdgeEnabled( true );
// ViewPager
@ -522,6 +535,7 @@ public class ActMain extends AppCompatActivity
pager.setAdapter( pager_adapter );
pager.addOnPageChangeListener( this );
showFooterColor();
}
void updateColumnStrip(){
@ -546,10 +560,10 @@ public class ActMain extends AppCompatActivity
if( c == 0 ){
viewRoot.setBackgroundResource( R.drawable.btn_bg_ddd );
}else{
ViewCompat.setBackground( viewRoot,Styler.getAdaptiveRippleDrawable(
ViewCompat.setBackground( viewRoot, Styler.getAdaptiveRippleDrawable(
c,
(column.header_fg_color != 0 ? column.header_fg_color :
Styler.getAttributeColor( this,R.attr.colorRippleEffect ))
( column.header_fg_color != 0 ? column.header_fg_color :
Styler.getAttributeColor( this, R.attr.colorRippleEffect ) )
) );
}
@ -1554,10 +1568,6 @@ public class ActMain extends AppCompatActivity
} );
}
private void performAppSetting(){
ActAppSetting.open( ActMain.this );
}
////////////////////////////////////////////////////////
// column list
@ -1637,7 +1647,7 @@ public class ActMain extends AppCompatActivity
}else if( bFollow ){
BidiFormatter bidiFormatter = BidiFormatter.getInstance();
String msg = getString( R.string.confirm_follow_who_from
, bidiFormatter.unicodeWrap(who.display_name )
, bidiFormatter.unicodeWrap( who.display_name )
, AcctColor.getNickname( access_info.acct )
);
@ -2321,4 +2331,47 @@ public class ActMain extends AppCompatActivity
}.executeOnExecutor( App1.task_executor );
}
private void showFooterColor(){
int footer_button_bg_color = pref.getInt( Pref.KEY_FOOTER_BUTTON_BG_COLOR, 0 );
int footer_button_fg_color = pref.getInt( Pref.KEY_FOOTER_BUTTON_FG_COLOR, 0 );
int footer_tab_bg_color = pref.getInt( Pref.KEY_FOOTER_TAB_BG_COLOR, 0 );
int footer_tab_divider_color = pref.getInt( Pref.KEY_FOOTER_TAB_DIVIDER_COLOR, 0 );
int c = footer_button_bg_color;
if( c == 0 ){
btnMenu.setBackgroundResource( R.drawable.btn_bg_ddd );
btnToot.setBackgroundResource( R.drawable.btn_bg_ddd );
}else{
int fg = ( footer_button_fg_color != 0
? footer_button_fg_color
: Styler.getAttributeColor( this, R.attr.colorRippleEffect ) );
ViewCompat.setBackground( btnToot, Styler.getAdaptiveRippleDrawable( c, fg ) );
ViewCompat.setBackground( btnMenu, Styler.getAdaptiveRippleDrawable( c, fg ) );
}
c = footer_button_fg_color;
if( c == 0 ){
Styler.setIconDefaultColor( this, btnToot, R.attr.ic_edit );
Styler.setIconDefaultColor( this, btnMenu, R.attr.ic_hamburger );
}else{
Styler.setIconCustomColor( this, btnToot, c, R.attr.ic_edit );
Styler.setIconCustomColor( this, btnMenu, c, R.attr.ic_hamburger );
}
c = footer_tab_bg_color;
if( c == 0 ){
svColumnStrip.setBackgroundColor( Styler.getAttributeColor( this, R.attr.colorColumnStripBackground ) );
}else{
svColumnStrip.setBackgroundColor( c );
}
c = footer_tab_divider_color;
if( c == 0 ){
vFooterDivider1.setBackgroundColor( Styler.getAttributeColor( this, R.attr.colorImageButton ) );
vFooterDivider2.setBackgroundColor( Styler.getAttributeColor( this, R.attr.colorImageButton ) );
}else{
vFooterDivider1.setBackgroundColor( c );
vFooterDivider2.setBackgroundColor( c );
}
}
}

8
app/src/main/java/jp/juggler/subwaytooter/Pref.java
View File

@ -31,4 +31,12 @@ public class Pref {
static final String KEY_SHOW_FOLLOW_BUTTON_IN_BUTTON_BAR = "ShowFollowButtonInButtonBar";
static final String KEY_REFRESH_AFTER_TOOT = "refresh_after_toot";
public static final String KEY_DONT_ROUND = "dont_round";
static final String KEY_FOOTER_BUTTON_BG_COLOR = "footer_button_bg_color";
static final String KEY_FOOTER_BUTTON_FG_COLOR = "footer_button_fg_color";
static final String KEY_FOOTER_TAB_BG_COLOR = "footer_tab_bg_color";
static final String KEY_FOOTER_TAB_DIVIDER_COLOR = "footer_tab_divider_color";
}

6
app/src/main/res/drawable/window_background_light.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"
>
<solid android:color="@color/Light_colorBackground" />
</shape>

204
app/src/main/res/layout/act_app_setting.xml
View File

@ -1,8 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:clipToPadding="false"
android:fillViewport="true"
@ -226,8 +228,8 @@
</LinearLayout>
<View style="@style/setting_divider"/>
<TextView
style="@style/setting_row_label"
android:text="@string/dont_round_avatar"
@ -244,6 +246,206 @@
</LinearLayout>
<View style="@style/setting_divider"/>
<TextView
style="@style/setting_row_label"
android:text="@string/footer_color"
/>
<LinearLayout style="@style/setting_row_form">
<LinearLayout
android:id="@+id/llFooterBG"
android:layout_width="match_parent"
android:layout_height="48dp"
android:orientation="horizontal"
android:background="?attr/colorColumnStripBackground"
>
<ImageView
android:id="@+id/ivFooterMenu"
app:srcCompat="?attr/ic_hamburger"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@drawable/btn_bg_ddd"
android:importantForAccessibility="no"
/>
<View
android:id="@+id/vFooterDivider1"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="?attr/colorImageButton"
/>
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1"
/>
<HorizontalScrollView
android:id="@+id/svColumnStrip"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:cacheColorHint="#00000000"
android:fadingEdge="horizontal"
android:fadingEdgeLength="20dp"
android:fillViewport="true"
android:scrollbars="none"
>
<LinearLayout
android:id="@+id/llColumnStrip"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal"
>
</LinearLayout>
</HorizontalScrollView>
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1"
/>
<View
android:id="@+id/vFooterDivider2"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="?attr/colorImageButton"
/>
<ImageView
android:id="@+id/ivFooterToot"
app:srcCompat="?attr/ic_edit"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@drawable/btn_bg_ddd"
android:contentDescription="@string/toot"
/>
</LinearLayout>
</LinearLayout>
<LinearLayout style="@style/setting_row_form">
<TextView
style="@style/setting_row_label"
android:text="@string/button_background_color"
/>
</LinearLayout>
<LinearLayout style="@style/setting_row_form">
<Button
android:id="@+id/btnFooterBackgroundEdit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/edit"
/>
<Button
android:id="@+id/btnFooterBackgroundReset"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/reset"
/>
</LinearLayout>
<LinearLayout style="@style/setting_row_form">
<TextView
style="@style/setting_row_label"
android:text="@string/button_foreground_color"
/>
</LinearLayout>
<LinearLayout style="@style/setting_row_form">
<Button
android:id="@+id/btnFooterForegroundColorEdit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/edit"
android:textAllCaps="false"
/>
<Button
android:id="@+id/btnFooterForegroundColorReset"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/reset"
android:textAllCaps="false"
/>
</LinearLayout>
<LinearLayout style="@style/setting_row_form">
<TextView
style="@style/setting_row_label"
android:text="@string/tab_background_color"
/>
</LinearLayout>
<LinearLayout style="@style/setting_row_form">
<Button
android:id="@+id/btnTabBackgroundColorEdit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/edit"
android:textAllCaps="false"
/>
<Button
android:id="@+id/btnTabBackgroundColorReset"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/reset"
android:textAllCaps="false"
/>
</LinearLayout>
<LinearLayout style="@style/setting_row_form">
<TextView
style="@style/setting_row_label"
android:text="@string/tab_divider_color"
/>
</LinearLayout>
<LinearLayout style="@style/setting_row_form">
<Button
android:id="@+id/btnTabDividerColorEdit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/edit"
android:textAllCaps="false"
/>
<Button
android:id="@+id/btnTabDividerColorReset"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/reset"
android:textAllCaps="false"
/>
</LinearLayout>
<View style="@style/setting_divider"/>
<!--<TextView-->
<!--style="@style/setting_row_label"-->
<!--android:text="@string/actions"-->

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

@ -67,6 +67,7 @@
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="?attr/colorImageButton"
android:id="@+id/vFooterDivider1"
/>
<HorizontalScrollView
@ -94,6 +95,7 @@
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="?attr/colorImageButton"
android:id="@+id/vFooterDivider2"
/>
<ImageButton
android:id="@+id/btnToot"

16
app/src/main/res/raw/oss_license.txt
View File

@ -163,3 +163,19 @@ distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
====================================================
jrummyapps/colorpicker
https://github.com/jrummyapps/colorpicker
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

5
app/src/main/res/values-fr/strings.xml
View File

@ -295,5 +295,10 @@
<string name="send">Send</string>
<string name="word_was_muted">Word was muted.</string>
<string name="copy_complete">Clipboard updated.</string>
<string name="button_background_color">Button background color</string>
<string name="button_foreground_color">Button foreground color</string>
<string name="footer_color">Footer color</string>
<string name="tab_background_color">Tab background color</string>
<string name="tab_divider_color">Tab divider color</string>
</resources>

5
app/src/main/res/values-ja/strings.xml
View File

@ -291,4 +291,9 @@
<string name="send">共有</string>
<string name="word_was_muted">単語をミュートしました</string>
<string name="copy_complete">クリップボードにコピーしました</string>
<string name="button_background_color">ボタン背景色</string>
<string name="button_foreground_color">ボタン前景色</string>
<string name="footer_color">フッタの色</string>
<string name="tab_background_color">タブ背景色</string>
<string name="tab_divider_color">タブ両端の区切りの色</string>
</resources>

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

@ -28,11 +28,12 @@
<color name="Light_colorPostFormBackground">#eee</color>
<color name="Light_colorProfileBackgroundMask">#C0FFFFFF</color>
<color name="Light_colorBackground">#fff</color>
<color name="Light_colorColumnStripBackground">#fff</color>
<color name="Light_colorPrimaryDark">#303030</color>
<color name="Light_colorPrimaryDark">#303030</color> <!-- ステータスバー背景 -->
<!-- 以下は白テーマでも黒テーマでもだいたい同じ -->
<color name="Light_colorButtonSelected">#ff000080</color>
@ -43,7 +44,6 @@
<color name="Light_colorColumnListDeleteBackground">#FF0000</color>
<color name="Light_colorColumnListDeleteText">#fff</color>
<color name="Light_colorRegexFilterError">#f00</color>
<color name="Light_colorColumnStripBackground">#000000</color>
<!-- Dark theme -->
@ -76,10 +76,13 @@
<color name="Dark_colorPostFormBackground">#222</color>
<color name="Dark_colorProfileBackgroundMask">#C0000000</color>
<color name="Dark_colorBackground">#000</color>
<color name="Dark_colorColumnStripBackground">#000</color>
<color name="Dark_colorPrimaryDark">#222</color>
<color name="Dark_colorPrimaryDark">#222</color> <!-- ステータスバー背景 -->
<!-- 以下は白テーマでも黒テーマでもだいたい同じ -->
<color name="Dark_colorButtonSelected">#ff000080</color>
@ -90,6 +93,5 @@
<color name="Dark_colorColumnListDeleteBackground">#FF0000</color>
<color name="Dark_colorColumnListDeleteText">#fff</color>
<color name="Dark_colorRegexFilterError">#f00</color>
<color name="Dark_colorColumnStripBackground">#000</color>
</resources>

5
app/src/main/res/values/strings.xml
View File

@ -291,4 +291,9 @@
<string name="muted_word">Muted words</string>
<string name="word_was_muted">Word was muted.</string>
<string name="copy_complete">Clipboard updated.</string>
<string name="footer_color">Footer color</string>
<string name="button_background_color">Button background color</string>
<string name="button_foreground_color">Button foreground color</string>
<string name="tab_background_color">Tab background color</string>
<string name="tab_divider_color">Tab divider color</string>
</resources>

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

@ -2,6 +2,10 @@
<!-- light theme -->
<style name="AppTheme.Light" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="android:windowBackground">@drawable/window_background_light</item>
<item name="colorPrimary">@color/Light_colorPrimary</item>
<item name="colorPrimaryDark">@color/Light_colorPrimaryDark</item>
<item name="colorAccent">@color/Light_colorAccent</item>