Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/auto formatting #112

Closed
wants to merge 7 commits into from
Closed

Feature/auto formatting #112

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1505f95
update gitignore, sort .idea/ alphabetical
zerezhka Feb 21, 2021
5246110
Refactor, just appending default android studio IDE code-style
zerezhka Feb 21, 2021
05284b0
Merge branch 'feature/open_different_links' into feature/my_changes
zerezhka Feb 21, 2021
b01e1eb
Merge remote-tracking branch 'upstream/master'
zerezhka Feb 22, 2021
9351c18
after merge refactor>format
zerezhka Feb 22, 2021
87bcde7
Merge remote-tracking branch 'origin/master' into master
zerezhka Feb 22, 2021
9f4d887
Studio auto-format all files (with tab chars)
zerezhka Feb 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Studio auto-format all files (with tab chars)
  • Loading branch information
@zerezhka
zerezhka committed Feb 22, 2021
commit 9f4d88707a06a6ab5ec5a082f3db36659b7095d4
49 changes: 33 additions & 16 deletions Houseclub/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,54 @@
<manifest package="me.grishka.houseclub"
xmlns:android="http://schemas.android.com/apk/res/android">
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="me.grishka.houseclub">

<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<!-- The Agora SDK requires Bluetooth permissions in case users are using Bluetooth devices.-->
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

<application
android:allowBackup="true"
android:label="@string/app_name"
android:theme="@style/AppTheme"
android:name=".App"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true">
<activity android:name=".MainActivity" android:configChanges="screenSize|orientation" android:launchMode="singleTask">
<activity
android:name=".MainActivity"
android:configChanges="screenSize|orientation"
android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.BROWSABLE"/>
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" />
<data android:host="ios.joinclubhouse.com" android:pathPrefix="/room/" android:scheme="https"/>
<data android:host="ios.joinclubhouse.com" android:pathPrefix="/event/" android:scheme="https"/>
<data android:host="www.joinclubhouse.com" android:pathPrefix="/room/" android:scheme="https"/>
<data android:host="www.joinclubhouse.com" android:pathPrefix="/event/" android:scheme="https"/>

<data
android:host="ios.joinclubhouse.com"
android:pathPrefix="/room/"
android:scheme="https" />
<data
android:host="ios.joinclubhouse.com"
android:pathPrefix="/event/"
android:scheme="https" />
<data
android:host="www.joinclubhouse.com"
android:pathPrefix="/room/"
android:scheme="https" />
<data
android:host="www.joinclubhouse.com"
android:pathPrefix="/event/"
android:scheme="https" />
</intent-filter>
</activity>
<service android:name=".VoiceService" />
Expand Down
16 changes: 8 additions & 8 deletions Houseclub/src/main/java/me/grishka/houseclub/App.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
import me.grishka.houseclub.api.ClubhouseSession;

public class App extends Application {
public static Context applicationContext;
public static Context applicationContext;

@Override
public void onCreate() {
super.onCreate();
applicationContext = getApplicationContext();
V.setApplicationContext(applicationContext);
ClubhouseSession.load();
}
@Override
public void onCreate() {
super.onCreate();
applicationContext = getApplicationContext();
V.setApplicationContext(applicationContext);
ClubhouseSession.load();
}
}
18 changes: 9 additions & 9 deletions Houseclub/src/main/java/me/grishka/houseclub/DataProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
import me.grishka.houseclub.api.model.Channel;

class DataProvider {
private static Channel channelCache = null;
private static Channel channelCache = null;

@Nullable
public static Channel getChannel(String id) {
if (channelCache == null) return null;
return Objects.equals(channelCache.channel, id) ? channelCache : null;
}
@Nullable
public static Channel getChannel(String id) {
if (channelCache == null) return null;
return Objects.equals(channelCache.channel, id) ? channelCache : null;
}

public static void saveChannel(Channel channel) {
channelCache = channel;
}
public static void saveChannel(Channel channel) {
channelCache = channel;
}
}
Loading