fenix
/
Simple-Draw
mirror of https://github.com/SimpleMobileTools/Simple-Draw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updating kotlin, commons, gradle

This commit is contained in:
tibbi 2019-09-02 15:46:26 +02:00
parent eb9e427382
commit f4bc29be09
9 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle
View File

@ -17,6 +17,7 @@ android {
versionCode 46
versionName "6.0.4"
setProperty("archivesBaseName", "draw")
vectorDrawables.useSupportLibrary = true
}
signingConfigs {
@ -50,5 +51,5 @@ android {
}
dependencies {
implementation 'com.simplemobiletools:commons:5.13.14'
implementation 'com.simplemobiletools:commons:5.16.17'
}

4
app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/MainActivity.kt
View File

@ -147,8 +147,8 @@ class MainActivity : SimpleActivity(), CanvasListener {
val faqItems = arrayListOf(
FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons),
FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons)
)
FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons),
FAQItem(R.string.faq_7_title_commons, R.string.faq_7_text_commons))
startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, false)
}

2
app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/SplashActivity.kt
View File

@ -4,8 +4,6 @@ import android.content.Intent
import com.simplemobiletools.commons.activities.BaseSplashActivity
class SplashActivity : BaseSplashActivity() {
override fun getAppPackageName() = packageName
override fun initActivity() {
startActivity(Intent(this, MainActivity::class.java))
finish()

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

@ -17,7 +17,7 @@
android:layout_height="@dimen/normal_icon_size"
android:layout_toLeftOf="@+id/eraser"
android:padding="@dimen/medium_margin"
android:src="@drawable/ic_redo_big"
android:src="@drawable/ic_redo_vector"
android:visibility="gone"/>
<ImageView
@ -41,7 +41,7 @@
android:layout_alignParentRight="true"
android:layout_below="@id/color_picker"
android:padding="@dimen/medium_margin"
android:src="@drawable/ic_undo_big"
android:src="@drawable/ic_undo_vector"
android:visibility="gone"/>
<ImageView

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

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/settings_scrollview"
android:layout_width="match_parent"
@ -30,7 +29,7 @@
android:layout_centerVertical="true"
android:paddingStart="@dimen/medium_margin"
android:paddingLeft="@dimen/medium_margin"
android:text="@string/customize_colors"/>
android:text="@string/customize_colors" />
</RelativeLayout>
@ -54,7 +53,7 @@
android:paddingStart="@dimen/medium_margin"
android:paddingLeft="@dimen/medium_margin"
android:text="@string/use_english_language"
app:switchPadding="@dimen/medium_margin"/>
app:switchPadding="@dimen/medium_margin" />
</RelativeLayout>
@ -78,7 +77,7 @@
android:paddingStart="@dimen/medium_margin"
android:paddingLeft="@dimen/medium_margin"
android:text="@string/prevent_phone_from_sleeping"
app:switchPadding="@dimen/medium_margin"/>
app:switchPadding="@dimen/medium_margin" />
</RelativeLayout>
@ -102,7 +101,7 @@
android:paddingStart="@dimen/medium_margin"
android:paddingLeft="@dimen/medium_margin"
android:text="@string/show_brush_size"
app:switchPadding="@dimen/medium_margin"/>
app:switchPadding="@dimen/medium_margin" />
</RelativeLayout>
@ -126,7 +125,7 @@
android:paddingStart="@dimen/medium_margin"
android:paddingLeft="@dimen/medium_margin"
android:text="@string/allow_zooming_canvas"
app:switchPadding="@dimen/medium_margin"/>
app:switchPadding="@dimen/medium_margin" />
</RelativeLayout>
@ -150,7 +149,7 @@
android:paddingStart="@dimen/medium_margin"
android:paddingLeft="@dimen/medium_margin"
android:text="@string/force_portrait_mode"
app:switchPadding="@dimen/medium_margin"/>
app:switchPadding="@dimen/medium_margin" />
</RelativeLayout>
</LinearLayout>

24
app/src/main/res/menu/menu.xml
View File

@ -1,40 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_confirm"
android:icon="@drawable/ic_check"
android:icon="@drawable/ic_check_vector"
android:title="@string/save"
app:showAsAction="ifRoom"/>
app:showAsAction="ifRoom" />
<item
android:id="@+id/menu_save"
android:icon="@drawable/ic_save"
android:icon="@drawable/ic_save_vector"
android:title="@string/save"
app:showAsAction="ifRoom"/>
app:showAsAction="ifRoom" />
<item
android:id="@+id/clear"
android:icon="@drawable/ic_clear"
android:title="@string/clear"
app:showAsAction="ifRoom"/>
app:showAsAction="ifRoom" />
<item
android:id="@+id/menu_share"
android:icon="@drawable/ic_share"
android:icon="@drawable/ic_share_vector"
android:title="@string/share"
app:showAsAction="ifRoom"/>
app:showAsAction="ifRoom" />
<item
android:id="@+id/open_file"
android:title="@string/open_file"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/change_background"
android:title="@string/change_background_color"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/settings"
android:title="@string/settings"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/about"
android:title="@string/about"
app:showAsAction="never"/>
app:showAsAction="never" />
</menu>

1
app/src/main/res/values/donottranslate.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="package_name">com.simplemobiletools.draw.pro</string>
<!-- Release notes -->
<string name="release_38">Added optional zooming, has to be enabled in the app settings</string>

4
build.gradle
View File

@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.3.31'
ext.kotlin_version = '1.3.50'
repositories {
google()
@ -9,7 +9,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.1'
classpath 'com.android.tools.build:gradle:3.5.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Fri Jun 14 16:17:22 CEST 2019
#Mon Sep 02 15:32:18 CEST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip