Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
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
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • abook_android
  • abook_check
  • Merge Requests
  • !260

Merged
Opened Jan 26, 2023 by Kazuyuki Hida@hida-k 
  • Report abuse
Report abuse

ダッシュボードの追加

ダッシュボードをActivityとして追加。

Edited Jan 26, 2023 by Kazuyuki Hida
  • Discussion 10
  • Commits 7
  • Changes 15
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Jan 26, 2023
    ABVJE_Res_Default_Android/res/drawable/btn_operation_dashboard.xml 0 → 100644
    1 <?xml version="1.0" encoding="utf-8"?>
    2 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
    3 <item
    4 android:state_enabled="false"
    5 android:drawable="@drawable/ic_dashboard_off"/>
    6 <item
    7 android:drawable="@drawable/ic_dashboard_on"/>
    8 </selector>
    • Kazuyuki Hida @hida-k commented Jan 26, 2023
      Developer

      ダッシュボードボタンのためのアイコンです

      ダッシュボードボタンのためのアイコンです
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Jan 26, 2023
    ABVJE_Res_Default_Android/res/drawable/ic_dashboard_off.xml 0 → 100644
    1 <vector android:height="30dp" android:viewportHeight="90"
    2 android:viewportWidth="90" android:width="30dp" xmlns:android="http://schemas.android.com/apk/res/android">
    3 <path android:fillColor="#333333" android:pathData="M40.9,49.2H8.8V13h32.1V49.2zM40.9,57.1H8.8v19.8h32.1V57.1zM81.1,13H49v20.2h32.1V13zM81.2,41H49.1v36h32.1L81.2,41L81.2,41z"/>
    4 </vector>
    • Kazuyuki Hida @hida-k commented Jan 26, 2023
      Developer

      ダッシュボードボタンのためのアイコンです

      ダッシュボードボタンのためのアイコンです
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Jan 26, 2023
    ABVJE_Res_Default_Android/res/drawable/ic_dashboard_on.xml 0 → 100644
    1 <vector android:height="30dp" android:viewportHeight="90"
    2 android:viewportWidth="90" android:width="30dp" xmlns:android="http://schemas.android.com/apk/res/android">
    3 <path android:fillColor="#A5A5A5" android:pathData="M40.9,49.2H8.8V13h32.1V49.2zM40.9,57.1H8.8v19.8h32.1V57.1zM81.1,13H49v20.2h32.1V13zM81.2,41H49.1v36h32.1L81.2,41L81.2,41z"/>
    4 </vector>
    • Kazuyuki Hida @hida-k commented Jan 26, 2023
      Developer

      ダッシュボードボタンのためのアイコンです

      ダッシュボードボタンのためのアイコンです
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Jan 26, 2023
    ABVJE_UI_Android/AndroidManifest.xml
    12 <uses-permission android:name="android.permission.BLUETOOTH"/>
    10 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
    11 <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
    12 <uses-permission android:name="android.permission.BLUETOOTH" />
    13 13 <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
    14
    15 14 <uses-permission android:name="android.permission.GET_ACCOUNTS" />
    16 15 <uses-permission android:name="android.permission.NFC" />
    17 16 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    18 17 <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
    19 18
    20 </manifest>
    19 <application>
    20 <activity android:name="jp.agentec.abook.abv.ui.home.activity.DashboardActivity"></activity>
    21 </application>
    22
    • Kazuyuki Hida @hida-k commented Jan 26, 2023
      Developer

      DashboardActivityを追加

      `DashboardActivity`を追加
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Jan 26, 2023
    ABVJE_UI_Android/build.gradle
    38 main {
    39 manifest.srcFile 'AndroidManifest.xml'
    40 java.srcDirs = ['src']
    41 resources.srcDirs = ['res']
    42 aidl.srcDirs = ['src']
    43 res.srcDirs = ['res']
    44 44
    45 45
    46 jniLibs.srcDirs = ['libs', 'xwalk_core_library/src/main/jniLibs']
    46 jniLibs.srcDirs = ['libs', 'xwalk_core_library/src/main/jniLibs']
    47 }
    47 48 }
    48 }
    49 49 lintOptions {
    50 50 quiet true
    51 51 checkReleaseBuilds false
    • Kazuyuki Hida @hida-k commented Jan 26, 2023
      Developer

      インデントをそろえただけです。

      インデントをそろえただけです。
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Jan 26, 2023
    ABVJE_UI_Android/res/drawable/ic_reload.xml 0 → 100644
    1 <vector android:height="30dp" android:viewportHeight="90"
    2 android:viewportWidth="90" android:width="30dp" xmlns:android="http://schemas.android.com/apk/res/android">
    3 <path android:fillColor="#FFFFFF" android:pathData="M15.1,10.3h21.5c2.6,0 4.8,2.1 4.8,4.8v21.5c0,2.6 -2.1,4.8 -4.8,4.8c-2.6,0 -4.8,-2.1 -4.8,-4.8v-9.5c-5.9,4.5 -9.5,11.5 -9.5,19.1c0,13.2 10.7,23.9 23.9,23.9s23.9,-10.7 23.9,-23.9c0,-5.2 -1.6,-10.2 -4.8,-14.3c-1.6,-2.1 -1.2,-5.1 1,-6.7c2.1,-1.6 5.1,-1.2 6.7,1c4.4,5.8 6.7,12.8 6.7,20c0,18.4 -15,33.4 -33.4,33.4s-33.4,-15 -33.4,-33.4c0,-10.3 4.9,-20 12.9,-26.3H15.1c-2.6,0 -4.8,-2.1 -4.8,-4.8S12.5,10.3 15.1,10.3z"/>
    4 </vector>
    • Kazuyuki Hida @hida-k commented Jan 26, 2023
      Developer

      ダッシュボードボタンのためのアイコンです

      ダッシュボードボタンのためのアイコンです
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Jan 26, 2023
    ABVJE_UI_Android/res/layout/ac_operation_dashboard.xml 0 → 100644
    1 <?xml version="1.0" encoding="utf-8"?>
    • Kazuyuki Hida @hida-k commented Jan 26, 2023
      Developer

      ダッシュボードのレイアウトです。 既存のHtmlWebViewActivityのものから、不要なものを省いたものになっています。

      ダッシュボードのレイアウトです。 既存のHtmlWebViewActivityのものから、不要なものを省いたものになっています。
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Jan 26, 2023
    ABVJE_UI_Android/res/layout/operation_common_toolbar.xml
    11 11 android:visibility="visible">
    12 12
    13
    14 <LinearLayout
    15 android:layout_width="wrap_content"
    16 android:layout_height="wrap_content"
    17 android:layout_gravity="center"
    18 android:layout_weight="1"
    19 android:gravity="center">
    20
    21 <ImageButton
    22 android:id="@+id/btn_operation_dashboard"
    23 style="@style/ToolBarIcon"
    24 android:src="@drawable/btn_operation_dashboard" />
    25 </LinearLayout>
    26
    • Kazuyuki Hida @hida-k commented Jan 26, 2023
      Developer

      ダッシュボードに遷移するためのアイコンを追加

      ダッシュボードに遷移するためのアイコンを追加
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Jan 26, 2023
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationActivity.java
    36 38
    37 39 protected void createCommonToolber() {
    38 40 // ホームボタン
    39 mOperationHomeButton = (ImageButton) findViewById(R.id.btn_operation_home);
    41 mOperationHomeButton = findViewById(R.id.btn_operation_home);
    42 mOperationHomeButton.setOnClickListener(new View.OnClickListener() {
    43 @Override
    44 public void onClick(View v) {
    45 backHome();
    46 }
    47 });
    • Kazuyuki Hida @hida-k commented Jan 26, 2023
      Developer

      Homeだけ特別扱いになっていたので、明示的にHomeに戻るように変更しました。

      Homeだけ特別扱いになっていたので、明示的にHomeに戻るように変更しました。
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Jan 26, 2023
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationRelatedContentActivity.java
    291 291 */
    292 292 private void setOnButtonEvent() {
    293 293 // プロジェクトホーム画面へ
    294 mOperationHomeButton.setOnClickListener(new View.OnClickListener() {
    295 @Override
    296 public void onClick(View v) {
    297 finish();
    298 }
    299 });
    294 // mOperationHomeButton.setOnClickListener(new View.OnClickListener() {
    295 // @Override
    296 // public void onClick(View v) {
    297 // finish();
    298 // }
    299 // });
    • Kazuyuki Hida @hida-k commented Jan 26, 2023
      Developer

      Homeだけ特別扱いになっていたので、明示的にHomeに戻るように変更しました。

      Homeだけ特別扱いになっていたので、明示的にHomeに戻るように変更しました。
    Please register or sign in to reply
  • Kazuyuki Hida @hida-k

    unmarked as a Work In Progress

    Jan 26, 2023

    unmarked as a Work In Progress

    unmarked as a **Work In Progress**
    Toggle commit list
  • Kazuyuki Hida @hida-k

    assigned to @seo

    Jan 26, 2023

    assigned to @seo

    assigned to @seo
    Toggle commit list
  • Kazuyuki Hida @hida-k

    added 1 commit

    • fe19586a - 型の不整合を修正

    Compare with previous version

    Jan 26, 2023

    added 1 commit

    • fe19586a - 型の不整合を修正

    Compare with previous version

    added 1 commit * fe19586a - 型の不整合を修正 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/260/diffs?diff_id=10700&start_sha=36df83670e9eb9d997de108e7ca45e552ce2591a)
    Toggle commit list
  • Yujin Seo @seo

    merged

    Jan 27, 2023

    merged

    merged
    Toggle commit list
  • Yujin Seo @seo

    mentioned in commit b2b48d1c

    Jan 27, 2023

    mentioned in commit b2b48d1c

    mentioned in commit b2b48d1c327bace6f53afda4a73470a55fca1a01
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Yujin Seo
Assignee
Yujin Seo @seo
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: abook_android/abook_check!260
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.