Skip to content

Commit

Permalink
[Version] Welcome to 1.00.00
Browse files Browse the repository at this point in the history
  • Loading branch information
Mercandj committed Mar 16, 2019
1 parent 6c18145 commit 5dd3d49
Show file tree
Hide file tree
Showing 35 changed files with 205 additions and 128 deletions.
30 changes: 28 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

// Signing production apk with rootProject.ext.releaseFileSpaceSigningConfig data
if (file("../config/signing/speedometer-signing.gradle").exists()) {
apply from: '../config/signing/speedometer-signing.gradle'
} else {
apply from: '../config/signing/speedometer-signing-template.gradle'
}

android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
Expand All @@ -15,18 +22,37 @@ android {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

bundle {
density.enableSplit = true
abi.enableSplit = true
language.enableSplit = false
}

signingConfigs {
releaseSigningConfig rootProject.ext.releaseSpeedometerSigningConfig
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.releaseSigningConfig
minifyEnabled true
//shrinkResources true
multiDexEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
debug {
versionNameSuffix ".dev"
shrinkResources false
}
}

sourceSets {
main {
// Split resources.
// https://medium.com/google-developer-experts/android-project-structure-alternative-way-29ce766682f0#.sjnhetuhb
res.srcDirs = [
'src/main/res/font',
'src/main/res/icon',
'src/main/res/main',
'src/main/res/permission',
'src/main/res/speed_view'
Expand Down
1 change: 0 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.mercandalli.android.apps.speedometer.main

import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.view.View
import android.widget.FrameLayout
import com.mercandalli.android.apps.speedometer.R
import com.mercandalli.android.apps.speedometer.activity.ActivityExtension.bind
Expand Down Expand Up @@ -61,7 +62,7 @@ class MainActivity : AppCompatActivity() {
}

private fun createOnMoreClickedListener() = object : SpeedView.OnMoreClickedListener {
override fun onMoreClicked() {
override fun onMoreClicked(view: View) {
userAction.onMoreClicked()
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.mercandalli.android.apps.speedometer.speed_view

import android.content.Context
import android.util.AttributeSet
import android.view.View
import android.widget.FrameLayout

open class SpeedView @JvmOverloads constructor(
Expand All @@ -16,12 +17,12 @@ open class SpeedView @JvmOverloads constructor(
onMoreClickedListener = listener
}

protected fun notifyOnMoreClicked() {
onMoreClickedListener?.onMoreClicked()
protected fun notifyOnMoreClicked(view: View) {
onMoreClickedListener?.onMoreClicked(view)
}

interface OnMoreClickedListener {

fun onMoreClicked()
fun onMoreClicked(view: View)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class SpeedGoogleView @JvmOverloads constructor(
)
}
more.setOnClickListener {
notifyOnMoreClicked()
notifyOnMoreClicked(it)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class SpeedSegmentView @JvmOverloads constructor(
)
}
more.setOnClickListener {
notifyOnMoreClicked()
notifyOnMoreClicked(it)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class SpeedTeslaView @JvmOverloads constructor(
userAction.onFabClicked()
}
more.setOnClickListener {
notifyOnMoreClicked()
notifyOnMoreClicked(it)
}
}

Expand Down
Binary file added app/src/main/res/icon/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/icon/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/icon/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 0 additions & 34 deletions app/src/main/res/main/drawable-v24/ic_launcher_foreground.xml

This file was deleted.

74 changes: 0 additions & 74 deletions app/src/main/res/main/drawable/ic_launcher_background.xml

This file was deleted.

5 changes: 0 additions & 5 deletions app/src/main/res/main/mipmap-anydpi-v26/ic_launcher.xml

This file was deleted.

5 changes: 0 additions & 5 deletions app/src/main/res/main/mipmap-anydpi-v26/ic_launcher_round.xml

This file was deleted.

Binary file removed app/src/main/res/main/mipmap-hdpi/ic_launcher.png
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/main/mipmap-mdpi/ic_launcher.png
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/main/mipmap-xhdpi/ic_launcher.png
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/main/mipmap-xxhdpi/ic_launcher.png
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/main/mipmap-xxxhdpi/ic_launcher.png
Binary file not shown.
Binary file not shown.
6 changes: 6 additions & 0 deletions config/play-store/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
*.aab
*.json
*.jks
*.jar

build/
9 changes: 9 additions & 0 deletions config/play-store/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Publish browser on the play store via app bundle

- Add the jks in the `<project-root>/config/signing/browser.jks`
- Complete `<project-root>/config/signing/signing.gradle`
- Remove .template and replace TO_FILL in JSON files in this folder.
- PlayStore authentication could be found in you PlayStore console settings, API access, and display OAuth in the Google developer console.
- Run `./publish.sh`
- See this [PlayStore](https://github.com/Mercandj/play-store) project.

9 changes: 9 additions & 0 deletions config/play-store/play-store-authentication.json.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"installed": {
"client_id": "TO_FILL",
"client_secret": "TO_FILL",
"redirect_uris": [],
"auth_uri": "https://accounts.google.com/o/oauth2/auth",
"token_uri": "https://accounts.google.com/o/oauth2/token"
}
}
8 changes: 8 additions & 0 deletions config/play-store/play-store-publish.json.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"application_name": "file",
"application_package": "com.mercandalli.android.apps.files",
"channel": "internal",
"rollout_percentage": "0.1",
"app_bundle_path": "./build/app.aab",
"client_secret_path": "play-store-authentication.json"
}
Binary file added config/play-store/play-store.xcf
Binary file not shown.
Loading

0 comments on commit 5dd3d49

Please sign in to comment.