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.

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

Added libraries section in drawer. #26

Merged
merged 3 commits into from
Mar 8, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
5 changes: 5 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
xmlns:tools="http://schemas.android.com/tools"
package="com.vs.meetly">

<uses-permission android:name="android.permission.READ_PHONE_STATE" tools:node="remove" />
<uses-permission
android:name="android.permission.READ_PHONE_STATE"
tools:node="remove" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
Expand All @@ -15,6 +17,9 @@
android:roundIcon="@mipmap/ic_launcher_meetly_round"
android:supportsRtl="true"
android:theme="@style/Theme.Meetly">
<activity
android:name=".LibraryActivity"
android:exported="false" />
<activity
android:name=".MeetingViewDetail"
android:screenOrientation="portrait"
Expand Down Expand Up @@ -62,7 +67,6 @@
android:name=".MainActivity"
android:exported="true"
android:screenOrientation="portrait" />

<activity
android:name="com.dropbox.core.android.AuthActivity"
android:configChanges="keyboard|orientation"
Expand Down
11 changes: 11 additions & 0 deletions app/src/main/java/com/vs/meetly/LibraryActivity.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.vs.meetly

import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle

class LibraryActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_library)
}
}
6 changes: 6 additions & 0 deletions app/src/main/java/com/vs/meetly/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,12 @@ class MainActivity : AppCompatActivity(), IMeetingRVAdapter {
true

}
R.id.usedLib -> {
mainDrawer.closeDrawers()
val intent = Intent(this,LibraryActivity::class.java)
startActivity(intent)
true
}
R.id.logout -> {
mainDrawer.closeDrawers()
MaterialAlertDialogBuilder(
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/ic_baseline_source_24.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M20,6h-8l-2,-2H4C2.9,4 2.01,4.9 2.01,6L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8C22,6.9 21.1,6 20,6zM14,16H6v-2h8V16zM18,12H6v-2h12V12z"/>
</vector>
133 changes: 133 additions & 0 deletions app/src/main/res/layout/activity_library.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".LibraryActivity"
android:orientation="vertical">

<com.google.android.material.appbar.AppBarLayout
android:id="@+id/libAppbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent">

<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/libTopAppBar"
style="@style/Widget.MaterialComponents.Toolbar.Primary"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:navigationIcon="@drawable/ic_baseline_arrow_back_24"
app:title="Libraries Used"
app:navigationIconTint="?attr/colorOnSecondary"/>
</com.google.android.material.appbar.AppBarLayout>

<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

<com.google.android.material.card.MaterialCardView
android:id="@+id/retrofit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginRight="5dp"
android:layout_marginLeft="5dp"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="15dp"
app:cardElevation="4dp"
app:contentPadding="4dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/retrofitText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/retrofit"
android:textSize="22sp"
android:textColor="@color/black"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/retrofit_info"
android:textAlignment="center"
android:layout_marginStart="5dp"
android:textColor="@color/black"
android:layout_marginEnd="5dp"
android:textSize="18sp"
android:layout_marginTop="10dp"
app:layout_constraintTop_toBottomOf="@id/retrofitText"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>

</androidx.constraintlayout.widget.ConstraintLayout>

</com.google.android.material.card.MaterialCardView>

<com.google.android.material.card.MaterialCardView
android:id="@+id/jetsi"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginRight="5dp"
android:layout_marginLeft="5dp"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="15dp"
app:cardElevation="4dp"
app:contentPadding="4dp"
app:layout_constraintTop_toBottomOf="@id/retrofit"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/jitsiText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/jitsi_meet"
android:textSize="22sp"
android:textColor="@color/black"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/jitsi_info"
android:textAlignment="center"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:textSize="18sp"
android:textColor="@color/black"
android:layout_marginTop="10dp"
app:layout_constraintTop_toBottomOf="@id/jitsiText"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>

</androidx.constraintlayout.widget.ConstraintLayout>

</com.google.android.material.card.MaterialCardView>

</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>

</LinearLayout>
3 changes: 3 additions & 0 deletions app/src/main/res/menu/drawer_menu.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
<item android:title="@string/team"
android:icon="@drawable/ic_baseline_person_24"
android:id="@+id/meetDevs"/>
<item android:title="@string/library"
android:icon="@drawable/ic_baseline_source_24"
android:id="@+id/usedLib"/>
</menu>
</item>
<group android:id="@+id/logoutGroup">
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/res/values-night/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,9 @@
<string name="save">SAVE</string>
<string name="date_amp_time"><![CDATA[Date & Time]]></string>
<string name="submit">Submit</string>
<string name="library">Libraries Used</string>
<string name="retrofit">Retrofit</string>
<string name="retrofit_info">Copyright 2013 Square, Inc.Licensed under the Apache License, Version 2.0; you may not use this file except in compliance with the License (the \'License\'). You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an \'AS IS\' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</string>
<string name="jitsi_info">jitsi is licensed under the Apache License 2.0 Version 2.0, January 2004 http://www.apache.org/licenses/ \'License\' shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. \'Licensor\' shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.</string>
<string name="jitsi_meet">Jitsi meet</string>
</resources>
5 changes: 5 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,9 @@
<string name="save">SAVE</string>
<string name="date_amp_time"><![CDATA[Date & Time]]></string>
<string name="submit">Submit</string>
<string name="library">Libraries Used</string>
<string name="retrofit">Retrofit</string>
<string name="retrofit_info">Copyright 2013 Square, Inc.Licensed under the Apache License, Version 2.0; you may not use this file except in compliance with the License (the \'License\'). You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an \'AS IS\' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</string>
<string name="jitsi_info">jitsi is licensed under the Apache License 2.0 Version 2.0, January 2004 http://www.apache.org/licenses/ \'License\' shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. \'Licensor\' shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.</string>
<string name="jitsi_meet">Jitsi meet</string>
</resources>
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:7.1.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10'
classpath 'com.google.gms:google-services:4.3.10'

// NOTE: Do not place your application dependencies here; they belong
Expand Down