Commit 544cab43 by Lee Jaebin

不要リソース削除、Studioのバージョンアップ( buildToolsVersion'27.0.3'→ '28.0.3', …

不要リソース削除、Studioのバージョンアップ(  buildToolsVersion'27.0.3'→ '28.0.3',     com.android.tools.build:gradleを'3.1.4'→'3.3.1')
parent 8c2bdcbe
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
android:versionName="@string/version_name" android:versionName="@string/version_name"
android:installLocation="internalOnly" > android:installLocation="internalOnly" >
<uses-sdk android:minSdkVersion="23" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
......
...@@ -3,7 +3,6 @@ buildscript { ...@@ -3,7 +3,6 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
//classpath 'com.android.tools.build:gradle:3.1.4'
classpath 'org.ajoberstar:gradle-git:0.12+' classpath 'org.ajoberstar:gradle-git:0.12+'
classpath 'com.google.gms:google-services:3.1.0' classpath 'com.google.gms:google-services:3.1.0'
} }
...@@ -19,7 +18,7 @@ dependencies { ...@@ -19,7 +18,7 @@ dependencies {
android { android {
compileSdkVersion 21 compileSdkVersion 21
buildToolsVersion '27.0.3' buildToolsVersion '28.0.3'
defaultConfig { defaultConfig {
minSdkVersion 23 minSdkVersion 23
......
...@@ -4,6 +4,4 @@ ...@@ -4,6 +4,4 @@
android:versionCode="1" android:versionCode="1"
android:versionName="1.0" > android:versionName="1.0" >
<uses-sdk android:minSdkVersion="15" />
</manifest> </manifest>
\ No newline at end of file
...@@ -2,15 +2,12 @@ buildscript { ...@@ -2,15 +2,12 @@ buildscript {
repositories { repositories {
jcenter() jcenter()
} }
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
}
} }
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
android { android {
compileSdkVersion 21 compileSdkVersion 21
buildToolsVersion '27.0.3' buildToolsVersion '28.0.3'
defaultConfig { defaultConfig {
minSdkVersion 15 minSdkVersion 15
......
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2010 The Android Open Source Project
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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_window_focused="false" android:state_enabled="true"
android:drawable="@drawable/com_btn_default_normal_transparent" />
<item android:state_window_focused="false" android:state_enabled="false"
android:drawable="@drawable/com_btn_default_disabled_transparent" />
<item android:state_pressed="true"
android:drawable="@drawable/com_btn_default_pressed_transparent" />
<item android:state_focused="true" android:state_enabled="true"
android:drawable="@drawable/com_btn_default_focused_transparent" />
<item android:state_enabled="true"
android:drawable="@drawable/com_btn_default_normal_transparent" />
<item android:state_focused="true"
android:drawable="@drawable/com_btn_default_disabled_focused_transparent" />
<item
android:drawable="@drawable/com_btn_default_disabled_transparent" />
</selector>
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:state_checked="true" android:drawable="@drawable/btn_default_holo_light" />
<item android:state_checked="false" android:drawable="@drawable/btn_default_transparent" />
</selector>
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:state_pressed="true"
android:drawable="@drawable/ic_home2_off"/>
<item
android:drawable="@drawable/ic_home2_on"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:state_pressed="true"
android:drawable="@drawable/ic_navigation_next_item_off"/>
<item
android:drawable="@drawable/ic_navigation_next_item_on"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:state_pressed="true"
android:drawable="@drawable/ic_navigation_previous_item_off"/>
<item
android:drawable="@drawable/ic_navigation_previous_item_on"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:state_pressed="true"
android:drawable="@drawable/ic_help_on"/>
<item
android:drawable="@drawable/ic_help_on"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:state_pressed="true"
android:drawable="@drawable/ic_project_home_on"/>
<item
android:drawable="@drawable/ic_project_home_off"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:state_pressed="true"
android:drawable="@drawable/ic_meeting_on"/>
<item
android:drawable="@drawable/ic_meeting_off"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:state_pressed="true"
android:drawable="@drawable/ic_push_message_on"/>
<item
android:drawable="@drawable/ic_push_message_off"/>
</selector>
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:state_pressed="true"
android:drawable="@drawable/ic_setting_on"/>
<item
android:drawable="@drawable/ic_setting"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:state_pressed="true"
android:drawable="@drawable/ic_show_list_off"/>
<item
android:drawable="@drawable/ic_show_list_on"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:state_pressed="true"
android:drawable="@drawable/icon_submenu_on"/>
<item
android:drawable="@drawable/icon_submenu_off"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2010 The Android Open Source Project
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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_window_focused="false" android:state_enabled="true" android:drawable="@drawable/textfield_default_holo_light" />
<item android:state_window_focused="false" android:state_enabled="false" android:drawable="@drawable/textfield_disabled_holo_light" />
<item android:state_enabled="true" android:state_focused="true" android:drawable="@drawable/textfield_activated_holo_light" />
<item android:state_enabled="true" android:drawable="@drawable/textfield_default_holo_light" />
<item android:state_focused="true" android:drawable="@drawable/textfield_disabled_focused_holo_light" />
<item android:drawable="@drawable/textfield_disabled_holo_light" />
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:state_pressed="true"
android:drawable="@drawable/icon_download_on"/>
<item
android:drawable="@drawable/icon_download_off"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:state_pressed="true"
android:drawable="@drawable/icon_home_on"/>
<item
android:drawable="@drawable/icon_home_off"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:state_pressed="true"
android:drawable="@drawable/icon_move_on"/>
<item
android:drawable="@drawable/icon_move_off"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:state_pressed="true"
android:drawable="@drawable/ic_search_pressed"/>
<item
android:drawable="@drawable/ic_search"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:state_pressed="true"
android:drawable="@drawable/ic_social_share_on"/>
<item
android:drawable="@drawable/ic_social_share_off"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_pressed="true"
android:drawable="@drawable/ic_sort_on"/>
<item
android:drawable="@drawable/ic_sort_off"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_checked="true"
android:state_pressed="true"
android:state_enabled="true"
android:drawable="@drawable/ic_location_all_pressed" />
<item
android:state_checked="true"
android:state_enabled="true"
android:drawable="@drawable/ic_location_all_pressed" />
<item
android:state_checked="false"
android:state_pressed="true"
android:state_enabled="true"
android:drawable="@drawable/ic_location_all_normal" />
<item
android:state_checked="false"
android:state_enabled="true"
android:drawable="@drawable/ic_location_all_normal" />
<item
android:state_enabled="false"
android:drawable="@drawable/ic_location_all_disabled"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_checked="true"
android:state_pressed="true"
android:state_enabled="true"
android:drawable="@drawable/btn_radio_center_on" />
<item
android:state_checked="true"
android:state_enabled="true"
android:drawable="@drawable/btn_radio_center_on" />
<item
android:state_checked="false"
android:state_pressed="true"
android:state_enabled="true"
android:drawable="@drawable/btn_radio_center_off" />
<item
android:state_checked="false"
android:state_enabled="true"
android:drawable="@drawable/btn_radio_center_off" />
<item
android:state_enabled="false"
android:drawable="@drawable/btn_radio_center_disabled" />
</selector>
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_checked="true"
android:state_pressed="true"
android:state_enabled="true"
android:drawable="@drawable/ic_location_cloud_pressed" />
<item
android:state_checked="true"
android:state_enabled="true"
android:drawable="@drawable/ic_location_cloud_pressed" />
<item
android:state_checked="false"
android:state_pressed="true"
android:state_enabled="true"
android:drawable="@drawable/ic_location_cloud_normal" />
<item
android:state_checked="false"
android:state_enabled="true"
android:drawable="@drawable/ic_location_cloud_normal" />
<item
android:state_enabled="false"
android:drawable="@drawable/ic_location_cloud_disabled"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_checked="true"
android:state_pressed="true"
android:state_enabled="true"
android:drawable="@drawable/ic_location_device_pressed" />
<item
android:state_checked="true"
android:state_enabled="true"
android:drawable="@drawable/ic_location_device_pressed" />
<item
android:state_checked="false"
android:state_pressed="true"
android:state_enabled="true"
android:drawable="@drawable/ic_location_device_normal" />
<item
android:state_checked="false"
android:state_enabled="true"
android:drawable="@drawable/ic_location_device_normal" />
<item
android:state_enabled="false"
android:drawable="@drawable/ic_location_device_disabled"/>
</selector>
\ No newline at end of file
...@@ -505,9 +505,6 @@ ...@@ -505,9 +505,6 @@
<string name="bbs_title">掲示板</string> <string name="bbs_title">掲示板</string>
<string name="msg_only_pament_member">この機能はゲストユーザーが使えません。</string> <string name="msg_only_pament_member">この機能はゲストユーザーが使えません。</string>
<!-- Added Ver1.5.2KT KTSaaS -->
<string name="msg_not_installed_mshop">mShopアプリがインストールされてません。インストールしますか?</string>
<!-- 使用しないStringリスト --> <!-- 使用しないStringリスト -->
<string name="folder_edit">フォルダ編集</string> <string name="folder_edit">フォルダ編集</string>
<string name="folder_add">フォルダ追加</string> <string name="folder_add">フォルダ追加</string>
......
...@@ -505,9 +505,6 @@ ...@@ -505,9 +505,6 @@
<string name="bbs_title">게시판</string> <string name="bbs_title">게시판</string>
<string name="msg_only_pament_member">회원용 기능입니다.</string> <string name="msg_only_pament_member">회원용 기능입니다.</string>
<!-- Added Ver1.5.2KT KTSaaS -->
<string name="msg_not_installed_mshop">mShop어플리케이션이 인스톨 되어있지 않습니다.인스톨 하시겠습니까?</string>
<!-- 사용하지않는 String리스트 --> <!-- 사용하지않는 String리스트 -->
<string name="folder_edit">폴더 편집</string> <string name="folder_edit">폴더 편집</string>
<string name="folder_add">폴더 추가</string> <string name="folder_add">폴더 추가</string>
......
...@@ -505,9 +505,6 @@ ...@@ -505,9 +505,6 @@
<string name="bbs_title">BBS</string> <string name="bbs_title">BBS</string>
<string name="msg_only_pament_member">Guest user cannot use this function.</string> <string name="msg_only_pament_member">Guest user cannot use this function.</string>
<!-- Added Ver1.5.2KT KTSaaS -->
<string name="msg_not_installed_mshop">mShop application is not installed. Do you want to install?</string>
<!-- Appears to be unused List --> <!-- Appears to be unused List -->
<string name="folder_edit">Edit folder</string> <string name="folder_edit">Edit folder</string>
<string name="folder_add">Add folder</string> <string name="folder_add">Add folder</string>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
android:versionCode="1" android:versionCode="1"
android:versionName="1.0"> android:versionName="1.0">
<uses-sdk android:minSdkVersion="17" tools:overrideLibrary="org.xwalk.core"/> <uses-sdk tools:overrideLibrary="org.xwalk.core"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
......
...@@ -27,7 +27,7 @@ dependencies { ...@@ -27,7 +27,7 @@ dependencies {
android { android {
compileSdkVersion 26 compileSdkVersion 26
buildToolsVersion '27.0.3' buildToolsVersion '28.0.3'
defaultConfig { defaultConfig {
minSdkVersion 15 minSdkVersion 15
......
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/LinearLayout1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/mydata_bg"
android:orientation="vertical" >
<RelativeLayout
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="@dimen/toolbar_min_size">
<TextView
android:id="@+id/popup_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:gravity="center"
android:paddingTop="5dp"
android:text="@string/dummy_str"
android:textColor="@color/text_color"
android:textSize="@dimen/app_normal_text_size"
android:maxLines="1" />
<Button
android:id="@+id/popup_title_left"
style="@style/ButtonABookLight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:paddingRight="10dp"
android:text="@string/dummy_str"
android:textSize="@dimen/app_normal_text_size"
android:visibility="gone"
android:maxLines="1" />
<Button
android:id="@+id/popup_right_title"
style="@style/ButtonABookLight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:paddingLeft="10dp"
android:text="@string/dummy_str"
android:textSize="@dimen/app_normal_text_size"
android:visibility="gone"
android:maxLines="1" />
</RelativeLayout>
<LinearLayout
android:id="@+id/listLayout"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="5dp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:paddingLeft="3dp"
android:paddingRight="3dp"
android:layout_weight="1"
android:background="@drawable/radius_frame"
android:orientation="vertical" >
<ListView
android:id="@+id/popup_list_menu"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="#cccccc"
android:dividerHeight="1px"
android:fadingEdge="none"
android:scrollingCache="false"
android:background="@color/list_background" >
</ListView>
<LinearLayout
android:id="@+id/empty_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" >
<TextView
android:id="@+id/empty_list_item"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
android:textColor="@color/text_select"
android:paddingLeft="?android:attr/expandableListPreferredItemPaddingLeft"
android:textAppearance="?android:attr/textAppearanceLarge" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
...@@ -3,11 +3,6 @@ ...@@ -3,11 +3,6 @@
<!-- Generated with http://android-holo-colors.com --> <!-- Generated with http://android-holo-colors.com -->
<resources xmlns:android="http://schemas.android.com/apk/res/android"> <resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="EditTextABook" parent="android:Widget.EditText">
<item name="android:background">@drawable/edit_text_holo_light</item>
<item name="android:textColor">#FFFFFF</item>
</style>
<style name="CheckBoxABook" parent="android:Widget.CompoundButton.CheckBox"> <style name="CheckBoxABook" parent="android:Widget.CompoundButton.CheckBox">
<item name="android:button">@drawable/btn_check_holo_light</item> <item name="android:button">@drawable/btn_check_holo_light</item>
</style> </style>
...@@ -33,11 +28,6 @@ ...@@ -33,11 +28,6 @@
<item name="android:textColor">@color/text_color</item> <item name="android:textColor">@color/text_color</item>
</style> </style>
<style name="ButtonABookTransparent" parent="ButtonABook">
<item name="android:background">@drawable/btn_default_transparent</item>
<item name="android:textColor">@color/text_select</item>
</style>
<style name="ButtonABookGray" parent="ButtonABook"> <style name="ButtonABookGray" parent="ButtonABook">
<item name="android:background">@drawable/btn_default_holo_gray</item> <item name="android:background">@drawable/btn_default_holo_gray</item>
<item name="android:textColor">@color/text_select</item> <item name="android:textColor">@color/text_select</item>
......
...@@ -6,7 +6,7 @@ buildscript { ...@@ -6,7 +6,7 @@ buildscript {
google() google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.1.4' classpath 'com.android.tools.build:gradle:3.3.1'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
} }
......
#Tue Mar 07 11:37:49 JST 2017 #Tue Feb 19 13:41:26 JST 2019
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
...@@ -2,7 +2,7 @@ apply plugin: 'com.android.library' ...@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion 21 compileSdkVersion 21
buildToolsVersion '27.0.3' buildToolsVersion '28.0.3'
defaultConfig { defaultConfig {
minSdkVersion 16 minSdkVersion 16
......
...@@ -3,7 +3,4 @@ ...@@ -3,7 +3,4 @@
android:versionCode="1" android:versionCode="1"
android:versionName="1.0" > android:versionName="1.0" >
<uses-sdk
android:minSdkVersion="16"
android:targetSdkVersion="21" />
</manifest> </manifest>
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 to comment