Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
abook_check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_android
abook_check
Commits
3388f245
Commit
3388f245
authored
Sep 04, 2019
by
Lee Jaebin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
一括同期ボタンのリソース追加、要らないリソース削除
parent
e7453f77
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
13 additions
and
17 deletions
+13
-17
ABVJE_Res_Default_Android/res/drawable-xhdpi/ic_batch_sync_off.png
+0
-0
ABVJE_Res_Default_Android/res/drawable-xhdpi/ic_batch_sync_on.png
+0
-0
ABVJE_Res_Default_Android/res/drawable-xhdpi/ic_filter.png
+0
-0
ABVJE_Res_Default_Android/res/drawable-xhdpi/ic_filter_selected.png
+0
-0
ABVJE_Res_Default_Android/res/drawable-xhdpi/ic_group_operation.png
+0
-0
ABVJE_Res_Default_Android/res/drawable/btn_operation_batch_sync.xml
+9
-0
ABVJE_UI_Android/res/layout-large/ac_operation_list.xml
+1
-1
ABVJE_UI_Android/res/layout-normal/ac_operation_list.xml
+1
-1
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
+2
-15
No files found.
ABVJE_Res_Default_Android/res/drawable-xhdpi/ic_batch_sync_off.png
0 → 100644
View file @
3388f245
1.02 KB
ABVJE_Res_Default_Android/res/drawable-xhdpi/ic_batch_sync.png
→
ABVJE_Res_Default_Android/res/drawable-xhdpi/ic_batch_sync
_on
.png
View file @
3388f245
File moved
ABVJE_Res_Default_Android/res/drawable-xhdpi/ic_filter.png
deleted
100755 → 0
View file @
e7453f77
484 Bytes
ABVJE_Res_Default_Android/res/drawable-xhdpi/ic_filter_selected.png
deleted
100644 → 0
View file @
e7453f77
647 Bytes
ABVJE_Res_Default_Android/res/drawable-xhdpi/ic_group_operation.png
deleted
100644 → 0
View file @
e7453f77
855 Bytes
ABVJE_Res_Default_Android/res/drawable/btn_operation_batch_sync.xml
0 → 100644
View file @
3388f245
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<item
android:state_enabled=
"false"
android:drawable=
"@drawable/ic_batch_sync_off"
/>
<item
android:drawable=
"@drawable/ic_batch_sync_on"
/>
</selector>
\ No newline at end of file
ABVJE_UI_Android/res/layout-large/ac_operation_list.xml
View file @
3388f245
...
...
@@ -53,7 +53,7 @@
android:id=
"@+id/btn_batch_sync"
style=
"@style/ToolBarIcon"
android:layout_toLeftOf=
"@+id/btn_sort"
android:src=
"@drawable/
ic
_batch_sync"
android:src=
"@drawable/
btn_operation
_batch_sync"
android:visibility=
"gone"
/>
<ImageButton
...
...
ABVJE_UI_Android/res/layout-normal/ac_operation_list.xml
View file @
3388f245
...
...
@@ -55,7 +55,7 @@
style=
"@style/ToolBarIcon"
android:layout_marginRight=
"10dp"
android:layout_toLeftOf=
"@+id/btn_sort"
android:src=
"@drawable/
ic
_batch_sync"
android:src=
"@drawable/
btn_operation
_batch_sync"
android:visibility=
"gone"
/>
<ImageButton
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
View file @
3388f245
...
...
@@ -409,19 +409,6 @@ public class OperationListActivity extends ABVUIActivity {
return
!(
StringUtil
.
isNullOrEmpty
(
mSearchWord
)
&&
StringUtil
.
isNullOrEmpty
(
mStartDateStr
)
&&
StringUtil
.
isNullOrEmpty
(
mEndDateStr
));
}
// イメージボタンを無効/有効にする
private
void
setEnabledImageButton
(
ImageButton
button
,
boolean
enabled
)
{
if
(
enabled
)
{
// 活性化
button
.
setEnabled
(
true
);
button
.
setColorFilter
(
null
);
}
else
{
// 非活性化
button
.
setEnabled
(
false
);
button
.
setColorFilter
(
0xaa808080
);
}
}
// カテゴリのアイコンイメージ設定
private
void
setCategoryImage
(
boolean
isCategory
)
{
mCategoryLocationButton
.
setImageResource
(
isCategory
?
R
.
drawable
.
ic_category_on
:
R
.
drawable
.
ic_category_off
);
...
...
@@ -1777,10 +1764,10 @@ public class OperationListActivity extends ABVUIActivity {
public
void
checkBatchNeedSyncButton
(
Integer
operationGroupMasterId
)
{
if
(
mOperationDao
.
hasNeedSyncOperationByGroupMasterId
(
operationGroupMasterId
))
{
// 選択したカテゴリ一覧でneedSyncFlgがtrueの作業が存在すれば、活性化する
setEnabledImageButton
(
mOperationBatchSyncButton
,
true
);
mOperationBatchSyncButton
.
setEnabled
(
true
);
}
else
{
// 一括同期ボタンを非活性化する
setEnabledImageButton
(
mOperationBatchSyncButton
,
false
);
mOperationBatchSyncButton
.
setEnabled
(
false
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment