Skip to content

Commit

Permalink
- add androidx.
Browse files Browse the repository at this point in the history
  • Loading branch information
Mycoola committed Nov 8, 2018
1 parent a6af8ce commit 410ca35
Show file tree
Hide file tree
Showing 34 changed files with 146 additions and 83 deletions.
25 changes: 12 additions & 13 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'

apply plugin: 'kotlin-android-extensions'

apply plugin: 'com.google.gms.google-services'

android {
Expand Down Expand Up @@ -35,44 +36,42 @@ dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation project(':liband')
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'androidx.appcompat:appcompat:1.0.1'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
implementation 'androidx.room:room-runtime:2.1.0-alpha01'
annotationProcessor "androidx.room:room-compiler:2.1.0-alpha01"
testImplementation 'androidx.room:room-testing:2.1.0-alpha01'
implementation 'androidx.room:room-runtime:2.1.0-alpha02'
annotationProcessor "androidx.room:room-compiler:2.1.0-alpha02"
testImplementation 'androidx.room:room-testing:2.1.0-alpha02'

implementation "androidx.lifecycle:lifecycle-extensions:2.0.0"
implementation "androidx.lifecycle:lifecycle-common-java8:2.0.0"
implementation "androidx.lifecycle:lifecycle-reactivestreams:2.0.0"
testImplementation "androidx.arch.core:core-testing:2.0.0"

implementation 'com.google.android.gms:play-services-maps:16.0.0'
implementation 'com.google.android.gms:play-services:12.0.1'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71'

implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'com.google.firebase:firebase-core:16.0.4'
implementation 'com.google.firebase:firebase-core:16.0.5'
implementation 'com.google.firebase:firebase-auth:16.0.5'
implementation 'com.google.firebase:firebase-database:16.0.4'
implementation 'com.google.firebase:firebase-messaging:17.3.4'
implementation 'com.google.firebase:firebase-auth:16.0.5'




implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71"
implementation "androidx.appcompat:appcompat:1.0.0"
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.0'
implementation "androidx.appcompat:appcompat:1.0.1"
implementation "androidx.constraintlayout:constraintlayout:1.1.3"
implementation "com.google.android.material:material:1.0.0"

// architecture components
implementation "androidx.lifecycle:lifecycle-extensions:2.0.0"
implementation "androidx.lifecycle:lifecycle-runtime:2.0.0"
implementation "androidx.room:room-runtime:2.1.0-alpha01"
implementation "androidx.paging:paging-runtime:2.1.0-alpha01"
implementation "androidx.room:room-runtime:2.1.0-alpha02"
implementation "androidx.paging:paging-runtime:2.1.0-beta01"
kapt "androidx.lifecycle:lifecycle-compiler:2.0.0"
kapt "androidx.room:room-compiler:2.1.0-alpha01"
kapt "androidx.room:room-compiler:2.1.0-alpha02"

// retrofit
implementation "com.squareup.retrofit2:retrofit:2.4.0"
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
</intent-filter>
</activity>

<service android:name="com.libandexample.tutorials.simplifiedcoding.androidnotificationtutorial.MyFirebaseMessagingService">
<service android:name="com.libandexample.tutorials.simplifiedcoding.androidnotificationtutorial.MyFirebaseMessagingService"
android:permission="">
<intent-filter>
<action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
</intent-filter>
Expand Down
15 changes: 5 additions & 10 deletions app/src/main/java/com/libandexample/Main2Activity.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

import android.app.Activity;
import android.content.Intent;
import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Environment;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.os.Environment;
import android.widget.Button;
import android.widget.ImageView;

import java.io.File;

import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;

public class Main2Activity extends AppCompatActivity {
private ImageView imageView;

Expand Down Expand Up @@ -41,13 +41,8 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 100) {
int responseCode = data.getIntExtra("RESULT_OK", -1);
if (requestCode == Activity.RESULT_OK) {
Bitmap imageBitmap = (Bitmap) data.getExtras().get("data");
imageView.setImageBitmap(imageBitmap);
} else if (resultCode == Activity.RESULT_FIRST_USER) {
if (resultCode == Activity.RESULT_FIRST_USER) {
// Fail
} else if (resultCode == Activity.RESULT_CANCELED) {
// User canceled
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package com.libandexample.courses.udemy.Kotlin.findmyage

import android.annotation.SuppressLint
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import android.view.View
import androidx.appcompat.app.AppCompatActivity
import com.libandexample.R
import kotlinx.android.synthetic.main.activity_main.*
import java.util.*
Expand All @@ -25,7 +25,7 @@ class MainActivity : AppCompatActivity() {
val userDOB: String = etDOB.text.toString()
val year: Int = Calendar.getInstance().get(Calendar.YEAR)
val myAge = year - userDOB.toInt()
tvShowAge.setText("Your age is " + myAge)
tvShowAge.text = "Your age is " + myAge
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package com.libandexample.courses.udemy.Kotlin.getsunset
import android.annotation.SuppressLint
import android.os.AsyncTask
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import android.view.View
import androidx.appcompat.app.AppCompatActivity
import com.libandexample.R
import kotlinx.android.synthetic.main.activity_main_getsunset.*
import org.json.JSONObject
Expand All @@ -14,7 +14,7 @@ import java.io.InputStreamReader
import java.net.HttpURLConnection
import java.net.URL

class GetSunSetMainActivity : AppCompatActivity() {
open class GetSunSetMainActivity : AppCompatActivity() {

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,12 @@
import android.widget.ProgressBar;
import android.widget.Toast;

import com.google.android.gms.tasks.OnCompleteListener;
import com.google.android.gms.tasks.Task;
import com.google.firebase.auth.AuthResult;
import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.auth.FirebaseAuthUserCollisionException;
import com.libandexample.R;

import androidx.annotation.NonNull;
import java.util.Objects;

import androidx.appcompat.app.AppCompatActivity;

public class AndroidNotificationMainActivity extends AppCompatActivity {
Expand Down Expand Up @@ -46,7 +44,7 @@ protected void onCreate(Bundle savedInstanceState) {
NotificationChannel channel = new NotificationChannel(CHANNEL_ID, CHANNEL_NAME, NotificationManager.IMPORTANCE_DEFAULT);
channel.setDescription(CHANNEL_DESC);
NotificationManager manager = getSystemService(NotificationManager.class);
manager.createNotificationChannel(channel);
Objects.requireNonNull(manager).createNotificationChannel(channel);
}

progressBar = findViewById(R.id.progressbar);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import com.libandexample.R;

public class NotificationHelper {
class NotificationHelper {

public static void displayNotification(Context context, String title, String body) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

public class ProfileActivity extends AppCompatActivity {

public static final String NODE_USERS = "users";
private static final String NODE_USERS = "users";
private FirebaseAuth mAuth;

@Override
Expand All @@ -29,8 +29,6 @@ protected void onCreate(Bundle savedInstanceState) {
if (task.isSuccessful()) {
String token = task.getResult().getToken();
saveToken(token);
} else {

}
});
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.libandexample.tutorials.simplifiedcoding.androidnotificationtutorial;

public class User {
class User {

public String email;
public String token;
private final String email;
private final String token;

public User(String email, String token) {
this.email = email;
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/res/layout/ticcket.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/gray"
android:background="@color/gray"
android:orientation="vertical">

<LinearLayout
android:background="@drawable/background_layout"

android:layout_margin="3pt"
android:layout_width="match_parent"

android:layout_height="wrap_content"
android:layout_margin="3pt"
android:background="@drawable/background_layout"
android:orientation="vertical">

<TextView
Expand All @@ -23,10 +23,10 @@
android:textSize="18sp" />

<TextView
android:paddingLeft="10pt"
android:id="@+id/tvDes"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="10pt"
android:text="Pattern Generator Create any pattern of your own - tiles, texture, skin, wallpaper, comic effect, website background and more. Change any artwork of pattern you found into different flavors and call them your own." />

<LinearLayout
Expand Down
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:3.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.71"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0"
classpath 'com.google.gms:google-services:4.0.1'

// NOTE: Do not place your application dependencies here; they belong
Expand Down
12 changes: 6 additions & 6 deletions liband/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ android {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'androidx.appcompat:appcompat:1.0.1'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.vectordrawable:vectordrawable:1.0.0'
implementation 'androidx.vectordrawable:vectordrawable:1.0.1'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.1.0'
Expand All @@ -44,11 +44,11 @@ dependencies {
implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
implementation 'com.squareup.retrofit2:adapter-rxjava:2.4.0'
implementation 'com.squareup.okhttp3:logging-interceptor:3.9.1'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.0'
implementation 'com.intuit.ssp:ssp-android:1.0.5'
implementation 'androidx.room:room-runtime:2.1.0-alpha01'
annotationProcessor "androidx.room:room-compiler:2.1.0-alpha01"
testImplementation 'androidx.room:room-testing:2.1.0-alpha01'
implementation 'androidx.room:room-runtime:2.1.0-alpha02'
annotationProcessor "androidx.room:room-compiler:2.1.0-alpha02"
testImplementation 'androidx.room:room-testing:2.1.0-alpha02'
implementation 'com.github.bumptech.glide:glide:4.8.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
Expand Down
5 changes: 2 additions & 3 deletions liband/src/main/java/com/liband/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

public class App extends Application implements Application.ActivityLifecycleCallbacks {
private static App app;
boolean isTempLoggedIn = false;
private boolean isTempLoggedIn = false;
private Retrofit retrofitAdapter;
private Retrofit retrofitAdapterSecond;

Expand Down Expand Up @@ -48,8 +48,7 @@ public void setLanguage() {
}

public boolean isNavigationRunning() {
boolean isNavigationRunning = false;
return isNavigationRunning;
return false;
}

public Retrofit getRetrofitAdapter(String baseUrl) {
Expand Down
58 changes: 58 additions & 0 deletions liband/src/main/java/com/liband/adapter/RecyclerAdapter.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
package com.liband.adapter;

import android.view.LayoutInflater;
import android.view.ViewGroup;

import com.liband.interfaces.adapterViewModel;

import java.util.List;

import androidx.databinding.DataBindingUtil;
import androidx.databinding.ViewDataBinding;
import androidx.recyclerview.widget.RecyclerView;

class AppAdapter<T extends adapterViewModel> extends RecyclerView.Adapter<AppAdapter.ViewHolder> {

private final List<? extends T> list;

public AppAdapter(List<? extends T> list) {
this.list = list;
}

public static class ViewHolder<V extends ViewDataBinding> extends RecyclerView.ViewHolder {
private final V v;

ViewHolder(V v) {
super(v.getRoot());
this.v = v;
}

V getBinding() {
return v;
}
}

@Override
public int getItemViewType(int position) {
return list.get(position).layoutId();
}

@Override
public AppAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
ViewDataBinding bind = DataBindingUtil.bind(LayoutInflater.from(parent.getContext()).inflate(viewType, parent, false));
return new ViewHolder<>(bind);
}

@Override
public void onBindViewHolder(ViewHolder holder, int position) {
final T model = list.get(position);
holder.getBinding().executePendingBindings();
}

@Override
public int getItemCount() {
return list.size();
}


}
11 changes: 11 additions & 0 deletions liband/src/main/java/com/liband/constants/Constants.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
package com.liband.constants;


import android.os.Environment;

public class Constants {
public static final String APP_LANG = "app_lang";
public static final int SPLASH_TIME_OUT = 3000;

public static String DOWNLOADPATH = Environment
.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
+ "/"
+ " Downloads/";


public static String INTENT_TYPE_TEXT = "text/plain";
public static String INTENT_TYPE_IMAGE = "image/*";
public static String INTENT_TYPE_FILE = "*/*";
}
2 changes: 1 addition & 1 deletion liband/src/main/java/com/liband/constants/TagsName.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.liband.constants;


public class TagsName {
class TagsName {
public static final String ID = "id";
public static final String TITLE = "title";
public static final String NAME = "name";
Expand Down
Loading

0 comments on commit 410ca35

Please sign in to comment.