Skip to content

Commit

Permalink
Rename package (#75)
Browse files Browse the repository at this point in the history
**Background**

com.flipper.app already used

**Changes**

rename .flipper. to .flipperdevices.
  • Loading branch information
LionZXY authored Oct 11, 2021
1 parent 49bd9af commit cd865b3
Show file tree
Hide file tree
Showing 118 changed files with 342 additions and 375 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/internal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ jobs:
with:
upload_url: ${{ steps.create_internal_release.outputs.upload_url }}
asset_path: ${{ steps.sign_internal_release.outputs.signedReleaseFile }}
asset_name: FlipperApp.apk
asset_name: FlipperApp-0.1.${{ github.run_number }}.apk
asset_content_type: application/zip
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/ApkConfig.kt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import java.lang.System.getProperty

object ApkConfig {
const val APPLICATION_ID = "com.flipper.app"
const val APPLICATION_ID = "com.flipperdevices.app"

const val MIN_SDK_VERSION = 21
const val TARGET_SDK_VERSION = 30
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.flipper.gradle
package com.flipperdevices.gradle

import ApkConfig
import com.android.build.gradle.AppExtension
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.flipper.gradle
package com.flipperdevices.gradle

import Versions
import com.android.build.gradle.AppExtension
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.flipper.gradle
package com.flipperdevices.gradle

import com.android.build.gradle.AppExtension
import com.android.build.gradle.AppPlugin
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.flipper.gradle
package com.flipperdevices.gradle

import ApkConfig
import com.android.build.gradle.LibraryExtension
Expand Down
4 changes: 2 additions & 2 deletions components/bottombar/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ plugins {
id("kotlin-android")
}

apply<com.flipper.gradle.ConfigurationPlugin>()
apply<com.flipper.gradle.ComposerPlugin>()
apply<com.flipperdevices.gradle.ConfigurationPlugin>()
apply<com.flipperdevices.gradle.ComposerPlugin>()

dependencies {
implementation(project(":components:core"))
Expand Down
4 changes: 2 additions & 2 deletions components/bottombar/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.flipper.bottombar">
package="com.flipperdevices.bottombar">

<application>
<activity android:name=".main.BottomNavigationActivity" />
<activity android:name="com.flipperdevices.bottombar.main.BottomNavigationActivity" />
</application>
</manifest>
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.flipper.bottombar.api
package com.flipperdevices.bottombar.api

import android.content.Context
import android.content.Intent
import android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP
import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
import com.flipper.bottombar.main.BottomNavigationActivity
import com.flipper.core.api.BottomNavigationActivityApi
import com.flipper.core.di.AppGraph
import com.flipperdevices.bottombar.main.BottomNavigationActivity
import com.flipperdevices.core.api.BottomNavigationActivityApi
import com.flipperdevices.core.di.AppGraph
import com.squareup.anvil.annotations.ContributesBinding
import javax.inject.Inject

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.flipper.bottombar.di
package com.flipperdevices.bottombar.di

import com.flipper.bottombar.main.BottomNavigationActivity
import com.flipper.bottombar.main.TabContainerFragment
import com.flipper.core.di.AppGraph
import com.flipperdevices.bottombar.main.BottomNavigationActivity
import com.flipperdevices.bottombar.main.TabContainerFragment
import com.flipperdevices.core.di.AppGraph
import com.squareup.anvil.annotations.ContributesTo

@ContributesTo(AppGraph::class)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.flipper.bottombar.main
package com.flipperdevices.bottombar.main

import android.os.Bundle
import androidx.activity.viewModels
Expand All @@ -8,13 +8,13 @@ import androidx.compose.ui.platform.ComposeView
import androidx.compose.ui.platform.ViewCompositionStrategy
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity
import com.flipper.bottombar.R
import com.flipper.bottombar.di.BottomBarComponent
import com.flipper.bottombar.main.compose.ComposeBottomBar
import com.flipper.bottombar.main.service.BottomNavigationViewModel
import com.flipper.bottombar.model.FlipperBottomTab
import com.flipper.core.di.ComponentHolder
import com.flipper.core.navigation.delegates.OnBackPressListener
import com.flipperdevices.bottombar.R
import com.flipperdevices.bottombar.di.BottomBarComponent
import com.flipperdevices.bottombar.main.compose.ComposeBottomBar
import com.flipperdevices.bottombar.main.service.BottomNavigationViewModel
import com.flipperdevices.bottombar.model.FlipperBottomTab
import com.flipperdevices.core.di.ComponentHolder
import com.flipperdevices.core.navigation.delegates.OnBackPressListener
import com.github.terrakok.cicerone.Router
import javax.inject.Inject

Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package com.flipper.bottombar.main
package com.flipperdevices.bottombar.main

import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
import com.flipper.bottombar.R
import com.flipper.bottombar.di.BottomBarComponent
import com.flipper.bottombar.model.FlipperBottomTab
import com.flipper.bottombar.navigate.ScreenTabProvider
import com.flipper.core.di.ComponentHolder
import com.flipper.core.navigation.delegates.OnBackPressListener
import com.flipperdevices.bottombar.R
import com.flipperdevices.bottombar.di.BottomBarComponent
import com.flipperdevices.bottombar.model.FlipperBottomTab
import com.flipperdevices.bottombar.navigate.ScreenTabProvider
import com.flipperdevices.core.di.ComponentHolder
import com.flipperdevices.core.navigation.delegates.OnBackPressListener
import com.github.terrakok.cicerone.Navigator
import com.github.terrakok.cicerone.NavigatorHolder
import com.github.terrakok.cicerone.Router
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.flipper.bottombar.main
package com.flipperdevices.bottombar.main

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
Expand All @@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import com.flipper.core.view.ComposeFragment
import com.flipperdevices.core.view.ComposeFragment

class TestFragment : ComposeFragment() {
@Composable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.flipper.bottombar.main.compose
package com.flipperdevices.bottombar.main.compose

import androidx.compose.material.BottomNavigation
import androidx.compose.material.BottomNavigationItem
Expand All @@ -8,7 +8,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import com.flipper.bottombar.model.FlipperBottomTab
import com.flipperdevices.bottombar.model.FlipperBottomTab

@Preview(
showBackground = true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.flipper.bottombar.main.service
package com.flipperdevices.bottombar.main.service

import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.flipper.bottombar.model.FlipperBottomTab
import com.flipperdevices.bottombar.model.FlipperBottomTab
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.launch
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.flipper.bottombar.model
package com.flipperdevices.bottombar.model

import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
import com.flipper.bottombar.R
import com.flipperdevices.bottombar.R

/**
* Warning: this class is processed by Proguard
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.flipper.bottombar.navigate
package com.flipperdevices.bottombar.navigate

import com.flipper.bottombar.model.FlipperBottomTab
import com.flipperdevices.bottombar.model.FlipperBottomTab
import com.github.terrakok.cicerone.Screen

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.flipper.bottombar.navigate
package com.flipperdevices.bottombar.navigate

import com.flipper.bottombar.main.TestFragment
import com.flipper.bottombar.model.FlipperBottomTab
import com.flipper.core.di.AppGraph
import com.flipper.core.navigation.screen.InfoScreenProvider
import com.flipper.pair.api.PairComponentApi
import com.flipperdevices.bottombar.main.TestFragment
import com.flipperdevices.bottombar.model.FlipperBottomTab
import com.flipperdevices.core.di.AppGraph
import com.flipperdevices.core.navigation.screen.InfoScreenProvider
import com.flipperdevices.pair.api.PairComponentApi
import com.github.terrakok.cicerone.Screen
import com.github.terrakok.cicerone.androidx.FragmentScreen
import com.squareup.anvil.annotations.ContributesBinding
Expand Down
2 changes: 1 addition & 1 deletion components/bridge/api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id("kotlin-android")
id("kotlin-parcelize")
}
apply<com.flipper.gradle.ConfigurationPlugin>()
apply<com.flipperdevices.gradle.ConfigurationPlugin>()

dependencies {
implementation(project(":components:core"))
Expand Down
2 changes: 1 addition & 1 deletion components/bridge/api/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.flipper.bridge.api">
package="com.flipperdevices.bridge.api">

<uses-permission android:name="android.permission.BLUETOOTH" />
</manifest>

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.flipper.bridge.api.device
package com.flipperdevices.bridge.api.device

import com.flipper.bridge.api.manager.FlipperBleManager
import com.flipperdevices.bridge.api.manager.FlipperBleManager

/**
* Provide API to Flipper Device
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.flipperdevices.bridge.api.di

import com.flipperdevices.bridge.api.pair.FlipperPairApi
import com.flipperdevices.bridge.api.scanner.FlipperScanner

interface FlipperBleComponentInterface {
val flipperScanner: FlipperScanner
val flipperPairApi: FlipperPairApi
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.flipper.bridge.api.manager
package com.flipperdevices.bridge.api.manager

import android.bluetooth.BluetoothDevice
import com.flipper.bridge.api.model.FlipperGATTInformation
import com.flipperdevices.bridge.api.model.FlipperGATTInformation
import kotlinx.coroutines.flow.StateFlow
import no.nordicsemi.android.ble.ktx.state.ConnectionState

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.flipper.bridge.api.model
package com.flipperdevices.bridge.api.model

/**
* Data class which represent information via flipper
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.flipper.bridge.api.pair
package com.flipperdevices.bridge.api.pair

import android.bluetooth.BluetoothDevice
import android.content.Context
import com.flipper.bridge.api.device.FlipperDeviceApi
import com.flipperdevices.bridge.api.device.FlipperDeviceApi
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.TimeoutCancellationException
import no.nordicsemi.android.ble.exception.BluetoothDisabledException
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.flipper.bridge.api.scanner
package com.flipperdevices.bridge.api.scanner

import android.bluetooth.BluetoothDevice
import android.os.Parcelable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.flipper.bridge.api.scanner
package com.flipperdevices.bridge.api.scanner

import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.Flow
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.flipper.bridge.api.utils
package com.flipperdevices.bridge.api.utils

import java.util.UUID
import java.util.concurrent.TimeUnit
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.flipper.bridge.api.utils
package com.flipperdevices.bridge.api.utils

import android.content.Context
import android.content.pm.PackageManager
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.flipper.bridge.api.utils
package com.flipperdevices.bridge.api.utils

import android.Manifest
import android.bluetooth.BluetoothAdapter
Expand Down
2 changes: 1 addition & 1 deletion components/bridge/impl/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
id("kotlin-kapt")
}

apply<com.flipper.gradle.ConfigurationPlugin>()
apply<com.flipperdevices.gradle.ConfigurationPlugin>()

dependencies {
implementation(project(":components:core"))
Expand Down
2 changes: 1 addition & 1 deletion components/bridge/impl/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.flipper.bridge">
package="com.flipperdevices.bridge">

<uses-feature
android:name="android.hardware.bluetooth_le"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.flipper.bridge.di
package com.flipperdevices.bridge.di

import android.bluetooth.BluetoothAdapter
import dagger.Module
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.flipper.bridge.di
package com.flipperdevices.bridge.di

import com.flipper.bridge.api.di.FlipperBleComponentInterface
import com.flipperdevices.bridge.api.di.FlipperBleComponentInterface
import dagger.Component
import javax.inject.Singleton

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.flipper.bridge.di
package com.flipperdevices.bridge.di

import com.flipper.bridge.api.pair.FlipperPairApi
import com.flipper.bridge.api.scanner.FlipperScanner
import com.flipper.bridge.impl.pair.FlipperPairApiImpl
import com.flipper.bridge.impl.scanner.FlipperScannerImpl
import com.flipperdevices.bridge.api.pair.FlipperPairApi
import com.flipperdevices.bridge.api.scanner.FlipperScanner
import com.flipperdevices.bridge.impl.pair.FlipperPairApiImpl
import com.flipperdevices.bridge.impl.scanner.FlipperScannerImpl
import dagger.Binds
import dagger.Module
import javax.inject.Singleton
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.flipper.bridge.di
package com.flipperdevices.bridge.di

import dagger.Module
import dagger.Provides
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.flipper.bridge.impl.device
package com.flipperdevices.bridge.impl.device

import com.flipper.bridge.api.device.FlipperDeviceApi
import com.flipper.bridge.impl.manager.FlipperBleManagerImpl
import com.flipperdevices.bridge.api.device.FlipperDeviceApi
import com.flipperdevices.bridge.impl.manager.FlipperBleManagerImpl

class FlipperDeviceApiImpl(
private val bleManagerImpl: FlipperBleManagerImpl,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.flipper.bridge.impl.manager
package com.flipperdevices.bridge.impl.manager

import android.bluetooth.BluetoothDevice
import no.nordicsemi.android.ble.observer.ConnectionObserver
Expand Down
Loading

0 comments on commit cd865b3

Please sign in to comment.