Feature/icon

.github/workflows/android.yml

@@ -1,7 +1,7 @@
 name: Android CI
 
 on:
-  pull_request:
+  push:
     branches: [ master ]
 
 jobs:
@@ -33,4 +33,6 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
-      run: ./gradlew build
+      run: ./gradlew build-
+
+

.github/workflows/feature.yml

@@ -0,0 +1,16 @@
+name: Android CI
+
+on:
+  pull_request:
+    branches:
+      - 'build-feature/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    name: Git Sensei
+    uses: shivendrasoni/[email protected]
+
+

.github/workflows/release.yml

@@ -1,7 +1,7 @@
 name: Android CI
 
 on:
-  push:
+  pull_request:
     branches: [ master ]
 
 jobs:
@@ -12,30 +12,36 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       #2
-      - name: Decode Keystore
-        id: decode_keystore
-        uses: timheuer/base64-to-file@v1
-        with:
-          fileName: 'app/wingokey.jks'
-          encodedString: ${{ secrets.RELEASE_KEY_STORE }}
-      #3
-      - name: Generate Release App bundle
+      - name: Build App bundle
         run: ./gradlew bundleRelease
+      - name: Decode Keystore
         env:
-          PRODUCTION_URL: ${{ secrets.PRODUCTION_URL }}
-          API_KEY: ${{ secrets.API_KEY }}
-          KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
-          KEY_ALIAS_PASSWORD: ${{ secrets.KEY_PASSWORD }}
-          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          ENCODED_STRING: ${{ secrets.RELEASE_KEY_STORE }}
+        run: |
+          TMP_KEYSTORE_FILE_PATH="${GITHUB_WORKSPACE}"/app
+          echo $ENCODED_STRING | base64 -di > "${TMP_KEYSTORE_FILE_PATH}"/wingokey.jks
+      - name: Create service_account.json
+        id: createServiceAccount
+        run: echo '${{ secrets.SERVICE_ACCOUNT }}' > service_account.json
+      #3
+      - uses: r0adkll/sign-android-release@v1
+        name: Sign app APK
+        id: sign_app
+        with:
+          releaseDirectory: app/build/outputs/bundle/release
+          signingKeyBase64: ${{ secrets.RELEASE_KEY_STORE }}
+          alias: ${{ secrets.KEY_ALIAS }}
+          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
 
       - name: Deploy to Play Store
         id: deploy
-        uses: r0adkll/upload-google-play@v1
+        uses: r0adkll/upload-google-play@v1.0.15
         with:
-          serviceAccountJsonPlainText: ${ { secrets.SERVICE_ACCOUNT } }
+          serviceAccountJson: service_account.json
           packageName: com.nayandhabarde.wingo
-          releaseFile: app/build/outputs/bundle/release/app-release.aab
+          releaseFile: ${{steps.sign_app.outputs.signedReleaseFile}}
           track: production
-          whatsNewDirectory: whatsnew/
+          whatsNewDirectory: production
 
 

app/build.gradle

@@ -7,29 +7,15 @@ plugins {
 }
 
 android {
-    signingConfigs {
-        debug {
-            storeFile file('debug.keystore')
-            storePassword 'android'
-            keyPassword 'android'
-            keyAlias 'androiddebugkey'
-        }
-        release {
-            storeFile file("wingokey.jks")
-            storePassword System.getenv("KEY_STORE_PASSWORD")
-            keyPassword System.getenv("KEY_ALIAS_PASSWORD")
-            keyAlias System.getenv("KEY_ALIAS")
-        }
-    }
     compileSdk 30
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.nayandhabarde.wingo"
         minSdk 21
         targetSdk 30
-        versionCode 2
-        versionName "1.1"
+        versionCode 3
+        versionName "1.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -40,7 +26,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             buildConfigField "String", "BASE_URL", "\"${System.getenv("PRODUCTION_URL")}\""
             buildConfigField "String", "AUTH_TOKEN", "\"Bearer ${System.getenv("API_KEY")}\""
-            signingConfig signingConfigs.release
         }
         development {
             minifyEnabled false

app/src/main/ui-packages/component_1/FONTS.txt

@@ -0,0 +1 @@
+Sora

app/src/main/ui-packages/component_1/VERSION.txt

@@ -0,0 +1 @@
+0.3.01

app/src/main/ui-packages/component_1/component_1.json

@@ -0,0 +1,102 @@
+{
+  "name": "component_1",
+  "version": 32,
+  "source-key": {
+    "type": "figma",
+    "file": "yuHtZkRmt9U7hdK5usm8W7",
+    "node": "3:9",
+    "version": "2711647269"
+  },
+  "default": "Component 1",
+  "design": {
+    "atoms": [
+      {
+        "type": "group",
+        "id": "top_level",
+        "root": "true"
+      },
+      {
+        "type": "vector",
+        "id": "Rectangle 1"
+      },
+      {
+        "type": "text",
+        "id": "Hello Nayan 👋"
+      }
+    ],
+    "modes": {
+      "Component 1": {
+        "rules": [
+          {
+            "id": "top_level",
+            "is-structured": "false",
+            "children": [
+              "Rectangle 1",
+              "Hello Nayan 👋"
+            ],
+            "clip-content": "false"
+          },
+          {
+            "id": "Rectangle 1",
+            "border-radius": "17.0",
+            "size-constraints": {
+              "width-constraints": {
+                "sizing-mode": "proportional",
+                "value": "1.0"
+              },
+              "height-constraints": {
+                "sizing-mode": "proportional",
+                "value": "1.0"
+              }
+            },
+            "vector-content": "rectangle_1.svg"
+          },
+          {
+            "id": "Hello Nayan 👋",
+            "margin": {
+              "left": "21.0",
+              "top": "19.0",
+              "right": "90.0",
+              "bottom": "11.0"
+            },
+            "size-constraints": {
+              "width-constraints": {
+                "sizing-mode": "proportional",
+                "value": "1.0"
+              },
+              "height-constraints": {
+                "sizing-mode": "proportional",
+                "value": "1.0"
+              }
+            },
+            "color": {
+              "alpha": "1.0",
+              "hue": "0.0",
+              "saturation": "0.0",
+              "value": "0.0"
+            },
+            "text-content": "Hello \nNayan 👋",
+            "overflow": "visible",
+            "max-lines": "-1",
+            "text-align": "left",
+            "text-size": "16.0",
+            "line-height": "1.2599999904632568",
+            "typeface": "Sora"
+          }
+        ]
+      }
+    }
+  },
+  "previews": [
+    {
+      "design": "Component 1",
+      "size": {
+        "width": 267.0,
+        "height": 105.0
+      }
+    }
+  ],
+  "adin-component-search-paths": [],
+  "image-search-paths": [],
+  "vector-search-paths": []
+}

app/src/main/ui-packages/component_1/config.json

@@ -0,0 +1,3 @@
+{
+  "preview-theme": "androidx.compose.material.MaterialTheme"
+}

app/src/test/java/com/nayandhabarde/wingo/util/WingoDateTimeFormatterTest.kt

@@ -15,7 +15,7 @@ class WingoDateTimeFormatterTest {
 
     @Test
     fun `test format to month and date of month returns correct`() {
-        val output = wingoDateTimeFormatter.formatToMonthDateOfMonth("2021-07-10T06:31:30Z")
+        val output = wingoDateTimeFormatter.formatToMonthDateOfMonth("2021-07-10T06:31:20Z")
         assertThat(output).isEqualTo("Jul 10")
     }
 

build.gradle

@@ -11,7 +11,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.0-alpha02'
+        classpath 'com.android.tools.build:gradle:7.0.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.10"
         classpath 'com.google.dagger:hilt-android-gradle-plugin:2.37'
         // NOTE: Do not place your application dependencies here; they belong