Merge pull request #11 from CraveFood/fix-id-conflits

Renamed all resources files to avoid IDs conflicts

app/build.gradle

@@ -1,7 +1,5 @@
 apply plugin: 'com.android.application'
-
 apply plugin: 'kotlin-android'
-
 apply plugin: 'kotlin-android-extensions'
 
 android {
@@ -32,4 +30,4 @@ dependencies {
     androidTestImplementation 'androidx.test:runner:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
     implementation project(':cravecalculator')
-}
+}

app/src/main/AndroidManifest.xml

@@ -5,7 +5,7 @@
     <application
             android:allowBackup="true"
             android:icon="@mipmap/ic_launcher"
-            android:label="@string/app_name"
+            android:label="@string/c_calc_app_name"
             android:roundIcon="@mipmap/ic_launcher_round"
             android:supportsRtl="true"
             android:theme="@style/AppTheme">

build.gradle

@@ -1,5 +1,3 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     ext.kotlin_version = '1.3.21'
     repositories {
@@ -8,10 +6,8 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
     }
 }
 
@@ -25,4 +21,4 @@ allprojects {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}

cravecalculator/build.gradle

@@ -4,31 +4,23 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 28
-
-
-
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
     }
-
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'

cravecalculator/src/main/java/com/cravefood/cravecalculator/CalculatorFragment.kt

@@ -9,7 +9,7 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
-import kotlinx.android.synthetic.main.calculator_fragment.*
+import kotlinx.android.synthetic.main.c_calc_fragment.*
 
 
 class CalculatorFragment : Fragment() {
@@ -19,7 +19,7 @@ class CalculatorFragment : Fragment() {
     private var onConfirmListener: ((Double) -> Unit)? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.calculator_fragment, container, false)
+        return inflater.inflate(R.layout.c_calc_fragment, container, false)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {

cravecalculator/src/main/res/drawable/ripple_cancel_button.xml → cravecalculator/src/main/res/drawable/c_calc_ripple_cancel_button.xml

@@ -2,5 +2,5 @@
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
         android:color="?android:colorControlHighlight">
   <item android:id="@android:id/mask"
-        android:drawable="@drawable/shape_cancel_button"/>
+        android:drawable="@drawable/c_calc_shape_cancel_button"/>
 </ripple>

cravecalculator/src/main/res/drawable/ripple_confirm_button.xml → cravecalculator/src/main/res/drawable/c_calc_ripple_confirm_button.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
         android:color="?android:colorControlHighlight">
-  <item android:drawable="@drawable/shape_confirm_button"/>
+  <item android:drawable="@drawable/c_calc_shape_confirm_button"/>
 </ripple>

cravecalculator/src/main/res/drawable/c_calc_ripple_equal_button.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/cCalColorRippleButton">
+  <item android:drawable="@drawable/c_calc_shape_equal_button"/>
+</ripple>

cravecalculator/src/main/res/drawable/ripple_numbers_button.xml → cravecalculator/src/main/res/drawable/c_calc_ripple_numbers_button.xml

@@ -2,5 +2,5 @@
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
         android:color="?android:colorControlHighlight">
   <item android:id="@android:id/mask"
-        android:drawable="@drawable/shape_numbers_button"/>
+        android:drawable="@drawable/c_calc_shape_numbers_button"/>
 </ripple>

cravecalculator/src/main/res/drawable/c_calc_ripple_operations_button.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/cCalColorRippleButton">
+  <item android:drawable="@drawable/c_calc_shape_operations_button"/>
+</ripple>

cravecalculator/src/main/res/drawable/selector_confirm_button.xml → cravecalculator/src/main/res/drawable/c_calc_selector_confirm_button.xml

@@ -1,5 +1,5 @@
 <?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/shape_confirm_button_disabled"/>
-  <item android:drawable="@drawable/ripple_confirm_button"/>
+  <item android:state_enabled="false" android:drawable="@drawable/c_calc_shape_confirm_button_disabled"/>
+  <item android:drawable="@drawable/c_calc_ripple_confirm_button"/>
 </selector>

cravecalculator/src/main/res/drawable/shape_cancel_button.xml → cravecalculator/src/main/res/drawable/c_calc_shape_cancel_button.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
-  <solid android:color="@color/colorCancelButtonBackground"/>
+  <solid android:color="@color/cCalColorCancelButtonBackground"/>
   <padding android:left="8dp"
            android:top="8dp"
            android:right="8dp"

cravecalculator/src/main/res/drawable/shape_confirm_button.xml → cravecalculator/src/main/res/drawable/c_calc_shape_confirm_button.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
-  <solid android:color="@color/colorConfirmButtonBackground"/>
+  <solid android:color="@color/cCalColorConfirmButtonBackground"/>
   <padding android:left="8dp"
            android:top="8dp"
            android:right="8dp"

cravecalculator/src/main/res/drawable/shape_confirm_button_disabled.xml → cravecalculator/src/main/res/drawable/c_calc_shape_confirm_button_disabled.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
-  <solid android:color="@color/colorDisabled"/>
+  <solid android:color="@color/cCalColorDisabled"/>
   <padding android:left="8dp"
            android:top="8dp"
            android:right="8dp"

cravecalculator/src/main/res/drawable/shape_numbers_button.xml → cravecalculator/src/main/res/drawable/c_calc_shape_equal_button.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
-  <solid android:color="@color/colorNumbersButtonBackground"/>
+  <solid android:color="@color/cCalColorEqualButtonBackground"/>
   <padding android:left="8dp"
            android:top="8dp"
            android:right="8dp"

cravecalculator/src/main/res/drawable/shape_operations_button.xml → cravecalculator/src/main/res/drawable/c_calc_shape_numbers_button.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
-  <solid android:color="@color/colorOperationsButtonBackground"/>
+  <solid android:color="@color/cCalColorNumbersButtonBackground"/>
   <padding android:left="8dp"
            android:top="8dp"
            android:right="8dp"

cravecalculator/src/main/res/drawable/shape_equal_button.xml → cravecalculator/src/main/res/drawable/c_calc_shape_operations_button.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
-  <solid android:color="@color/colorEqualButtonBackground"/>
+  <solid android:color="@color/cCalColorOperationsButtonBackground"/>
   <padding android:left="8dp"
            android:top="8dp"
            android:right="8dp"