Merge pull request #3 from derysudrajat/011-dev

change package to io.github.derysudrajat.mathview

app/build.gradle

@@ -3,16 +3,22 @@ plugins {
     id 'kotlin-android'
 }
 
+ext.majorVersion = 0
+ext.minorVersion = 1
+ext.patchVersion = 1
+ext.preRelease = "dev"
+ext.minSdkVersion = 21
+
 android {
     compileSdkVersion 30
     buildToolsVersion "30.0.3"
 
     defaultConfig {
-        applicationId "com.derysudrajat.mathsample"
-        minSdkVersion 21
+        applicationId "io.github.derysudrajat.mathsample"
+        minSdkVersion project.ext.minSdkVersion
         targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
+        versionCode generateVersionCode()
+        versionName generateVersionName()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -35,6 +41,16 @@ android {
     }
 }
 
+private Integer generateVersionCode() {
+    return ext.minSdkVersion * 10000000 + ext.majorVersion * 10000 + ext.minorVersion * 100 + ext.patchVersion
+}
+
+private String generateVersionName() {
+    String versionName = "${ext.majorVersion}.${ext.minorVersion}.${ext.patchVersion}"
+    if (ext.preRelease != null && !ext.preRelease.isEmpty()) versionName = versionName + "-" + ext.preRelease
+    return versionName
+}
+
 dependencies {
     implementation project(":mathview")
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

app/src/androidTest/java/com/derysudrajat/mathsample/ExampleInstrumentedTest.kt → app/src/androidTest/java/io/github/derysudrajat/mathsample/ExampleInstrumentedTest.kt

@@ -1,13 +1,11 @@
-package com.derysudrajat.mathsample
+package io.github.derysudrajat.mathsample
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *

app/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.derysudrajat.mathsample">
+    package="io.github.derysudrajat.mathsample">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:allowBackup="true"
@@ -11,7 +11,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.MathView">
-        <activity android:name=".mathsample.MainActivity">
+        <activity android:name="io.github.derysudrajat.mathsample.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/com/derysudrajat/mathsample/MainActivity.kt → app/src/main/java/io/github/derysudrajat/mathsample/MainActivity.kt

@@ -1,8 +1,8 @@
-package com.derysudrajat.mathsample
+package io.github.derysudrajat.mathsample
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.derysudrajat.mathsample.databinding.ActivityMainBinding
+import io.github.derysudrajat.mathsample.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
 

app/src/main/res/layout/activity_main.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".mathsample.MainActivity">
+    tools:context="io.github.derysudrajat.mathsample.MainActivity">
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/tilInputMath"
@@ -35,7 +35,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tilInputMath" />
 
-    <com.derysudrajat.mathview.MathView
+    <io.github.derysudrajat.mathview.MathView
         android:id="@+id/mathView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
 </adaptive-icon>

app/src/main/res/values-night/themes.xml

@@ -2,12 +2,12 @@
     <!-- Base application theme. -->
     <style name="Theme.MathView" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryVariant">@color/primary</item>
         <item name="colorOnPrimary">@color/black</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
+        <item name="colorSecondary">@color/primary</item>
+        <item name="colorSecondaryVariant">@color/primary</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>

app/src/main/res/values/colors.xml

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
+    <color name="primary">#76081C</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
 </resources>

app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#76081C</color>
+</resources>

app/src/main/res/values/themes.xml

@@ -2,12 +2,12 @@
     <!-- Base application theme. -->
     <style name="Theme.MathView" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryVariant">@color/primary</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
+        <item name="colorSecondary">@color/primary</item>
+        <item name="colorSecondaryVariant">@color/primary</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>

mathview/src/test/java/com/derysudrajat/mathview/ExampleUnitTest.kt → app/src/test/java/io/github/derysudrajat/mathsample/ExampleUnitTest.kt

@@ -1,9 +1,8 @@
-package com.derysudrajat.mathview
+package io.github.derysudrajat.mathsample
 
+import org.junit.Assert.assertEquals
 import org.junit.Test
 
-import org.junit.Assert.*
-
 /**
  * Example local unit test, which will execute on the development machine (host).
  *

mathview/src/androidTest/java/com/derysudrajat/mathview/ExampleInstrumentedTest.kt → mathview/src/androidTest/java/io/github/derysudrajat/mathview/ExampleInstrumentedTest.kt

@@ -1,13 +1,11 @@
-package com.derysudrajat.mathview
+package io.github.derysudrajat.mathview
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *