Skip to content

Commit

Permalink
Merge pull request #7 from triniwiz/feat/v2
Browse files Browse the repository at this point in the history
feat(): v2 alpha.0
  • Loading branch information
triniwiz authored Nov 26, 2019
2 parents e2a737b + d30d731 commit 9f77666
Show file tree
Hide file tree
Showing 40 changed files with 3,323 additions and 3,648 deletions.
13 changes: 12 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-android'

android {
compileSdkVersion COMPILE_SDK_VERSION as int
buildToolsVersion BUILD_TOOLS_VERSION as String
defaultConfig {
applicationId "co.fitcom.videorecorder"
minSdkVersion 17
minSdkVersion 21
targetSdkVersion COMPILE_SDK_VERSION as int
versionCode 1
versionName "1.0"
Expand All @@ -17,6 +19,10 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
buildToolsVersion '29.0.2'
}

Expand All @@ -28,4 +34,9 @@ dependencies {
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
implementation project(':fancycamera')
implementation "androidx.core:core-ktx:1.1.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
repositories {
mavenCentral()
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package co.fitcom.videorecorder

import android.content.Context
import androidx.test.InstrumentationRegistry
import androidx.test.runner.AndroidJUnit4

import org.junit.Test
import org.junit.runner.RunWith

import org.junit.Assert.*

/**
* Instrumented test, which will execute on an Android device.
*
* @see [Testing documentation](http://d.android.com/tools/testing)
*/
@RunWith(AndroidJUnit4::class)
class ExampleInstrumentedTest {
@Test
@Throws(Exception::class)
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getTargetContext()

assertEquals("co.fitcom.videorecorder", appContext.packageName)
}
}
20 changes: 0 additions & 20 deletions app/src/main/java/co/fitcom/videorecorder/Home.java

This file was deleted.

19 changes: 19 additions & 0 deletions app/src/main/java/co/fitcom/videorecorder/Home.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/*
* Created By Osei Fortune on 4/19/18 10:38 AM
* Copyright (c) 2018
* Last modified 4/19/18 10:38 AM
*
*/

package co.fitcom.videorecorder

import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle

class Home : AppCompatActivity() {

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_home)
}
}
172 changes: 0 additions & 172 deletions app/src/main/java/co/fitcom/videorecorder/MainActivity.java

This file was deleted.

Loading

0 comments on commit 9f77666

Please sign in to comment.