commit 2906c9265180d00b4287b160488f5bb40f1f1394 Author: Michele Balistreri Date: Wed Oct 30 12:57:24 2019 +0300 initial import diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0f1d137 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +*.iml +.gradle +/local.properties +/.idea +.DS_Store +/build +/captures +.externalNativeBuild +.cxx diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..f03f080 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,54 @@ +apply plugin: 'com.android.application' + +apply plugin: 'kotlin-android' + +apply plugin: 'kotlin-android-extensions' + +android { + compileSdkVersion 29 + buildToolsVersion "29.0.2" + defaultConfig { + applicationId "im.status.keycard.connect" + minSdkVersion 21 + targetSdkVersion 29 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = "1.8" + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.core:core-ktx:1.1.0' + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.vectordrawable:vectordrawable:1.1.0' + implementation 'androidx.navigation:navigation-fragment:2.1.0' + implementation 'androidx.navigation:navigation-ui:2.1.0' + implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0' + implementation 'androidx.navigation:navigation-fragment-ktx:2.1.0' + implementation 'androidx.navigation:navigation-ui-ktx:2.1.0' + implementation 'org.bouncycastle:bcprov-jdk15on:1.64' + implementation 'com.github.status-im.status-keycard-java:android:3.0.1' + implementation "com.github.walletconnect:kotlin-walletconnect-lib:0.9.3" + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/app/src/androidTest/java/im/status/keycard/connect/ExampleInstrumentedTest.kt b/app/src/androidTest/java/im/status/keycard/connect/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..968a1a4 --- /dev/null +++ b/app/src/androidTest/java/im/status/keycard/connect/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package im.status.keycard.connect + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.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 + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("im.status.keycard.connect", appContext.packageName) + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..3cf9c19 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/im/status/keycard/connect/MainActivity.kt b/app/src/main/java/im/status/keycard/connect/MainActivity.kt new file mode 100644 index 0000000..e505a63 --- /dev/null +++ b/app/src/main/java/im/status/keycard/connect/MainActivity.kt @@ -0,0 +1,63 @@ +package im.status.keycard.connect + +import android.app.Activity +import android.nfc.NfcAdapter +import android.os.Bundle +import com.google.android.material.bottomnavigation.BottomNavigationView +import androidx.appcompat.app.AppCompatActivity +import androidx.navigation.findNavController +import androidx.navigation.ui.AppBarConfiguration +import androidx.navigation.ui.setupActionBarWithNavController +import androidx.navigation.ui.setupWithNavController +import im.status.keycard.android.NFCCardManager +import im.status.keycard.connect.card.CardScriptExecutor +import android.content.Intent +import im.status.keycard.connect.card.REQ_INTERACTIVE_SCRIPT + +class MainActivity : AppCompatActivity() { + private lateinit var cardManager: NFCCardManager + private lateinit var nfcAdapter: NfcAdapter + private lateinit var executor: CardScriptExecutor + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + val navView: BottomNavigationView = findViewById(R.id.nav_view) + + val navController = findNavController(R.id.nav_host_fragment) + + val appBarConfiguration = AppBarConfiguration(setOf(R.id.navigation_home, R.id.navigation_dashboard, R.id.navigation_notifications)) + + nfcAdapter = NfcAdapter.getDefaultAdapter(this); + executor = CardScriptExecutor(this) + + cardManager = NFCCardManager() + cardManager.setCardListener(executor) + cardManager.start() + + setupActionBarWithNavController(navController, appBarConfiguration) + navView.setupWithNavController(navController) + } + + override fun onResume() { + super.onResume() + if (this::nfcAdapter.isInitialized) { + nfcAdapter.enableReaderMode(this, this.cardManager,NfcAdapter.FLAG_READER_NFC_A or NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK, null) + } + } + + override fun onPause() { + super.onPause() + if (this::nfcAdapter.isInitialized) { + nfcAdapter.disableReaderMode(this) + } + } + + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + super.onActivityResult(requestCode, resultCode, data) + + if (requestCode == REQ_INTERACTIVE_SCRIPT) { + executor.onUserInteractionReturned(resultCode, data) + } + } +} diff --git a/app/src/main/java/im/status/keycard/connect/card/CardCommand.kt b/app/src/main/java/im/status/keycard/connect/card/CardCommand.kt new file mode 100644 index 0000000..73ccc63 --- /dev/null +++ b/app/src/main/java/im/status/keycard/connect/card/CardCommand.kt @@ -0,0 +1,12 @@ +package im.status.keycard.connect.card + +import android.content.Intent + +enum class CommandResult { + OK, CANCEL, RETRY, UX_ONGOING +} + +interface CardCommand { + fun run(context: CardScriptExecutor.Context): CommandResult + fun onDataReceived(data: Intent?) {} +} \ No newline at end of file diff --git a/app/src/main/java/im/status/keycard/connect/card/CardScriptExecutor.kt b/app/src/main/java/im/status/keycard/connect/card/CardScriptExecutor.kt new file mode 100644 index 0000000..40bfbd8 --- /dev/null +++ b/app/src/main/java/im/status/keycard/connect/card/CardScriptExecutor.kt @@ -0,0 +1,72 @@ +package im.status.keycard.connect.card + +import android.app.Activity +import android.content.Intent +import im.status.keycard.applet.KeycardCommandSet +import im.status.keycard.io.CardChannel +import im.status.keycard.io.CardListener +import java.util.* + +const val REQ_INTERACTIVE_SCRIPT = 0x01 + +class CardScriptExecutor(activity: Activity) : CardListener { + class Context(val mainActivity: Activity) { + var cardChannel: CardChannel? = null + var cmdSet: KeycardCommandSet? = null + } + + enum class State { + READY, UX_ONGOING, RUNNING + } + + private var state = State.READY + private var executionContext = Context(activity) + private var script: List? = null + private var waitingCmd: CardCommand? = null + + override fun onConnected(channel: CardChannel) { + executionContext.cardChannel = channel + executionContext.cmdSet = KeycardCommandSet(executionContext.cardChannel) + + if (state == State.READY) { + state = State.RUNNING + } else if (state == State.UX_ONGOING) { + return + } + + //TODO: replace with default script + val runningScript = script ?: LinkedList() + + for (cmd in runningScript) { + when (cmd.run(executionContext)) { + CommandResult.OK -> {} + CommandResult.CANCEL -> { state = State.READY; return } + CommandResult.UX_ONGOING -> { waitingCmd = cmd; return } + CommandResult.RETRY -> { return } + } + } + } + + override fun onDisconnected() { + executionContext.cardChannel = null + executionContext.cmdSet = null + } + + fun onUserInteractionReturned(resultCode: Int, data: Intent?) { + if (resultCode == Activity.RESULT_OK) { + waitingCmd?.onDataReceived(data) + state = State.RUNNING + } else { + state = State.READY + } + } + + fun setScript(script: List): Boolean { + if (state == State.READY) { + this.script = script + return true + } + + return false + } +} \ No newline at end of file diff --git a/app/src/main/java/im/status/keycard/connect/card/OpenSecureChannelCommand.kt b/app/src/main/java/im/status/keycard/connect/card/OpenSecureChannelCommand.kt new file mode 100644 index 0000000..7b2527a --- /dev/null +++ b/app/src/main/java/im/status/keycard/connect/card/OpenSecureChannelCommand.kt @@ -0,0 +1,62 @@ +package im.status.keycard.connect.card + +import android.content.Intent +import im.status.keycard.applet.KeycardCommandSet +import im.status.keycard.connect.data.PairingManager +import java.io.IOException + +class OpenSecureChannelCommand : CardCommand { + private var pairingPassword: String? = null + + private fun openSecureChannel(cmdSet: KeycardCommandSet): CommandResult { + try { + cmdSet.autoOpenSecureChannel() + } catch (e: IOException) { + //TODO: must distinguish real IOException from card exception (to fix in SDK) + return CommandResult.CANCEL + } + + return CommandResult.OK + } + + private fun pair(cmdSet: KeycardCommandSet): CommandResult { + if (pairingPassword != null) { + try { + //TODO: must distinguish real IOException from card exception (to fix in SDK) + cmdSet.autoPair(pairingPassword) + cmdSet.autoOpenSecureChannel() + return CommandResult.OK + } catch (e: IOException) { + pairingPassword = null + } + } + + return promptPairingPassword() + } + + private fun promptPairingPassword(): CommandResult { + //TODO: start prompt activity + return CommandResult.UX_ONGOING + } + + override fun run(context: CardScriptExecutor.Context): CommandResult { + val cmdSet = context.cmdSet ?: return CommandResult.CANCEL + + val pairing = PairingManager.getPairing(cmdSet.applicationInfo.instanceUID) + + if (pairing != null) { + cmdSet.pairing = pairing + if (openSecureChannel(cmdSet) == CommandResult.CANCEL) { + PairingManager.removePairing(cmdSet.applicationInfo.instanceUID) + } else { + return CommandResult.OK + } + } + + return pair(cmdSet) + } + + override fun onDataReceived(data: Intent?) { + pairingPassword = data?.getStringExtra("pairingPassword") + } +} \ No newline at end of file diff --git a/app/src/main/java/im/status/keycard/connect/card/SelectCommand.kt b/app/src/main/java/im/status/keycard/connect/card/SelectCommand.kt new file mode 100644 index 0000000..6948772 --- /dev/null +++ b/app/src/main/java/im/status/keycard/connect/card/SelectCommand.kt @@ -0,0 +1,19 @@ +package im.status.keycard.connect.card + +import java.io.IOException +import java.lang.Exception + +class SelectCommand : CardCommand { + override fun run(context: CardScriptExecutor.Context): CommandResult { + //TODO: handle not-installed-applet/not-a-keycard + try { + context.cmdSet!!.select().checkOK() + } catch(e: IOException) { + return CommandResult.RETRY + } catch (e: Exception) { + return CommandResult.CANCEL + } + + return CommandResult.OK + } +} \ No newline at end of file diff --git a/app/src/main/java/im/status/keycard/connect/card/VerifyPINCommand.kt b/app/src/main/java/im/status/keycard/connect/card/VerifyPINCommand.kt new file mode 100644 index 0000000..0de3e05 --- /dev/null +++ b/app/src/main/java/im/status/keycard/connect/card/VerifyPINCommand.kt @@ -0,0 +1,38 @@ +package im.status.keycard.connect.card + +import im.status.keycard.connect.data.PINCache +import im.status.keycard.io.APDUException +import im.status.keycard.io.WrongPINException +import java.io.IOException + +class VerifyPINCommand : CardCommand { + private var retries = -1 + + private fun promptPIN(): CommandResult { + //TODO: start prompt activity + return CommandResult.UX_ONGOING + } + + override fun run(context: CardScriptExecutor.Context): CommandResult { + //TODO: handle retries == 0 with UNBLOCK PIN + + val cmdSet = context.cmdSet ?: return CommandResult.CANCEL + + val pin = PINCache.getPIN(cmdSet.applicationInfo.instanceUID) + + if (pin != null) { + try { + cmdSet.verifyPIN(pin).checkAuthOK() + return CommandResult.OK + } catch (e: WrongPINException) { + retries = e.retryAttempts + } catch(e: IOException) { + return CommandResult.RETRY + } catch(e: APDUException) { + return CommandResult.CANCEL + } + } + + return promptPIN() + } +} \ No newline at end of file diff --git a/app/src/main/java/im/status/keycard/connect/data/ByteArrayWrapper.kt b/app/src/main/java/im/status/keycard/connect/data/ByteArrayWrapper.kt new file mode 100644 index 0000000..2f57d8a --- /dev/null +++ b/app/src/main/java/im/status/keycard/connect/data/ByteArrayWrapper.kt @@ -0,0 +1,7 @@ +package im.status.keycard.connect.data + +class ByteArrayKey(private val bytes: ByteArray) { + override fun equals(other: Any?): Boolean = this === other || other is ByteArrayKey && this.bytes contentEquals other.bytes + override fun hashCode(): Int = bytes.contentHashCode() + override fun toString(): String = bytes.contentToString() +} \ No newline at end of file diff --git a/app/src/main/java/im/status/keycard/connect/data/PINCache.kt b/app/src/main/java/im/status/keycard/connect/data/PINCache.kt new file mode 100644 index 0000000..0117426 --- /dev/null +++ b/app/src/main/java/im/status/keycard/connect/data/PINCache.kt @@ -0,0 +1,45 @@ +package im.status.keycard.connect.data + +import java.util.concurrent.Executors +import java.util.concurrent.ScheduledExecutorService +import java.util.concurrent.TimeUnit +import kotlin.collections.HashMap + +object PINCache { + const val CACHE_VALIDITY = 15 * 60 * 1000; + + //TODO: don't use Strings, the memory should be cleared before release. For this the entire + // chain from the EditText to the SDK should be controlled and never generate a String object. + // This will require extensions to the SDK. + private val pins: MutableMap = HashMap() + private val timestamps: MutableMap = HashMap() + + private val scheduler: ScheduledExecutorService = Executors.newScheduledThreadPool(1); + + init { + scheduler.scheduleAtFixedRate(this::cleanCache, 1, 1, TimeUnit.MINUTES); + } + + private fun cleanCache() { + val now: Long = System.currentTimeMillis() + timestamps.filterKeys { (now - it) < CACHE_VALIDITY } + pins.filterKeys { timestamps.containsValue(it) } + } + + fun getPIN(instanceUID: ByteArray): String? { + return pins[ByteArrayKey(instanceUID)] + } + + fun putPIN(instanceUID: ByteArray, pin: String) { + val key = ByteArrayKey(instanceUID) + timestamps[System.currentTimeMillis()] = key + pins[key] = pin + } + + fun removePIN(instanceUID: ByteArray) { + val key = ByteArrayKey(instanceUID) + + timestamps.filterValues { it != key } + pins.remove(key) + } +} \ No newline at end of file diff --git a/app/src/main/java/im/status/keycard/connect/data/PairingManager.kt b/app/src/main/java/im/status/keycard/connect/data/PairingManager.kt new file mode 100644 index 0000000..148f4b6 --- /dev/null +++ b/app/src/main/java/im/status/keycard/connect/data/PairingManager.kt @@ -0,0 +1,21 @@ +package im.status.keycard.connect.data + +import im.status.keycard.applet.Pairing + +object PairingManager { + //TODO: persistency + + private val pairings: MutableMap = HashMap() + + fun getPairing(instanceUID: ByteArray): Pairing? { + return pairings[ByteArrayKey(instanceUID)] + } + + fun putPairing(instanceUID: ByteArray, pairing: Pairing) { + pairings[ByteArrayKey(instanceUID)] = pairing + } + + fun removePairing(instanceUID: ByteArray) { + pairings.remove(ByteArrayKey(instanceUID)) + } +} \ No newline at end of file diff --git a/app/src/main/java/im/status/keycard/connect/ui/dashboard/DashboardFragment.kt b/app/src/main/java/im/status/keycard/connect/ui/dashboard/DashboardFragment.kt new file mode 100644 index 0000000..46c44c8 --- /dev/null +++ b/app/src/main/java/im/status/keycard/connect/ui/dashboard/DashboardFragment.kt @@ -0,0 +1,26 @@ +package im.status.keycard.connect.ui.dashboard + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.fragment.app.Fragment +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders +import im.status.keycard.connect.R + +class DashboardFragment : Fragment() { + + private lateinit var dashboardViewModel: DashboardViewModel + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + dashboardViewModel = ViewModelProviders.of(this).get(DashboardViewModel::class.java) + val root = inflater.inflate(R.layout.fragment_dashboard, container, false) + val textView: TextView = root.findViewById(R.id.text_dashboard) + dashboardViewModel.text.observe(this, Observer { + textView.text = it + }) + return root + } +} \ No newline at end of file diff --git a/app/src/main/java/im/status/keycard/connect/ui/dashboard/DashboardViewModel.kt b/app/src/main/java/im/status/keycard/connect/ui/dashboard/DashboardViewModel.kt new file mode 100644 index 0000000..bbee304 --- /dev/null +++ b/app/src/main/java/im/status/keycard/connect/ui/dashboard/DashboardViewModel.kt @@ -0,0 +1,13 @@ +package im.status.keycard.connect.ui.dashboard + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel + +class DashboardViewModel : ViewModel() { + + private val _text = MutableLiveData().apply { + value = "This is dashboard Fragment" + } + val text: LiveData = _text +} \ No newline at end of file diff --git a/app/src/main/java/im/status/keycard/connect/ui/home/HomeFragment.kt b/app/src/main/java/im/status/keycard/connect/ui/home/HomeFragment.kt new file mode 100644 index 0000000..47c3bd9 --- /dev/null +++ b/app/src/main/java/im/status/keycard/connect/ui/home/HomeFragment.kt @@ -0,0 +1,29 @@ +package im.status.keycard.connect.ui.home + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.fragment.app.Fragment +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders +import im.status.keycard.connect.R + +class HomeFragment : Fragment() { + + private lateinit var homeViewModel: HomeViewModel + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + homeViewModel = ViewModelProviders.of(this).get(HomeViewModel::class.java) + + val root = inflater.inflate(R.layout.fragment_home, container, false) + val textView: TextView = root.findViewById(R.id.text_home) + + homeViewModel.text.observe(this, Observer { + textView.text = it + }) + + return root + } +} \ No newline at end of file diff --git a/app/src/main/java/im/status/keycard/connect/ui/home/HomeViewModel.kt b/app/src/main/java/im/status/keycard/connect/ui/home/HomeViewModel.kt new file mode 100644 index 0000000..328ca72 --- /dev/null +++ b/app/src/main/java/im/status/keycard/connect/ui/home/HomeViewModel.kt @@ -0,0 +1,13 @@ +package im.status.keycard.connect.ui.home + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel + +class HomeViewModel : ViewModel() { + + private val _text = MutableLiveData().apply { + value = "This is home Fragment" + } + val text: LiveData = _text +} \ No newline at end of file diff --git a/app/src/main/java/im/status/keycard/connect/ui/notifications/NotificationsFragment.kt b/app/src/main/java/im/status/keycard/connect/ui/notifications/NotificationsFragment.kt new file mode 100644 index 0000000..149e1dc --- /dev/null +++ b/app/src/main/java/im/status/keycard/connect/ui/notifications/NotificationsFragment.kt @@ -0,0 +1,25 @@ +package im.status.keycard.connect.ui.notifications + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.fragment.app.Fragment +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders +import im.status.keycard.connect.R + +class NotificationsFragment : Fragment() { + private lateinit var notificationsViewModel: NotificationsViewModel + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + notificationsViewModel = ViewModelProviders.of(this).get(NotificationsViewModel::class.java) + val root = inflater.inflate(R.layout.fragment_notifications, container, false) + val textView: TextView = root.findViewById(R.id.text_notifications) + notificationsViewModel.text.observe(this, Observer { + textView.text = it + }) + return root + } +} \ No newline at end of file diff --git a/app/src/main/java/im/status/keycard/connect/ui/notifications/NotificationsViewModel.kt b/app/src/main/java/im/status/keycard/connect/ui/notifications/NotificationsViewModel.kt new file mode 100644 index 0000000..c45a6ab --- /dev/null +++ b/app/src/main/java/im/status/keycard/connect/ui/notifications/NotificationsViewModel.kt @@ -0,0 +1,13 @@ +package im.status.keycard.connect.ui.notifications + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel + +class NotificationsViewModel : ViewModel() { + + private val _text = MutableLiveData().apply { + value = "This is notifications Fragment" + } + val text: LiveData = _text +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..1f6bb29 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_dashboard_black_24dp.xml b/app/src/main/res/drawable/ic_dashboard_black_24dp.xml new file mode 100644 index 0000000..46fc8de --- /dev/null +++ b/app/src/main/res/drawable/ic_dashboard_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_home_black_24dp.xml b/app/src/main/res/drawable/ic_home_black_24dp.xml new file mode 100644 index 0000000..f8bb0b5 --- /dev/null +++ b/app/src/main/res/drawable/ic_home_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..0d025f9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_notifications_black_24dp.xml b/app/src/main/res/drawable/ic_notifications_black_24dp.xml new file mode 100644 index 0000000..78b75c3 --- /dev/null +++ b/app/src/main/res/drawable/ic_notifications_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..38c0aa8 --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,33 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml new file mode 100644 index 0000000..cc8e4dc --- /dev/null +++ b/app/src/main/res/layout/fragment_dashboard.xml @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml new file mode 100644 index 0000000..fba9341 --- /dev/null +++ b/app/src/main/res/layout/fragment_home.xml @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_notifications.xml b/app/src/main/res/layout/fragment_notifications.xml new file mode 100644 index 0000000..69bb426 --- /dev/null +++ b/app/src/main/res/layout/fragment_notifications.xml @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml new file mode 100644 index 0000000..f4de4f8 --- /dev/null +++ b/app/src/main/res/menu/bottom_nav_menu.xml @@ -0,0 +1,19 @@ + + + + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..898f3ed Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..dffca36 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..64ba76f Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..dae5e08 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..e5ed465 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..14ed0af Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..b0907ca Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..d8ae031 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..2c18de9 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..beed3cd Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml new file mode 100644 index 0000000..e256867 --- /dev/null +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -0,0 +1,25 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..69b2233 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #008577 + #00574B + #D81B60 + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000..47c8224 --- /dev/null +++ b/app/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ + + + 16dp + 16dp + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..85b3ddb --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,6 @@ + + Keycard Connect + Home + Dashboard + Notifications + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..5885930 --- /dev/null +++ b/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/app/src/test/java/im/status/keycard/connect/ExampleUnitTest.kt b/app/src/test/java/im/status/keycard/connect/ExampleUnitTest.kt new file mode 100644 index 0000000..9241b35 --- /dev/null +++ b/app/src/test/java/im/status/keycard/connect/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package im.status.keycard.connect + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..23b7df8 --- /dev/null +++ b/build.gradle @@ -0,0 +1,28 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + ext.kotlin_version = '1.3.50' + repositories { + google() + jcenter() + + } + dependencies { + classpath 'com.android.tools.build:gradle:3.5.1' + 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 + } +} + +allprojects { + repositories { + google() + jcenter() + maven { url 'https://jitpack.io' } + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..23339e0 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,21 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..f6b961f Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..50c4f57 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Oct 23 15:57:59 MSK 2019 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..cccdd3d --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..0f446f5 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +include ':app' +rootProject.name='Keycard Connect'